Added create subequipment wizard (#1097)

Signed-off-by: Pascal Wilbrink <pascal.wilbrink@alliander.com> Signed-off-by: Pascal Wilbrink <pascal.wilbrink@alliander.com> Co-authored-by: Dennis Labordus <dennis.labordus@alliander.com>
openscd · Nov 29, 2022 · 875b255 · 875b255
1 parent 9fbfbcd
commit 875b255
Show file tree

Hide file tree

Showing 8 changed files with 403 additions and 7 deletions.
diff --git a/src/foundation.ts b/src/foundation.ts
@@ -2131,7 +2131,6 @@ export const tags: Record<
       'TransformerWinding',
       'SubEquipment',
       'EqFunction',
-      'SubEquipment',
     ],
   },
   Private: {

diff --git a/src/wizards/subequipment.ts b/src/wizards/subequipment.ts
@@ -3,6 +3,7 @@ import { get, translate } from 'lit-translate';
 
 import {
   cloneElement,
+  createElement,
   getChildElementsByTagName,
   getValue,
   SimpleAction,
@@ -22,7 +23,7 @@ interface ContentOptions {
   reservedNames: string[];
 }
 
-export function contentFunctionWizard(
+export function contentSubEquipmentWizard(
   content: ContentOptions
 ): TemplateResult[] {
   return [
@@ -112,7 +113,7 @@ export function editSubEquipmentWizard(element: Element): Wizard {
         action: updateSubEquipmentAction(element),
       },
       content: [
-        ...contentFunctionWizard({
+        ...contentSubEquipmentWizard({
           name,
           desc,
           phase,
@@ -123,3 +124,52 @@ export function editSubEquipmentWizard(element: Element): Wizard {
     },
   ];
 }
+
+function createSubEquipmentAction(parent: Element): WizardActor {
+  return (inputs: WizardInputElement[]) => {
+    const subEquipmentAttrs: Record<string, string | null> = {};
+    const subEquipmentKeys = ['name', 'desc', 'phase', 'virtual'];
+    subEquipmentKeys.forEach(key => {
+      subEquipmentAttrs[key] = getValue(inputs.find(i => i.label === key)!);
+    });
+
+    const subEquipment = createElement(
+      parent.ownerDocument,
+      'SubEquipment',
+      subEquipmentAttrs
+    );
+
+    return [{ new: { parent, element: subEquipment } }];
+  };
+}
+
+export function createSubEquipmentWizard(parent: Element): Wizard {
+  const name = '';
+  const desc = null;
+  const phase = null;
+  const virtual = null;
+  const reservedNames = Array.from(parent.querySelectorAll('SubEquipment')).map(
+    subEquipment => subEquipment.getAttribute('name')!
+  );
+
+  return [
+    {
+      title: get('wizard.title.add', { tagName: 'SubEquipment' }),
+      primary: {
+        icon: 'save',
+        label: get('save'),
+        action: createSubEquipmentAction(parent),
+      },
+      content: [
+        ...contentSubEquipmentWizard({
+          name,
+          desc,
+          phase,
+          virtual,
+          reservedNames,
+        }),
+      ],
+    },
+  ];
+}
+
diff --git a/src/wizards/wizard-library.ts b/src/wizards/wizard-library.ts
@@ -36,7 +36,7 @@ import {
   editSubFunctionWizard,
 } from './subfunction.js';
 import { editSampledValueControlWizard } from './sampledvaluecontrol.js';
-import { editSubEquipmentWizard } from './subequipment.js';
+import { createSubEquipmentWizard, editSubEquipmentWizard } from './subequipment.js';
 import { editGeneralEquipmentWizard } from './generalEquipment.js';
 
 type SclElementWizard = (
@@ -485,7 +485,7 @@ export const wizards: Record<
   },
   SubEquipment: {
     edit: editSubEquipmentWizard,
-    create: emptyWizard,
+    create: createSubEquipmentWizard,
   },
   SubFunction: {
     edit: editSubFunctionWizard,

diff --git a/test/integration/editors/substation/powertransformer-editor-wizarding-editing.test.ts b/test/integration/editors/substation/powertransformer-editor-wizarding-editing.test.ts
@@ -19,7 +19,9 @@ const openAndCancelMenu: (
   new Promise(async resolve => {
     expect(parent.wizardUI.dialog).to.be.undefined;
 
-    element?.shadowRoot?.querySelector<MenuBase>("mwc-icon-button[icon='playlist_add']")!.click();
+    element?.shadowRoot
+      ?.querySelector<MenuBase>("mwc-icon-button[icon='playlist_add']")!
+      .click();
     const lnodMenuItem: ListItemBase =
       element?.shadowRoot?.querySelector<ListItemBase>(
         `mwc-list-item[value='LNode']`
@@ -151,5 +153,47 @@ describe('powertransformer-editor wizarding editing integration', () => {
       await openAndCancelMenu(parent, element!);
       await openAndCancelMenu(parent, element!);
     });
+
+    it('Should add SubEquipment', async () => {
+      expect(parent.wizardUI.dialog).to.be.undefined;
+
+      element?.shadowRoot
+        ?.querySelector<MenuBase>("mwc-icon-button[icon='playlist_add']")!
+        .click();
+
+      element?.shadowRoot
+        ?.querySelector<ListItemBase>(`mwc-list-item[value='SubEquipment']`)!
+        .click();
+
+      await new Promise(resolve => setTimeout(resolve, 100)); // await animation
+
+      expect(parent.wizardUI.dialog).to.exist;
+
+      const nameTextField: WizardTextField =
+        parent.wizardUI!.dialog!.querySelector<WizardTextField>(
+          'wizard-textfield[label="name"]'
+        )!;
+
+      const subEquipmentName = 'unique-name';
+
+      nameTextField.value = subEquipmentName;
+
+      await parent.updateComplete;
+
+      const primaryAction: HTMLElement = <HTMLElement>(
+        parent.wizardUI.dialog?.querySelector(
+          'mwc-button[slot="primaryAction"]'
+        )
+      );
+
+      primaryAction.click();
+      await parent.updateComplete;
+
+      expect(
+        doc.querySelectorAll(
+          `PowerTransformer[name="myPtr2"] > SubEquipment[name="${subEquipmentName}"]`
+        ).length
+      ).to.equal(1);
+    });
   });
 });
diff --git a/test/unit/editors/substation/__snapshots__/conducting-equipment-editor.test.snap.js b/test/unit/editors/substation/__snapshots__/conducting-equipment-editor.test.snap.js
@@ -123,6 +123,17 @@ snapshots["conducting-equipment-editor rendered as action pane looks like the la
           EqFunction
         </span>
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="menuitem"
+        tabindex="-1"
+        value="SubEquipment"
+      >
+        <span>
+          SubEquipment
+        </span>
+      </mwc-list-item>
     </mwc-menu>
   </abbr>
 </action-pane>
@@ -216,6 +227,17 @@ snapshots["conducting-equipment-editor rendered as action pane with EqFunction c
           EqFunction
         </span>
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="menuitem"
+        tabindex="-1"
+        value="SubEquipment"
+      >
+        <span>
+          SubEquipment
+        </span>
+      </mwc-list-item>
     </mwc-menu>
   </abbr>
   <eq-function-editor showfunctions="">
@@ -311,6 +333,17 @@ snapshots["conducting-equipment-editor rendered as action pane with LNode childr
           EqFunction
         </span>
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="menuitem"
+        tabindex="-1"
+        value="SubEquipment"
+      >
+        <span>
+          SubEquipment
+        </span>
+      </mwc-list-item>
     </mwc-menu>
   </abbr>
   <div class="container lnode">
@@ -412,6 +445,17 @@ snapshots["conducting-equipment-editor rendered as action pane with SubEquipment
           EqFunction
         </span>
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="menuitem"
+        tabindex="-1"
+        value="SubEquipment"
+      >
+        <span>
+          SubEquipment
+        </span>
+      </mwc-list-item>
     </mwc-menu>
   </abbr>
   <div class="container subequipment">

diff --git a/test/unit/editors/substation/__snapshots__/powertransformer-editor.test.snap.js b/test/unit/editors/substation/__snapshots__/powertransformer-editor.test.snap.js
@@ -113,6 +113,17 @@ snapshots["powertransformer-editor rendered as action pane looks like the latest
           LNode
         </span>
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="menuitem"
+        tabindex="-1"
+        value="SubEquipment"
+      >
+        <span>
+          SubEquipment
+        </span>
+      </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         mwc-list-item=""
@@ -212,6 +223,17 @@ snapshots["powertransformer-editor rendered as action pane with EqFunction child
           LNode
         </span>
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="menuitem"
+        tabindex="-1"
+        value="SubEquipment"
+      >
+        <span>
+          SubEquipment
+        </span>
+      </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         mwc-list-item=""
@@ -307,6 +329,17 @@ snapshots["powertransformer-editor rendered as action pane with LNode children l
           LNode
         </span>
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="menuitem"
+        tabindex="-1"
+        value="SubEquipment"
+      >
+        <span>
+          SubEquipment
+        </span>
+      </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         mwc-list-item=""
@@ -404,6 +437,17 @@ snapshots["powertransformer-editor rendered as action pane with SubEquipment chi
           LNode
         </span>
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="menuitem"
+        tabindex="-1"
+        value="SubEquipment"
+      >
+        <span>
+          SubEquipment
+        </span>
+      </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         mwc-list-item=""