fix(editor/subscriber): filtering on FCDAs retains the parent (opensc…

…d#1048) Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com> Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com>
sprinteins · Oct 26, 2022 · d5f8bb7 · d5f8bb7
1 parent 0b414e1
commit d5f8bb7
Show file tree

Hide file tree

Showing 8 changed files with 306 additions and 207 deletions.
diff --git a/src/editors/subscription/fcda-binding-list.ts b/src/editors/subscription/fcda-binding-list.ts
@@ -25,6 +25,7 @@ import { gooseIcon, smvIcon } from '../../icons/icons.js';
 import { wizards } from '../../wizards/wizard-library.js';
 
 import {
+  getFcdaSubtitleValue,
   getFcdaTitleValue,
   newFcdaSelectEvent,
   styles,
@@ -175,18 +176,11 @@ export class FcdaBindingList extends LitElement {
       twoline
       class="subitem"
       @click=${() => this.onFcdaSelect(controlElement, fcdaElement)}
-      value="${identity(controlElement)} ${identity(fcdaElement)}"
+      value="${identity(controlElement)}
+             ${identity(fcdaElement)}"
     >
       <span>${getFcdaTitleValue(fcdaElement)}</span>
-      <span slot="secondary">
-        ${fcdaElement.getAttribute('ldInst')}${fcdaElement.hasAttribute(
-          'ldInst'
-        ) && fcdaElement.hasAttribute('prefix')
-          ? html`/`
-          : nothing}${fcdaElement.getAttribute('prefix')}
-        ${fcdaElement.getAttribute('lnClass')}
-        ${fcdaElement.getAttribute('lnInst')}
-      </span>
+      <span slot="secondary">${getFcdaSubtitleValue(fcdaElement)}</span>
       <mwc-icon slot="graphic">subdirectory_arrow_right</mwc-icon>
       ${fcdaCount !== 0 ? html`<span slot="meta">${fcdaCount}</span>` : nothing}
     </mwc-list-item>`;
@@ -210,9 +204,15 @@ export class FcdaBindingList extends LitElement {
                     graphic="icon"
                     twoline
                     hasMeta
-                    value="${identity(controlElement)} ${fcdaElements
-                      .map(fcdaElement => identity(fcdaElement) as string)
-                      .join(' ')}"
+                    value="
+                        ${identity(controlElement)}${fcdaElements
+                      .map(
+                        fcdaElement => `
+                        ${getFcdaTitleValue(fcdaElement)}
+                        ${getFcdaSubtitleValue(fcdaElement)}
+                        ${identity(fcdaElement)}`
+                      )
+                      .join('')}"
                   >
                     <mwc-icon-button
                       slot="meta"

diff --git a/src/editors/subscription/foundation.ts b/src/editors/subscription/foundation.ts
@@ -97,6 +97,16 @@ export function getFcdaTitleValue(fcdaElement: Element): string {
   }${fcdaElement.getAttribute('daName')}`;
 }
 
+export function getFcdaSubtitleValue(fcdaElement: Element): string {
+  return `${fcdaElement.getAttribute('ldInst')} ${
+    fcdaElement.hasAttribute('ldInst') && fcdaElement.hasAttribute('prefix')
+      ? `/`
+      : ''
+  } ${fcdaElement.getAttribute('prefix')} ${fcdaElement.getAttribute(
+    'lnClass'
+  )} ${fcdaElement.getAttribute('lnInst')}`;
+}
+
 export function existExtRef(
   parentInputs: Element,
   fcda: Element,

diff --git a/test/integration/editors/GooseSubscriberDataBinding.test.ts b/test/integration/editors/GooseSubscriberDataBinding.test.ts
@@ -9,6 +9,7 @@ import {
   getExtrefDataBindingList,
   getFCDABindingList,
   getSelectedSubItemValue,
+  selectFCDAItem,
 } from './test-support.js';
 
 describe('GOOSE Subscribe Data Binding Plugin', async () => {
@@ -39,12 +40,13 @@ describe('GOOSE Subscribe Data Binding Plugin', async () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefDataBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE1 GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE1',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)'
+    );
     await element.requestUpdate();
+    await extRefListElement.requestUpdate();
 
     expect(extRefListElement['getSubscribedLNElements']().length).to.be.equal(
       0
@@ -80,11 +82,11 @@ describe('GOOSE Subscribe Data Binding Plugin', async () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefDataBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
@@ -130,11 +132,11 @@ describe('GOOSE Subscribe Data Binding Plugin', async () => {
       ).length
     ).to.be.equal(1);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
@@ -145,11 +147,11 @@ describe('GOOSE Subscribe Data Binding Plugin', async () => {
     )).click();
     await element.requestUpdate();
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos stVal (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos stVal (ST)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 

diff --git a/test/integration/editors/GooseSubscriberLaterBinding.test.ts b/test/integration/editors/GooseSubscriberLaterBinding.test.ts
@@ -7,6 +7,7 @@ import {
   getExtrefLaterBindingList,
   getFCDABindingList,
   getSelectedSubItemValue,
+  selectFCDAItem,
 } from './test-support.js';
 
 describe('GOOSE Subscribe Later Binding Plugin', () => {
@@ -34,12 +35,13 @@ describe('GOOSE Subscribe Later Binding Plugin', () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefLaterBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE1 GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE1',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)'
+    );
     await element.requestUpdate();
+    await extRefListElement.requestUpdate();
 
     expect(
       extRefListElement['getSubscribedExtRefElements']().length
@@ -69,11 +71,11 @@ describe('GOOSE Subscribe Later Binding Plugin', () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefLaterBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 

diff --git a/test/integration/editors/SMVSubscriberDataBinding.test.ts b/test/integration/editors/SMVSubscriberDataBinding.test.ts
@@ -9,6 +9,7 @@ import {
   getExtrefDataBindingList,
   getFCDABindingList,
   getSelectedSubItemValue,
+  selectFCDAItem,
 } from './test-support.js';
 
 describe('SMV Subscribe Data Binding Plugin', async () => {
@@ -39,12 +40,13 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefDataBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>fullSmv',
+      'SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)'
+    );
     await element.requestUpdate();
+    await extRefListElement.requestUpdate();
 
     expect(extRefListElement['getSubscribedLNElements']().length).to.be.equal(
       1
@@ -80,11 +82,11 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefDataBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>fullSmv',
+      'SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
@@ -128,11 +130,11 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
       ).length
     ).to.be.equal(1);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>fullSmv',
+      'SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
@@ -143,11 +145,11 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
     )).click();
     await element.requestUpdate();
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>fullSmv',
+      'SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
@@ -158,11 +160,11 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
     )).click();
     await element.requestUpdate();
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>fullSmv',
+      'SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 

diff --git a/test/integration/editors/SMVSubscriberLaterBinding.test.ts b/test/integration/editors/SMVSubscriberLaterBinding.test.ts
@@ -8,6 +8,7 @@ import {
   getExtrefLaterBindingList,
   getFCDABindingList,
   getSelectedSubItemValue,
+  selectFCDAItem,
 } from './test-support.js';
 
 describe('SMV Subscribe Later Binding plugin', () => {
@@ -35,12 +36,13 @@ describe('SMV Subscribe Later Binding plugin', () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefLaterBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>currentOnly',
+      'SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX)'
+    );
     await element.requestUpdate();
+    await extRefListElement.requestUpdate();
 
     expect(
       extRefListElement['getSubscribedExtRefElements']().length
@@ -70,12 +72,13 @@ describe('SMV Subscribe Later Binding plugin', () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefLaterBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>currentOnly',
+      'SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX)'
+    );
     await element.requestUpdate();
+    await extRefListElement.requestUpdate();
 
     expect(
       extRefListElement['getSubscribedExtRefElements']().length

diff --git a/test/integration/editors/test-support.ts b/test/integration/editors/test-support.ts
@@ -19,6 +19,19 @@ export function getFCDABindingList(
   );
 }
 
+export function selectFCDAItem(
+  listElement: FcdaBindingList,
+  controlIdentity: string,
+  fcdaIdentity: string
+): void {
+  (<HTMLElement>Array.from(
+    listElement.shadowRoot!.querySelectorAll('mwc-list-item[class="subitem"]')
+  ).find(listItem => {
+    const value = listItem.getAttribute('value') ?? '';
+    return value.includes(controlIdentity) && value.includes(fcdaIdentity);
+  })).click();
+}
+
 export function getExtrefDataBindingList(
   element: SMVSubscribeDataBindingPlugin | GooseSubscribeDataBindingPlugin
 ): ExtRefLnBindingList {