fix(wizards/connectedap) Scope Address for ConnectedAP more narrowly, closes openscd#1123 (openscd#1124)

* Scope Address for ConnectedAP more narrowly, closes openscd#1123

Author: danyill

src/wizards/connectedap.ts

@@ -331,7 +331,7 @@ export function createPTextField(
     label="${pType}"
     pattern="${ifDefined(typePattern[pType])}"
     ?nullable=${typeNullable[pType]}
-    .maybeValue=${element.querySelector(`Address > P[type="${pType}"]`)
+    .maybeValue=${element.querySelector(`:scope > Address > P[type="${pType}"]`)
       ?.innerHTML ?? null}
     maxLength="${ifDefined(typeMaxLength[pType])}"
   ></wizard-textfield>`;

test/integration/wizards/connectedap-wizarding-editing-integration.test.ts

@@ -0,0 +1,51 @@
+import { expect, fixture, html } from '@open-wc/testing';
+
+import '../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../mock-wizard-editor.js';
+
+import { editConnectedApWizard } from '../../../src/wizards/connectedap.js';
+
+describe('connectedap wizarding editing integration', () => {
+  let doc: XMLDocument;
+  let element: MockWizardEditor;
+
+  beforeEach(async () => {
+    element = await fixture(html`<mock-wizard-editor></mock-wizard-editor>`);
+    doc = await fetch('/test/testfiles/valid2003.scd')
+      .then(response => response.text())
+      .then(str => new DOMParser().parseFromString(str, 'application/xml'));
+  });
+
+  it('does not inherit the VLAN-ID and VLAN-PRIORITY of a child Address element', async () => {
+    const parser = new DOMParser();
+    const newGSE = `
+    <GSE ldInst="CircuitBreaker_CB1" cbName="GCB">
+      <Address>
+        <P type="MAC-Address">01-0C-CD-01-00-10</P>
+        <P type="VLAN-ID">005</P>
+        <P type="VLAN-PRIORITY">4</P>
+        <P type="APPID">0010</P>
+      </Address>
+    </GSE>
+    `;
+    const connectedAP = doc.querySelector('ConnectedAP[iedName="IED1"]')!;
+    connectedAP.appendChild(
+      parser.parseFromString(newGSE, 'application/xml').documentElement
+    );
+
+    const wizard = editConnectedApWizard(connectedAP);
+    element.workflow.push(() => wizard);
+    await element.requestUpdate();
+    await element.updateComplete;
+
+    const vlanId = element.wizardUI.shadowRoot!.querySelector(
+      'wizard-textfield[label="VLAN-ID"]'
+    )!;
+    const vlanPriority = element.wizardUI.shadowRoot!.querySelector(
+      'wizard-textfield[label="VLAN-PRIORITY"]'
+    )!;
+
+    expect(vlanId.hasAttribute('disabled')).to.be.true;
+    expect(vlanPriority.hasAttribute('disabled')).to.be.true;
+  });
+});

test/unit/wizards/__snapshots__/connectedap-pattern.test.snap.js

@@ -411,13 +411,15 @@ snapshots["Edit wizard for SCL element ConnectedAP include an edit wizard that f
     >
     </wizard-textfield>
     <wizard-textfield
+      disabled=""
       label="VLAN-ID"
       nullable=""
       pattern="[0-9A-F]{3}"
       required=""
     >
     </wizard-textfield>
     <wizard-textfield
+      disabled=""
       label="VLAN-PRIORITY"
       nullable=""
       pattern="[0-7]"