fix: goose subscription reflects state incorrectly (openscd#1261)

Signed-off-by: Stef3st <steffen.van.den.driest@alliander.com>
sprinteins · Jun 21, 2023 · 4440bff · 4440bff
1 parent de2dd0d
commit 4440bff
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/editors/subscription/goose/subscriber-list.ts b/src/editors/subscription/goose/subscriber-list.ts
@@ -114,7 +114,7 @@ export class SubscriberList extends SubscriberListContainer {
 
       dataSet!.querySelectorAll('FCDA').forEach(fcda => {
         subscribedInputs.forEach(inputs => {
-          if (getExtRef(inputs, fcda, this.currentSelectedGseControl)) {
+          if (getExtRef(inputs, fcda, control)) {
             numberOfLinkedExtRefs++;
           }
         });

diff --git a/test/integration/editors/__snapshots__/GooseSubscriberMessageBinding.test.snap.js b/test/integration/editors/__snapshots__/GooseSubscriberMessageBinding.test.snap.js
@@ -856,7 +856,7 @@ snapshots["GOOSE subscriber plugin in Subscriber view with a selected IED the le
         aria-disabled="false"
         noninteractive=""
         tabindex="-1"
-        value="IED1>>CircuitBreaker_CB1>GCB"
+        value=""
       >
         <span>
           [subscription.subscriber.partiallySubscribed]
@@ -870,21 +870,18 @@ snapshots["GOOSE subscriber plugin in Subscriber view with a selected IED the le
       <mwc-list-item
         aria-disabled="false"
         graphic="avatar"
-        mwc-list-item=""
-        tabindex="0"
+        noninteractive=""
+        tabindex="-1"
       >
         <span>
-          GCB (IED1)
+          [subscription.none]
         </span>
-        <mwc-icon slot="graphic">
-          add
-        </mwc-icon>
       </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         noninteractive=""
         tabindex="-1"
-        value="IED4>>CircuitBreaker_CB1>GCB"
+        value="IED1>>CircuitBreaker_CB1>GCB IED4>>CircuitBreaker_CB1>GCB"
       >
         <span>
           [subscription.subscriber.availableToSubscribe]
@@ -895,6 +892,19 @@ snapshots["GOOSE subscriber plugin in Subscriber view with a selected IED the le
         role="separator"
       >
       </li>
+      <mwc-list-item
+        aria-disabled="false"
+        graphic="avatar"
+        mwc-list-item=""
+        tabindex="0"
+      >
+        <span>
+          GCB (IED1)
+        </span>
+        <mwc-icon slot="graphic">
+          add
+        </mwc-icon>
+      </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         graphic="avatar"
@@ -991,10 +1001,9 @@ snapshots["GOOSE subscriber plugin in Subscriber view with a selected IED for un
       </li>
       <mwc-list-item
         aria-disabled="false"
-        aria-selected="true"
+        aria-selected="false"
         graphic="avatar"
         mwc-list-item=""
-        selected=""
         tabindex="-1"
       >
         <span>
@@ -1193,8 +1202,10 @@ snapshots["GOOSE subscriber plugin in Subscriber view with a selected IED for pa
       </li>
       <mwc-list-item
         aria-disabled="false"
+        aria-selected="true"
         graphic="avatar"
         mwc-list-item=""
+        selected=""
         tabindex="-1"
       >
         <span>