Blah

Author: danyill

tDataSet/removeDataSet.spec.ts

@@ -21,14 +21,12 @@ describe("Utility function to remove DataSet element", () => {
   const val = extRefs[0].ownerDocument.querySelector(
     'LN[lnClass="LGOS"][inst="1"] > DOI[name="GoCBRef"] > DAI[name="setSrcRef"] > Val',
   )!;
-  const val2 = extRefs[0].ownerDocument.querySelector(
-    'LN[lnClass="LGOS"][inst="2"] > DOI[name="GoCBRef"] > DAI[name="setSrcRef"] > Val',
-  );
+  const ln = extRefs[0].ownerDocument.querySelector('LN[lnClass="LGOS"][inst="2"]')
 
   it("returns empty string when remove.node is not DataSet", () =>
     expect(removeDataSet({ node: val })).to.be.empty);
 
-  it("removes DataSet also removes/updates dependant data", () =>
+  it("removes DataSet also removes/updates dependent data", () =>
     expect(edits.length).to.equal(10));
 
   it("including the DataSet itself", () =>
@@ -43,7 +41,7 @@ describe("Utility function to remove DataSet element", () => {
 
   it("including the subscriber supervision", () => {
     expect((edits[5] as Remove).node).to.equal(val!.firstChild);
-    expect((edits[6] as Remove).node).to.equal(val2!.firstChild);
+    expect((edits[6] as Remove).node).to.equal(ln);
   });
 
   it("including control Block updates", () => {

tLN/removeSubscriptionSupervision.ts

@@ -10,24 +10,30 @@ type GroupedExtRefs = {
   subscriberIed: Element;
 };
 
-/** @returns Element to remove the subscription supervision control block reference */
+/** @returns Element to remove the subscription supervision */
 function removableSupervisionElement(
   ctrlBlock: Element,
   subscriberIed: Element,
 ): Element | null {
   const supervisionType = ctrlBlock.tagName === "GSEControl" ? "LGOS" : "LSVS";
+  const doiName = ctrlBlock.tagName === "GSEControl" ? 'GoCBRef' : 'SvCBRef';
 
   const valElement = Array.from(
     subscriberIed.querySelectorAll(
-      `LN[lnClass="${supervisionType}"] > DOI > DAI > Val`,
+      `LN[lnClass="${supervisionType}"] > DOI[name="${doiName}"] > DAI[name="setSrcRef"] > Val`,
     ),
   ).find((val) => val.textContent === controlBlockObjRef(ctrlBlock));
   if (!valElement) return null;
 
+  const ln = valElement.closest("LN")!;
+  const canRemoveLn = ln.querySelector(
+    ':scope > Private[type="OpenSCD.create"]',
+  );
+  if (canRemoveLn) return ln;
+
   const textContentNode = Array.from(valElement.childNodes).find(
     (child) => child.nodeType === Node.TEXT_NODE,
   ) as Element;
-
   return textContentNode ?? null;
 }