Missing Logic Link fields are also created now during editing

Author: Flurb

src/editors/protocol104/connectedap-editor.ts

@@ -24,7 +24,7 @@ export class ConnectedAP104Editor extends LitElement {
       newWizardEvent(() =>
         editConnectedApWizard(
           this.element,
-          this.element.querySelectorAll('Address > P[type^="RG"]').length >= 8
+          this.element.querySelectorAll('Address > P[type^="RG"]').length > 0
         )
       )
     );

src/editors/protocol104/wizards/logiclink.ts

@@ -124,7 +124,19 @@ function editLogicLinkAction(parent: Element, rGNumber: number, lLNumber: number
       const inputValue = getValue(inputs.find(i => i.label === type)!)!;
       const elementOriginal = parent.querySelector(`Address > P[type="RG${rGNumber}-LL${lLNumber}-${type}"]`);
 
-      if (inputValue !== elementOriginal?.textContent) {
+      if (elementOriginal == null) {
+        const element = createElement(parent.ownerDocument, 'P', {
+          type: `RG${rGNumber}-LL${lLNumber}-${type}`
+        });
+        element.textContent = getValue(inputs.find(i => i.label === type)!)!;
+        
+        actions.push({
+          new: {
+            parent: parent.querySelector('Address')!,
+            element: element,
+          }
+        });
+      } else if (inputValue !== elementOriginal?.textContent) {
         const elementClone = cloneElement(elementOriginal!, {});
         elementClone.textContent = inputValue;
 
@@ -154,7 +166,6 @@ function editLogicLinkAction(parent: Element, rGNumber: number, lLNumber: number
 
 function addLogicLinkAction(parent: Element, rGNumber: number, lLNumber: number): WizardActor {
   return (inputs: WizardInputElement[]): EditorAction[] => {
-    const addressParent = parent.querySelector('Address')!;
     const complexAction: ComplexAction = {
       actions: [],
       title: get('protocol104.network.logicLink.wizard.addedLogicLink', {
@@ -172,7 +183,7 @@ function addLogicLinkAction(parent: Element, rGNumber: number, lLNumber: number)
 
       complexAction.actions.push({
         new: {
-          parent: addressParent,
+          parent: parent.querySelector('Address')!,
           element: element,
         }
       });

src/editors/protocol104/wizards/redundancygroup.ts

@@ -33,7 +33,9 @@ export function editRedundancyGroupWizard(parent: Element, rGNumber: number): Wi
         {
           icon: 'playlist_add',
           label: get('protocol104.network.redundancyGroup.wizard.addLogicLink'),
-          action: openLogicLinkWizard(parent, rGNumber, usedLLNumbers),
+          action: (wizard: Element): void => {
+            wizard.dispatchEvent(newSubWizardEvent(createLogicLinkWizard(parent, rGNumber, usedLLNumbers)));
+          },
         },
         {
           icon: 'delete',
@@ -108,12 +110,6 @@ export function createRedundancyGroupWizard(parent: Element, occupiedRGNumbers:
   ];
 }
 
-function openLogicLinkWizard(parent: Element, rGNumber: number, lLNumber: number[]): WizardMenuActor {
-  return (wizard: Element): void => {
-    wizard.dispatchEvent(newSubWizardEvent(createLogicLinkWizard(parent, rGNumber, lLNumber)));
-  };
-}
-
 /**
  * Remove all P elements belonging to a single Redundancy Group.
  * @param parent - The parent element of the P elements to remove.
@@ -156,7 +152,19 @@ function editRedundancyGroupAction(parent: Element, rGNumber: number): WizardAct
       const inputValue = getValue(inputs.find(i => i.label === type)!)!;
       const elementOriginal = parent.querySelector(`Address > P[type="RG${rGNumber}-${type}"]`);
 
-      if (inputValue !== elementOriginal?.textContent) {
+      if (elementOriginal == null) {
+        const pElement = createElement(parent.ownerDocument, 'P', {
+          type: `RG${rGNumber}-${type}`
+        });
+        pElement.textContent = inputValue;
+  
+        actions.push({
+          new: {
+            parent: parent.querySelector('Address')!,
+            element: pElement
+          }
+        });
+      } else if (inputValue !== elementOriginal?.textContent) {
         const elementClone = cloneElement(elementOriginal!, {});
         elementClone.textContent = inputValue;
 

test/unit/editors/protocol104/wizards/logiclink.test.ts

@@ -78,6 +78,25 @@ describe('Wizards for the Logic Link SCL element group', () => {
       expect((<Replace>(action)).new.element.textContent).to.eql('192.128.0.12');
     });
 
+    it('properly creates a P element if not present', async () => {
+      doc.querySelector('Communication > SubNetwork[name="W1"] > ConnectedAP[iedName="B1"] > Address > P[type="RG2-LL1-IP-SUBNET"]')?.remove();
+
+      input = <WizardTextField>inputs.find(input => input.label === 'IP-SUBNET');
+      input.value = '200.200.200.2';
+      await input.requestUpdate();
+
+      primaryAction.click();
+      await element.requestUpdate();
+      
+      const complexAction = <ComplexAction>actionEvent.args[0][0].detail.action;
+      expect(complexAction.title).to.contain('edit');
+      expect(complexAction.actions).to.have.lengthOf(1);
+
+      const action = complexAction.actions[0];
+      expect(action).to.satisfy(isCreate);
+      expect((<Create>(action)).new.element.textContent).to.eql('200.200.200.2');
+    });
+
     it('properly deletes a full Logic Link group', async () => {
       const deleteAction = <HTMLElement>(
         element.wizardUI.dialog?.querySelector(

test/unit/editors/protocol104/wizards/redundancygroup.test.ts

@@ -78,6 +78,25 @@ describe('Wizards for the Redundancy Group SCL element group', () => {
       expect((<Replace>(action)).new.element.textContent).to.eql('18');
     });
 
+    it('properly creates a P element if not present', async () => {
+      doc.querySelector('Communication > SubNetwork[name="W1"] > ConnectedAP[iedName="B1"] > Address > P[type="RG2-TIMEOUT-2"]')?.remove();
+
+      input = <WizardTextField>inputs.find(input => input.label === 'TIMEOUT-2');
+      input.value = '77';
+      await input.requestUpdate();
+
+      primaryAction.click();
+      await element.requestUpdate();
+      
+      const complexAction = <ComplexAction>actionEvent.args[0][0].detail.action;
+      expect(complexAction.title).to.contain('edit');
+      expect(complexAction.actions).to.have.lengthOf(1);
+
+      const action = complexAction.actions[0];
+      expect(action).to.satisfy(isCreate);
+      expect((<Create>(action)).new.element.textContent).to.eql('77');
+    });
+
     it('properly deletes a full Redundancy Group', async () => {
       const deleteAction = <HTMLElement>(
         element.wizardUI.dialog?.querySelectorAll(