Skip to content

Commit 0bff5aa

Browse files
jarradraumatijarradraumati
authored
fix(wizards/foundation): Added missing DAI bTypes (openscd#1320)
* Added missing DAI bTypes from IEC 61850-6 ed. 2.1 * Updated test snapshots to include added bTypes * Octet assumed to be no zero padding, no space hexadecimal string value
1 parent a170e8b commit 0bff5aa

File tree

5 files changed

+145
-0
lines changed

5 files changed

+145
-0
lines changed

‎src/wizards/foundation/dai-field-type.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ const daiFieldTypes = [
3838
'VisString65',
3939
'VisString129',
4040
'VisString255',
41+
'ObjRef',
42+
'Currency',
43+
'Octet64',
44+
'Octet6',
45+
'Octet16',
4146
] as const;
4247
export type DaiFieldTypes = typeof daiFieldTypes[number];
4348
const emptyIfNull = <T>(item: T | null, value: string): string => {
@@ -65,6 +70,11 @@ export function getCustomField(): Record<DaiFieldTypes, CustomField> {
6570
VisString65: stringField('VisString65', 65),
6671
VisString129: stringField('VisString129', 129),
6772
VisString255: stringField('VisString255', 255),
73+
ObjRef: stringField('VisString129', 129),
74+
Currency: stringField('Currency', 3),
75+
Octet64: stringField('Octet64', 64 * 2),
76+
Octet6: stringField('Octet6', 6 * 2),
77+
Octet16: stringField('Octet16', 16 * 2),
6878
};
6979

7080
function booleanField(): CustomField {

‎src/wizards/foundation/enums.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ export const predefinedBasicTypeEnum = [
4949
'TrgOps',
5050
'OptFlds',
5151
'SvOptFlds',
52+
'LogOptFlds',
5253
'EntryID',
54+
'Octet6',
55+
'Octet16',
5356
];
5457

5558
export const valKindEnum = ['Spec', 'Conf', 'RO', 'Set'];

‎test/integration/wizards/__snapshots__/bda-wizarding-editing.test.snap.js‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,15 @@ snapshots["BDA wizarding editing integration defines a editBDaWizard to edit an
366366
>
367367
SvOptFlds
368368
</mwc-list-item>
369+
<mwc-list-item
370+
aria-disabled="false"
371+
mwc-list-item=""
372+
role="option"
373+
tabindex="-1"
374+
value="LogOptFlds"
375+
>
376+
LogOptFlds
377+
</mwc-list-item>
369378
<mwc-list-item
370379
aria-disabled="false"
371380
mwc-list-item=""
@@ -375,6 +384,24 @@ snapshots["BDA wizarding editing integration defines a editBDaWizard to edit an
375384
>
376385
EntryID
377386
</mwc-list-item>
387+
<mwc-list-item
388+
aria-disabled="false"
389+
mwc-list-item=""
390+
role="option"
391+
tabindex="-1"
392+
value="Octet6"
393+
>
394+
Octet6
395+
</mwc-list-item>
396+
<mwc-list-item
397+
aria-disabled="false"
398+
mwc-list-item=""
399+
role="option"
400+
tabindex="-1"
401+
value="Octet16"
402+
>
403+
Octet16
404+
</mwc-list-item>
378405
</wizard-select>
379406
<wizard-select
380407
fixedmenuposition=""
@@ -967,6 +994,15 @@ snapshots["BDA wizarding editing integration defines a createBDaWizard to create
967994
>
968995
SvOptFlds
969996
</mwc-list-item>
997+
<mwc-list-item
998+
aria-disabled="false"
999+
mwc-list-item=""
1000+
role="option"
1001+
tabindex="-1"
1002+
value="LogOptFlds"
1003+
>
1004+
LogOptFlds
1005+
</mwc-list-item>
9701006
<mwc-list-item
9711007
aria-disabled="false"
9721008
mwc-list-item=""
@@ -976,6 +1012,24 @@ snapshots["BDA wizarding editing integration defines a createBDaWizard to create
9761012
>
9771013
EntryID
9781014
</mwc-list-item>
1015+
<mwc-list-item
1016+
aria-disabled="false"
1017+
mwc-list-item=""
1018+
role="option"
1019+
tabindex="-1"
1020+
value="Octet6"
1021+
>
1022+
Octet6
1023+
</mwc-list-item>
1024+
<mwc-list-item
1025+
aria-disabled="false"
1026+
mwc-list-item=""
1027+
role="option"
1028+
tabindex="-1"
1029+
value="Octet16"
1030+
>
1031+
Octet16
1032+
</mwc-list-item>
9791033
</wizard-select>
9801034
<wizard-select
9811035
fixedmenuposition=""

‎test/integration/wizards/__snapshots__/da-wizarding-editing.test.snap.js‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,15 @@ snapshots["DA wizarding editing integration defines a editDaWizard to edit an ex
366366
>
367367
SvOptFlds
368368
</mwc-list-item>
369+
<mwc-list-item
370+
aria-disabled="false"
371+
mwc-list-item=""
372+
role="option"
373+
tabindex="-1"
374+
value="LogOptFlds"
375+
>
376+
LogOptFlds
377+
</mwc-list-item>
369378
<mwc-list-item
370379
aria-disabled="false"
371380
mwc-list-item=""
@@ -375,6 +384,24 @@ snapshots["DA wizarding editing integration defines a editDaWizard to edit an ex
375384
>
376385
EntryID
377386
</mwc-list-item>
387+
<mwc-list-item
388+
aria-disabled="false"
389+
mwc-list-item=""
390+
role="option"
391+
tabindex="-1"
392+
value="Octet6"
393+
>
394+
Octet6
395+
</mwc-list-item>
396+
<mwc-list-item
397+
aria-disabled="false"
398+
mwc-list-item=""
399+
role="option"
400+
tabindex="-1"
401+
value="Octet16"
402+
>
403+
Octet16
404+
</mwc-list-item>
378405
</wizard-select>
379406
<wizard-select
380407
fixedmenuposition=""
@@ -1156,6 +1183,15 @@ snapshots["DA wizarding editing integration defines a createDaWizard to create a
11561183
>
11571184
SvOptFlds
11581185
</mwc-list-item>
1186+
<mwc-list-item
1187+
aria-disabled="false"
1188+
mwc-list-item=""
1189+
role="option"
1190+
tabindex="-1"
1191+
value="LogOptFlds"
1192+
>
1193+
LogOptFlds
1194+
</mwc-list-item>
11591195
<mwc-list-item
11601196
aria-disabled="false"
11611197
mwc-list-item=""
@@ -1165,6 +1201,24 @@ snapshots["DA wizarding editing integration defines a createDaWizard to create a
11651201
>
11661202
EntryID
11671203
</mwc-list-item>
1204+
<mwc-list-item
1205+
aria-disabled="false"
1206+
mwc-list-item=""
1207+
role="option"
1208+
tabindex="-1"
1209+
value="Octet6"
1210+
>
1211+
Octet6
1212+
</mwc-list-item>
1213+
<mwc-list-item
1214+
aria-disabled="false"
1215+
mwc-list-item=""
1216+
role="option"
1217+
tabindex="-1"
1218+
value="Octet16"
1219+
>
1220+
Octet16
1221+
</mwc-list-item>
11681222
</wizard-select>
11691223
<wizard-select
11701224
fixedmenuposition=""

‎test/unit/wizards/__snapshots__/abstractda.test.snap.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,14 @@ snapshots["abstractda wizards renderWizard looks like the latest snapshot"] =
305305
>
306306
SvOptFlds
307307
</mwc-list-item>
308+
<mwc-list-item
309+
aria-disabled="false"
310+
mwc-list-item=""
311+
tabindex="-1"
312+
value="LogOptFlds"
313+
>
314+
LogOptFlds
315+
</mwc-list-item>
308316
<mwc-list-item
309317
aria-disabled="false"
310318
mwc-list-item=""
@@ -313,6 +321,22 @@ snapshots["abstractda wizards renderWizard looks like the latest snapshot"] =
313321
>
314322
EntryID
315323
</mwc-list-item>
324+
<mwc-list-item
325+
aria-disabled="false"
326+
mwc-list-item=""
327+
tabindex="-1"
328+
value="Octet6"
329+
>
330+
Octet6
331+
</mwc-list-item>
332+
<mwc-list-item
333+
aria-disabled="false"
334+
mwc-list-item=""
335+
tabindex="-1"
336+
value="Octet16"
337+
>
338+
Octet16
339+
</mwc-list-item>
316340
</wizard-select>
317341
<wizard-select
318342
fixedmenuposition=""

0 commit comments

Comments
 (0)