Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: Create virtual IED does not consider multiple instances of a LNType within a function #1595

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

bugfix: Create virtual IED does not consider multiple instances of a LNType within a function #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4547145
bugfix: fix getDescription logic to include all lnodes
illia-solovei-s1 Nov 15, 2024
1ea9832
bugfix: render prefix logic rework
illia-solovei-s1 Nov 18, 2024
a0f6ddd
bugfix: simplify the logic
illia-solovei-s1 Nov 18, 2024
217e86b
bugfix: bring back the use of getFunctionNamingPrefix function
illia-solovei-s1 Nov 18, 2024
c71cc40
bugfix: re-format the file
illia-solovei-s1 Nov 18, 2024
53172ee
bugfix: include lnInst in selector function
illia-solovei-s1 Nov 18, 2024
1db6a09
bugfix: adjust test cases to properly handle lnInst
illia-solovei-s1 Nov 18, 2024
ce5f7f4
bugfix(tests): temporarily adjust test
illia-solovei-s1 Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/openscd/src/foundation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ function lNodeIdentity(e: Element): string {
'lnType',
].map(name => e.getAttribute(name));
if (iedName === 'None')
return `${identity(e.parentElement)}>(${lnClass} ${lnType})`;
return `${identity(e.parentElement)}>(${lnClass} ${lnType} ${lnInst})`;
return `${iedName} ${ldInst || '(Client)'}/${prefix ?? ''} ${lnClass} ${
lnInst ?? ''
}`;
Expand All @@ -347,7 +347,7 @@ function lNodeIdentity(e: Element): string {
function lNodeSelector(tagName: SCLTag, identity: string): string {
if (identity.endsWith(')')) {
const [parentIdentity, childIdentity] = pathParts(identity);
const [lnClass, lnType] = childIdentity
const [lnClass, lnType, lnInst] = childIdentity
.substring(1, childIdentity.length - 1)
.split(' ');

Expand All @@ -360,7 +360,7 @@ function lNodeSelector(tagName: SCLTag, identity: string): string {
return crossProduct(
parentSelectors,
['>'],
[`${tagName}[iedName="None"][lnClass="${lnClass}"][lnType="${lnType}"]`]
[`${tagName}[iedName="None"][lnClass="${lnClass}"][lnType="${lnType}"][lnInst="${lnInst}"]`]
)
.map(strings => strings.join(''))
.join(',');
Expand Down
50 changes: 25 additions & 25 deletions packages/plugins/test/unit/menu/__snapshots__/VirtualTemplateIED.test.snap.js
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you done these changes by hand ? I think these snapshots are generated by a tool (not sure tho).

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got confirmation by Christopher : these are generated.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* @web/test-runner snapshot v1 */
export const snapshots = {};

snapshots["Plugin that creates with some user input a virtual template IED - SPECIFICATION looks like the latest snapshot"] =
snapshots["Plugin that creates with some user input a virtual template IED - SPECIFICATION looks like the latest snapshot"] =
`<mwc-dialog
heading="Create SPECIFICATION type IED"
open=""
Expand Down Expand Up @@ -72,7 +72,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="0"
value="AA1>E1>Q01>QC9>Earth_Switch>(CSWI OpenSCD_CSWI)"
value="AA1>E1>Q01>QC9>Earth_Switch>(CSWI OpenSCD_CSWI 1)"
>
CSWI 1
</mwc-check-list-item>
Expand All @@ -81,7 +81,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>QC9>Earth_Switch>(CILO OpenSCD_CILO)"
value="AA1>E1>Q01>QC9>Earth_Switch>(CILO OpenSCD_CILO 1)"
>
CILO 1
</mwc-check-list-item>
Expand All @@ -90,7 +90,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>QC9>Earth_Switch>(XSWI OpenSCD_XSWI_EarthSwitch)"
value="AA1>E1>Q01>QC9>Earth_Switch>(XSWI OpenSCD_XSWI_EarthSwitch 1)"
>
XSWI 1
</mwc-check-list-item>
Expand Down Expand Up @@ -148,7 +148,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>QB1>Disconnector>(CSWI OpenSCD_CSWI)"
value="AA1>E1>Q01>QB1>Disconnector>(CSWI OpenSCD_CSWI 1)"
>
CSWI 1
</mwc-check-list-item>
Expand All @@ -157,7 +157,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>QB1>Disconnector>(XSWI OpenSCD_XSWI_DIS)"
value="AA1>E1>Q01>QB1>Disconnector>(XSWI OpenSCD_XSWI_DIS 1)"
>
XSWI 1
</mwc-check-list-item>
Expand All @@ -166,7 +166,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>QB1>Disconnector>(CILO OpenSCD_CILO)"
value="AA1>E1>Q01>QB1>Disconnector>(CILO OpenSCD_CILO 1)"
>
CILO 1
</mwc-check-list-item>
Expand Down Expand Up @@ -224,7 +224,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>QA1>Circuit_Breaker>(CSWI OpenSCD_CSWI)"
value="AA1>E1>Q01>QA1>Circuit_Breaker>(CSWI OpenSCD_CSWI 1)"
>
CSWI 1
</mwc-check-list-item>
Expand All @@ -233,7 +233,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>QA1>Circuit_Breaker>(CILO OpenSCD_CILO)"
value="AA1>E1>Q01>QA1>Circuit_Breaker>(CILO OpenSCD_CILO 1)"
>
CILO 1
</mwc-check-list-item>
Expand All @@ -242,7 +242,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>QA1>Circuit_Breaker>(XCBR OpenSCD_XCBR)"
value="AA1>E1>Q01>QA1>Circuit_Breaker>(XCBR OpenSCD_XCBR 1)"
>
XCBR 1
</mwc-check-list-item>
Expand Down Expand Up @@ -292,7 +292,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>Timed_Overcurrent>(PTOC OpenSCD_PTOC)"
value="AA1>E1>Q01>Timed_Overcurrent>(PTOC OpenSCD_PTOC 2)"
>
ID_ PTOC 2
</mwc-check-list-item>
Expand All @@ -301,7 +301,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>Timed_Overcurrent>(PTOC OpenSCD_PTOC)"
value="AA1>E1>Q01>Timed_Overcurrent>(PTOC OpenSCD_PTOC 1)"
>
IDD_ PTOC 1
</mwc-check-list-item>
Expand Down Expand Up @@ -359,7 +359,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>Distance_Protection>Zone4>(PDIS OpenSCD_PDIS)"
value="AA1>E1>Q01>Distance_Protection>Zone4>(PDIS OpenSCD_PDIS 1)"
>
Zone4 PDIS 1
</mwc-check-list-item>
Expand All @@ -368,7 +368,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>Distance_Protection>Zon3>(PDIS OpenSCD_PDIS)"
value="AA1>E1>Q01>Distance_Protection>Zon3>(PDIS OpenSCD_PDIS 1)"
>
Zon3 PDIS 1
</mwc-check-list-item>
Expand All @@ -377,7 +377,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>Distance_Protection>Zone2>(PDIS OpenSCD_PDIS)"
value="AA1>E1>Q01>Distance_Protection>Zone2>(PDIS OpenSCD_PDIS 1)"
>
Zone2 PDIS 1
</mwc-check-list-item>
Expand All @@ -386,7 +386,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q01>Distance_Protection>Zone1>(PDIS OpenSCD_PDIS)"
value="AA1>E1>Q01>Distance_Protection>Zone1>(PDIS OpenSCD_PDIS 1)"
>
Zone1 PDIS 1
</mwc-check-list-item>
Expand Down Expand Up @@ -444,7 +444,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q02>QB1>Disconnector>(CSWI OpenSCD_CSWI)"
value="AA1>E1>Q02>QB1>Disconnector>(CSWI OpenSCD_CSWI 1)"
>
CSWI 1
</mwc-check-list-item>
Expand All @@ -453,7 +453,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q02>QB1>Disconnector>(XSWI OpenSCD_XSWI_DIS)"
value="AA1>E1>Q02>QB1>Disconnector>(XSWI OpenSCD_XSWI_DIS 1)"
>
XSWI 1
</mwc-check-list-item>
Expand All @@ -462,7 +462,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>E1>Q02>QB1>Disconnector>(CILO OpenSCD_CILO)"
value="AA1>E1>Q02>QB1>Disconnector>(CILO OpenSCD_CILO 1)"
>
CILO 1
</mwc-check-list-item>
Expand Down Expand Up @@ -520,7 +520,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>J1>Q01>QC9>Earth_Switch>(CSWI OpenSCD_CSWI)"
value="AA1>J1>Q01>QC9>Earth_Switch>(CSWI OpenSCD_CSWI 1)"
>
CSWI 1
</mwc-check-list-item>
Expand All @@ -529,7 +529,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>J1>Q01>QC9>Earth_Switch>(CILO OpenSCD_CILO)"
value="AA1>J1>Q01>QC9>Earth_Switch>(CILO OpenSCD_CILO 1)"
>
CILO 1
</mwc-check-list-item>
Expand All @@ -538,7 +538,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
graphic="control"
mwc-list-item=""
tabindex="-1"
value="AA1>J1>Q01>QC9>Earth_Switch>(XSWI OpenSCD_XSWI_EarthSwitch)"
value="AA1>J1>Q01>QC9>Earth_Switch>(XSWI OpenSCD_XSWI_EarthSwitch 1)"
>
XSWI 1
</mwc-check-list-item>
Expand Down Expand Up @@ -569,7 +569,7 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
`;
/* end snapshot Plugin that creates with some user input a virtual template IED - SPECIFICATION looks like the latest snapshot */

snapshots["Plugin that creates with some user input a virtual template IED - SPECIFICATION IEDs data model show selected logical nodes and its structure"] =
snapshots["Plugin that creates with some user input a virtual template IED - SPECIFICATION IEDs data model show selected logical nodes and its structure"] =
`<IED
manufacturer="SomeCompanyName"
name="SPECIFICATION"
Expand Down Expand Up @@ -601,10 +601,10 @@ snapshots["Plugin that creates with some user input a virtual template IED - SPE
>
</LN0>
<LN
inst="2"
inst="1"
lnClass="PTOC"
lnType="OpenSCD_PTOC"
prefix="ID_"
prefix="IDD_"
>
</LN>
</LDevice>
Expand Down
Loading