Skip to content

Commit 6e0ccf1

Browse files
JakobVogelsangDennis Labordus
andauthored
refactor(wizards/connectedap): allow to null unused P types (openscd#1014)
Co-authored-by: Dennis Labordus <[email protected]>
1 parent 42fd277 commit 6e0ccf1

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

src/wizards/foundation/p-types.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ export const typePattern: Partial<Record<string, string>> = {
115115
export const typeNullable: Partial<Record<string, boolean>> = {
116116
IP: false,
117117
'IP-SUBNET': false,
118-
'IP-GATEWAY': false,
119-
'OSI-TSEL': false,
120-
'OSI-SSEL': false,
121-
'OSI-PSEL': false,
118+
'IP-GATEWAY': true,
119+
'OSI-TSEL': true,
120+
'OSI-SSEL': true,
121+
'OSI-PSEL': true,
122122
'OSI-AP-Title': true,
123123
'OSI-AP-Invoke': true,
124124
'OSI-AE-Qualifier': true,

test/unit/wizards/__snapshots__/connectedap-pattern.test.snap.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,31 @@ snapshots["Edit wizard for SCL element ConnectedAP include an edit wizard that f
2727
</wizard-textfield>
2828
<wizard-textfield
2929
label="IP-GATEWAY"
30+
nullable=""
3031
pattern="([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])"
3132
required=""
3233
>
3334
</wizard-textfield>
3435
<wizard-textfield
3536
label="OSI-TSEL"
3637
maxlength="8"
38+
nullable=""
3739
pattern="[0-9A-F]+"
3840
required=""
3941
>
4042
</wizard-textfield>
4143
<wizard-textfield
4244
label="OSI-SSEL"
4345
maxlength="16"
46+
nullable=""
4447
pattern="[0-9A-F]+"
4548
required=""
4649
>
4750
</wizard-textfield>
4851
<wizard-textfield
4952
label="OSI-PSEL"
5053
maxlength="16"
54+
nullable=""
5155
pattern="[0-9A-F]+"
5256
required=""
5357
>
@@ -155,27 +159,31 @@ snapshots["Edit wizard for SCL element ConnectedAP include an edit wizard that f
155159
</wizard-textfield>
156160
<wizard-textfield
157161
label="IP-GATEWAY"
162+
nullable=""
158163
pattern="([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])"
159164
required=""
160165
>
161166
</wizard-textfield>
162167
<wizard-textfield
163168
label="OSI-TSEL"
164169
maxlength="8"
170+
nullable=""
165171
pattern="[0-9A-F]+"
166172
required=""
167173
>
168174
</wizard-textfield>
169175
<wizard-textfield
170176
label="OSI-SSEL"
171177
maxlength="16"
178+
nullable=""
172179
pattern="[0-9A-F]+"
173180
required=""
174181
>
175182
</wizard-textfield>
176183
<wizard-textfield
177184
label="OSI-PSEL"
178185
maxlength="16"
186+
nullable=""
179187
pattern="[0-9A-F]+"
180188
required=""
181189
>
@@ -331,27 +339,31 @@ snapshots["Edit wizard for SCL element ConnectedAP include an edit wizard that f
331339
</wizard-textfield>
332340
<wizard-textfield
333341
label="IP-GATEWAY"
342+
nullable=""
334343
pattern="([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])"
335344
required=""
336345
>
337346
</wizard-textfield>
338347
<wizard-textfield
339348
label="OSI-TSEL"
340349
maxlength="8"
350+
nullable=""
341351
pattern="[0-9A-F]+"
342352
required=""
343353
>
344354
</wizard-textfield>
345355
<wizard-textfield
346356
label="OSI-SSEL"
347357
maxlength="16"
358+
nullable=""
348359
pattern="[0-9A-F]+"
349360
required=""
350361
>
351362
</wizard-textfield>
352363
<wizard-textfield
353364
label="OSI-PSEL"
354365
maxlength="16"
366+
nullable=""
355367
pattern="[0-9A-F]+"
356368
required=""
357369
>

0 commit comments

Comments
 (0)