Merge branch 'main' into 1318-track-prs-in-the-overview-board

openscd · Sep 14, 2023 · a08825d · a08825d
2 parents 49bc477 + 802dd41
commit a08825d
Show file tree

Hide file tree

Showing 6 changed files with 147 additions and 0 deletions.
diff --git a/src/editors/substation/ied-editor.ts b/src/editors/substation/ied-editor.ts
@@ -27,6 +27,8 @@ export class IedEditor extends LitElement {
   /** The document being edited as provided to editor by [[`Zeroline`]]. */
   @property({ attribute: false })
   doc!: XMLDocument;
+  @property({ type: Number })
+  editCount = -1;
   /** SCL element IED */
   @property({ attribute: false })
   element!: Element;

diff --git a/src/wizards/foundation/dai-field-type.ts b/src/wizards/foundation/dai-field-type.ts
@@ -38,6 +38,11 @@ const daiFieldTypes = [
   'VisString65',
   'VisString129',
   'VisString255',
+  'ObjRef',
+  'Currency',
+  'Octet64',
+  'Octet6',
+  'Octet16',
 ] as const;
 export type DaiFieldTypes = typeof daiFieldTypes[number];
 const emptyIfNull = <T>(item: T | null, value: string): string => {
@@ -65,6 +70,11 @@ export function getCustomField(): Record<DaiFieldTypes, CustomField> {
     VisString65: stringField('VisString65', 65),
     VisString129: stringField('VisString129', 129),
     VisString255: stringField('VisString255', 255),
+    ObjRef: stringField('VisString129', 129),
+    Currency: stringField('Currency', 3),
+    Octet64: stringField('Octet64', 64 * 2),
+    Octet6: stringField('Octet6', 6 * 2),
+    Octet16: stringField('Octet16', 16 * 2),
   };
 
   function booleanField(): CustomField {

diff --git a/src/wizards/foundation/enums.ts b/src/wizards/foundation/enums.ts
@@ -49,7 +49,10 @@ export const predefinedBasicTypeEnum = [
   'TrgOps',
   'OptFlds',
   'SvOptFlds',
+  'LogOptFlds',
   'EntryID',
+  'Octet6',
+  'Octet16',
 ];
 
 export const valKindEnum = ['Spec', 'Conf', 'RO', 'Set'];

diff --git a/test/integration/wizards/__snapshots__/bda-wizarding-editing.test.snap.js b/test/integration/wizards/__snapshots__/bda-wizarding-editing.test.snap.js
@@ -366,6 +366,15 @@ snapshots["BDA wizarding editing integration defines a editBDaWizard to edit an
       >
         SvOptFlds
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="LogOptFlds"
+      >
+        LogOptFlds
+      </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         mwc-list-item=""
@@ -375,6 +384,24 @@ snapshots["BDA wizarding editing integration defines a editBDaWizard to edit an
       >
         EntryID
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="Octet6"
+      >
+        Octet6
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="Octet16"
+      >
+        Octet16
+      </mwc-list-item>
     </wizard-select>
     <wizard-select
       fixedmenuposition=""
@@ -967,6 +994,15 @@ snapshots["BDA wizarding editing integration defines a createBDaWizard to create
       >
         SvOptFlds
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="LogOptFlds"
+      >
+        LogOptFlds
+      </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         mwc-list-item=""
@@ -976,6 +1012,24 @@ snapshots["BDA wizarding editing integration defines a createBDaWizard to create
       >
         EntryID
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="Octet6"
+      >
+        Octet6
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="Octet16"
+      >
+        Octet16
+      </mwc-list-item>
     </wizard-select>
     <wizard-select
       fixedmenuposition=""

diff --git a/test/integration/wizards/__snapshots__/da-wizarding-editing.test.snap.js b/test/integration/wizards/__snapshots__/da-wizarding-editing.test.snap.js
@@ -366,6 +366,15 @@ snapshots["DA wizarding editing integration defines a editDaWizard to edit an ex
       >
         SvOptFlds
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="LogOptFlds"
+      >
+        LogOptFlds
+      </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         mwc-list-item=""
@@ -375,6 +384,24 @@ snapshots["DA wizarding editing integration defines a editDaWizard to edit an ex
       >
         EntryID
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="Octet6"
+      >
+        Octet6
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="Octet16"
+      >
+        Octet16
+      </mwc-list-item>
     </wizard-select>
     <wizard-select
       fixedmenuposition=""
@@ -1156,6 +1183,15 @@ snapshots["DA wizarding editing integration defines a createDaWizard to create a
       >
         SvOptFlds
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="LogOptFlds"
+      >
+        LogOptFlds
+      </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         mwc-list-item=""
@@ -1165,6 +1201,24 @@ snapshots["DA wizarding editing integration defines a createDaWizard to create a
       >
         EntryID
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="Octet6"
+      >
+        Octet6
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        role="option"
+        tabindex="-1"
+        value="Octet16"
+      >
+        Octet16
+      </mwc-list-item>
     </wizard-select>
     <wizard-select
       fixedmenuposition=""

diff --git a/test/unit/wizards/__snapshots__/abstractda.test.snap.js b/test/unit/wizards/__snapshots__/abstractda.test.snap.js
@@ -305,6 +305,14 @@ snapshots["abstractda wizards renderWizard looks like the latest snapshot"] =
       >
         SvOptFlds
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        tabindex="-1"
+        value="LogOptFlds"
+      >
+        LogOptFlds
+      </mwc-list-item>
       <mwc-list-item
         aria-disabled="false"
         mwc-list-item=""
@@ -313,6 +321,22 @@ snapshots["abstractda wizards renderWizard looks like the latest snapshot"] =
       >
         EntryID
       </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        tabindex="-1"
+        value="Octet6"
+      >
+        Octet6
+      </mwc-list-item>
+      <mwc-list-item
+        aria-disabled="false"
+        mwc-list-item=""
+        tabindex="-1"
+        value="Octet16"
+      >
+        Octet16
+      </mwc-list-item>
     </wizard-select>
     <wizard-select
       fixedmenuposition=""