Fixed missing functions

Author: pascalwilbrink

src/menu/CompasImportIEDs.ts

@@ -37,8 +37,7 @@ export default class CompasImportIEDSMenuPlugin extends ImportingIedPlugin {
   }
 
   protected onLoadCompasFiles(event: DocRetrievedEvent): void {
-    this.importDoc = event.detail.doc;
-    this.prepareImport();
+    this.prepareImport(event.detail.doc, event.detail.docName!);
     this.compasOpen.close();
   }
 

src/menu/UpdateSubstation.ts

@@ -79,50 +79,53 @@ export function isValidReference(
   );
 }
 
+export function mergeSubstation(
+  element: Element,
+  currentDoc: Document,
+  docWithSubstation: Document
+): void {
+  element.dispatchEvent(
+    newWizardEvent(
+      mergeWizard(
+        // FIXME: doesn't work with multiple Substations!
+        currentDoc.documentElement,
+        docWithSubstation.documentElement,
+        {
+          title: get('updatesubstation.title'),
+          selected: (diff: Diff<Element | string>): boolean =>
+            diff.theirs instanceof Element
+              ? diff.theirs.tagName === 'LNode'
+                ? find(currentDoc, 'LNode', identity(diff.theirs)) === null &&
+                  isValidReference(docWithSubstation, identity(diff.theirs))
+                : diff.theirs.tagName === 'Substation' ||
+                  !tags['SCL'].children.includes(<SCLTag>diff.theirs.tagName)
+              : diff.theirs !== null,
+          disabled: (diff: Diff<Element | string>): boolean =>
+            diff.theirs instanceof Element &&
+            diff.theirs.tagName === 'LNode' &&
+            (find(currentDoc, 'LNode', identity(diff.theirs)) !== null ||
+              !isValidReference(docWithSubstation, identity(diff.theirs))),
+          auto: (): boolean => true,
+        }
+      )
+    )
+  );
+}
 export default class UpdateSubstationPlugin extends LitElement {
   doc!: XMLDocument;
 
   @query('#update-substation-plugin-input') pluginFileUI!: HTMLInputElement;
 
-  updateSubstation(event: Event): void {
+  async updateSubstation(event: Event): Promise<void> {
     const file =
       (<HTMLInputElement | null>event.target)?.files?.item(0) ?? false;
-    if (file)
-      file.text().then(text => {
-        const doc = new DOMParser().parseFromString(text, 'application/xml');
-        this.dispatchEvent(
-          newWizardEvent(
-            mergeWizard(
-              // FIXME: doesn't work with multiple Substations!
-              this.doc.documentElement,
-              doc.documentElement,
-              {
-                title: get('updatesubstation.title'),
-                selected: (diff: Diff<Element | string>): boolean =>
-                  diff.theirs instanceof Element
-                    ? diff.theirs.tagName === 'LNode'
-                      ? this.doc.querySelector(
-                          find('LNode', identity(diff.theirs))
-                        ) === null &&
-                        isValidReference(doc, identity(diff.theirs))
-                      : diff.theirs.tagName === 'Substation' ||
-                        !tags['SCL'].children.includes(
-                          <SCLTag>diff.theirs.tagName
-                        )
-                    : diff.theirs !== null,
-                disabled: (diff: Diff<Element | string>): boolean =>
-                  diff.theirs instanceof Element &&
-                  diff.theirs.tagName === 'LNode' &&
-                  (this.doc.querySelector(
-                    find('LNode', identity(diff.theirs))
-                  ) !== null ||
-                    !isValidReference(doc, identity(diff.theirs))),
-                auto: (): boolean => true,
-              }
-            )
-          )
-        );
-      });
+    if (!file) {
+      return;
+    }
+    const text = await file.text();
+    const doc = new DOMParser().parseFromString(text, 'application/xml');
+
+    mergeSubstation(this, this.doc, doc);
     this.pluginFileUI.onchange = null;
   }
 
@@ -131,7 +134,8 @@ export default class UpdateSubstationPlugin extends LitElement {
   }
 
   render(): TemplateResult {
-    return html`<input @click=${(event: MouseEvent) => ((<HTMLInputElement>event.target).value = '')}
+    return html`<input @click=${(event: MouseEvent) =>
+      ((<HTMLInputElement>event.target).value = '')}
                        @change=${this.updateSubstation}
                        id="update-substation-plugin-input" accept=".sed,.scd,.ssd,.iid,.cid" type="file"></input>`;
   }