fix(wizards/fcda): make sure lnInst is non empty string (#512)

* fix(wizards/fcda): make sure lnInst is non empty string * refactor(wizards/fcda): improve readablity
openscd · Jan 25, 2022 · f8d2dc7 · f8d2dc7
1 parent 24c271c
commit f8d2dc7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/wizards/fcda.ts b/src/wizards/fcda.ts
@@ -30,7 +30,10 @@ function newFCDA(parent: Element, path: string[]): Element | undefined {
   const ldInst = ln.closest('LDevice')?.getAttribute('inst');
   const prefix = ln.getAttribute('prefix') ?? '';
   const lnClass = ln.getAttribute('lnClass');
-  const lnInst = ln.getAttribute('inst') ?? '';
+  const lnInst =
+    (ln.getAttribute('inst') && ln.getAttribute('inst') !== '')
+      ? ln.getAttribute('inst')
+      : null;
 
   let doName = '';
   let daName = '';

diff --git a/test/integration/wizards/fcda-wizarding-editing-integration.test.ts b/test/integration/wizards/fcda-wizarding-editing-integration.test.ts
@@ -46,14 +46,14 @@ describe('FCDA editing wizarding integration', () => {
       expect(
         doc.querySelector(
           'DataSet > FCDA[ldInst="CircuitBreaker_CB1"]' +
-            '[prefix=""][lnClass="LLN0"][lnInst=""][doName="Beh"][daName="stVal"][fc="ST"]'
+            '[prefix=""][lnClass="LLN0"]:not(lnInst)[doName="Beh"][daName="stVal"][fc="ST"]'
         )
       ).to.not.exist;
       await primaryAction.click();
       expect(
         doc.querySelector(
           'DataSet > FCDA[ldInst="CircuitBreaker_CB1"]' +
-            '[prefix=""][lnClass="LLN0"][lnInst=""][doName="Beh"][daName="stVal"][fc="ST"]'
+            '[prefix=""][lnClass="LLN0"]:not(lnInst)[doName="Beh"][daName="stVal"][fc="ST"]'
         )
       ).to.exist;
     });

diff --git a/test/unit/wizards/fcda.test.ts b/test/unit/wizards/fcda.test.ts
@@ -81,7 +81,7 @@ describe('create wizard for FCDA element', () => {
         expect(newElement).to.have.attribute('ldInst', 'CircuitBreaker_CB1');
         expect(newElement).to.have.attribute('prefix', '');
         expect(newElement).to.have.attribute('lnClass', 'LLN0');
-        expect(newElement).to.have.attribute('lnInst', '');
+        expect(newElement).to.not.have.attribute('lnInst');
         expect(newElement).to.have.attribute('doName', 'Beh');
         expect(newElement).to.have.attribute('daName', 'stVal');
         expect(newElement).to.have.attribute('fc', 'ST');