Merge pull request #60 from com-pas/fix/schema-validation-warning

noraeb · web-flow · commit 9d569262375f · 2026-05-07T11:44:28.000+02:00
fix: set scl schema version back to minimum of 2007B4
diff --git a/packages/openscd/public/md/Validate-template.md b/packages/openscd/public/md/Validate-template.md
@@ -1,6 +1,6 @@
 The templates validator can find issues that the schema validator cannot, because the issues are not connected to the schema defined in IEC 61850-6 but with other parts of the standard: IEC 61850-7-3/IEC 61850-7-4/IEC 61850-8-1.
 
-> NOTE: OpenSCD is using name space description (NSD) files as a reference (how it should be). These files are provided by the standard but not for all Editions. That is why we only validate the `DataTypeTemplate` section for projects 2007B5 and higher (Edition 2.1).
+> NOTE: OpenSCD is using name space description (NSD) files as a reference (how it should be). These files are provided by the standard but not for all Editions. That is why we only validate the `DataTypeTemplate` section for projects 2007B4 and higher (Edition 2.1).
 
 The validator is triggered on every change in the project basis and the results are displayed in the **diagnostics** pane like so:
 
diff --git a/packages/openscd/src/translations/de.ts b/packages/openscd/src/translations/de.ts
@@ -180,7 +180,7 @@ export const de: Translations = {
     zeroissues: 'Es konnten keine Fehler in dem Projekt gefunden werden.',
     placeholder: 'Hier werden Validierungsfehler angezeigt.',
     missingnsd:
-      'DataTypeTemplates können nicht validiert werden. Das Projekt muss die Version 2007B5 oder höher haben.',
+      'DataTypeTemplates können nicht validiert werden. Das Projekt muss die Version 2007B4 oder höher haben.',
   },
   plugins: {
     heading: 'Plug-ins',
diff --git a/packages/openscd/src/translations/en.ts b/packages/openscd/src/translations/en.ts
@@ -157,7 +157,7 @@ export const en = {
     zeroissues: 'No errors found in the project',
     placeholder: 'Issues found during validation will show up here',
     missingnsd:
-      'Cannot validate DataTypeTemplates. The version of the project must be higher than or equal to 2007B5',
+      'Cannot validate DataTypeTemplates. The version of the project must be higher than or equal to 2007B4',
   },
   plugins: {
     heading: 'Plug-ins',
diff --git a/packages/plugins/src/validators/ValidateTemplates.ts b/packages/plugins/src/validators/ValidateTemplates.ts
@@ -42,7 +42,7 @@ export default class ValidateTemplates extends LitElement {
       this.doc.documentElement.getAttribute('release') ?? '',
     ];
 
-    if (!(version === '2007' && revision === 'B' && Number(release) >= 5)) {
+    if (!(version === '2007' && revision === 'B' && Number(release) > 3)) {
       this.dispatchEvent(
         newIssueEvent({
           validatorId: this.pluginId,
diff --git a/packages/plugins/test/integration/validators/ValidateTemplates.test.ts b/packages/plugins/test/integration/validators/ValidateTemplates.test.ts
@@ -70,7 +70,7 @@ describe('ValidateTemplates OpenSCD integration test ', () => {
       await expect(parent.historyAddon.diagnosticUI).to.equalSnapshot();
     });
   });
-  describe('with schema version smaller "2007B5"', () => {
+  describe('with schema version smaller "2007B4"', () => {
     beforeEach(async () => {
       doc = await fetch('/test/testfiles/valid2007B.scd')
         .then(response => response.text())
diff --git a/packages/plugins/test/integration/validators/__snapshots__/ValidateTemplates.test.snap.js b/packages/plugins/test/integration/validators/__snapshots__/ValidateTemplates.test.snap.js
@@ -529,7 +529,7 @@ snapshots["ValidateTemplates OpenSCD integration test  with issues in the DataTy
 `;
 /* end snapshot ValidateTemplates OpenSCD integration test  with issues in the DataTypeTemplates section pushes issues to the diagnostics pane that look like the latest snapshot */
 
-snapshots["ValidateTemplates OpenSCD integration test  with schema version smaller \"2007B5\" looks like the latest snapshot"] = 
+snapshots["ValidateTemplates OpenSCD integration test  with schema version smaller \"2007B4\" looks like the latest snapshot"] = 
 `<mwc-dialog
   heading="Diagnostics"
   id="diagnostic"
@@ -551,15 +551,15 @@ snapshots["ValidateTemplates OpenSCD integration test  with schema version small
       role="separator"
     >
     </li>
-    <abbr title="Cannot validate DataTypeTemplates. The version of the project must be higher than or equal to 2007B5
+    <abbr title="Cannot validate DataTypeTemplates. The version of the project must be higher than or equal to 2007B4
 ">
       <mwc-list-item
         aria-disabled="false"
         mwc-list-item=""
         tabindex="-1"
       >
         <span>
-          Cannot validate DataTypeTemplates. The version of the project must be higher than or equal to 2007B5
+          Cannot validate DataTypeTemplates. The version of the project must be higher than or equal to 2007B4
         </span>
         <span slot="secondary">
         </span>
@@ -574,5 +574,5 @@ snapshots["ValidateTemplates OpenSCD integration test  with schema version small
   </mwc-button>
 </mwc-dialog>
 `;
-/* end snapshot ValidateTemplates OpenSCD integration test  with schema version smaller "2007B5" looks like the latest snapshot */
+/* end snapshot ValidateTemplates OpenSCD integration test  with schema version smaller "2007B4" looks like the latest snapshot */
 
diff --git a/packages/plugins/test/testfiles/templates/dotypes.scd b/packages/plugins/test/testfiles/templates/dotypes.scd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SCL version="2007" revision="B" release="5" xmlns:sxy="http://www.iec.ch/61850/2003/SCLcoordinates" xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:txy="http://www.iec.ch/61850/2003/Terminal" xmlns:scl="http://www.iec.ch/61850/2003/SCL" xsi:schemaLocation="http://www.iec.ch/61850/2003/SCL SCL.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IEC_60870_5_104="http://www.iec.ch/61850-80-1/2007/SCL">
+<SCL version="2007" revision="B" release="4" xmlns:sxy="http://www.iec.ch/61850/2003/SCLcoordinates" xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:txy="http://www.iec.ch/61850/2003/Terminal" xmlns:scl="http://www.iec.ch/61850/2003/SCL" xsi:schemaLocation="http://www.iec.ch/61850/2003/SCL SCL.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IEC_60870_5_104="http://www.iec.ch/61850-80-1/2007/SCL">
 	<Header id="TrainingIEC61850" version="1" revision="143" toolID="IEC 61850 System Configurator, Version: V5.90 " nameStructure="IEDName">
 		<Text>TrainingIEC61850</Text>
 		<History>
diff --git a/packages/plugins/test/testfiles/validators/datatypetemplateerrors.scd b/packages/plugins/test/testfiles/validators/datatypetemplateerrors.scd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SCL xmlns:sxy="http://www.iec.ch/61850/2003/SCLcoordinates" xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:txy="http://www.iec.ch/61850/2003/Terminal" xmlns:scl="http://www.iec.ch/61850/2003/SCL" xsi:schemaLocation="http://www.iec.ch/61850/2003/SCL SCL.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IEC_60870_5_104="http://www.iec.ch/61850-80-1/2007/SCL" version="2007" revision="B" release="5">
+<SCL xmlns:sxy="http://www.iec.ch/61850/2003/SCLcoordinates" xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:txy="http://www.iec.ch/61850/2003/Terminal" xmlns:scl="http://www.iec.ch/61850/2003/SCL" xsi:schemaLocation="http://www.iec.ch/61850/2003/SCL SCL.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:IEC_60870_5_104="http://www.iec.ch/61850-80-1/2007/SCL" version="2007" revision="B" release="4">
 	<Header id="TrainingIEC61850" version="1" revision="143" toolID="IEC 61850 System Configurator, Version: V5.90 " nameStructure="IEDName">
 		<Text>TrainingIEC61850</Text>
 		<History>
diff --git a/packages/plugins/test/testfiles/validators/zeroissues.scd b/packages/plugins/test/testfiles/validators/zeroissues.scd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SCL xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="5">
+<SCL xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
 	<Header id="TrainingIEC61850" version="1" revision="143" />
     <DataTypeTemplates>
     </DataTypeTemplates>
diff --git a/packages/plugins/test/unit/validators/ValidateTemplates.test.ts b/packages/plugins/test/unit/validators/ValidateTemplates.test.ts
@@ -127,12 +127,12 @@ describe('ValidateTemplates', () => {
       );
     });
 
-    it('pushes only diag.missingnsd issue to diagnostics pane for SCL version < 2007B5', async () => {
+    it('pushes only diag.missingnsd issue to diagnostics pane for SCL version < 2007B4', async () => {
       element.doc.querySelector('SCL')?.setAttribute('version', '2003');
       await element.validate();
       expect(issueEvent).to.have.been.calledOnce;
       expect(issueEvent.args[0][0].detail.title).to.contain(
-        'Cannot validate DataTypeTemplates. The version of the project must be higher than or equal to 2007B5'
+        'Cannot validate DataTypeTemplates. The version of the project must be higher than or equal to 2007B4'
       );
     });
 
@@ -142,7 +142,7 @@ describe('ValidateTemplates', () => {
       await element.validate();
       expect(issueEvent).to.have.been.calledOnce;
       expect(issueEvent.args[0][0].detail.title).to.contain(
-        'Cannot validate DataTypeTemplates. The version of the project must be higher than or equal to 2007B5'
+        'Cannot validate DataTypeTemplates. The version of the project must be higher than or equal to 2007B4'
       );
     });
 
