Merge branch 'main' into fix/clear-localstorage-for-new-version

Author: noraeb

.gitmodules

@@ -14,3 +14,7 @@
 	path = packages/external-plugins/oscd-template-generator
 	url = https://github.com/OpenEnergyTools/oscd-template-generator
 	branch = deploy
+[submodule "packages/external-plugins/scl-template-update"]
+	path = packages/external-plugins/scl-template-update
+	url = https://github.com/OpenEnergyTools/scl-template-update
+	branch = deploy

packages/compas-open-scd/public/js/plugins.js

@@ -143,6 +143,14 @@ export const officialPlugins = [
     kind: 'editor',
     requireDoc: true
   },
+  {
+    name: 'Template Update',
+    src: '/external-plugins/scl-template-update/scl-template-update.js',
+    icon: 'copy_all',
+    activeByDefault: false,
+    kind: 'editor',
+    requireDoc: true
+  },
   {
     name: 'Open project',
     src: '/src/menu/CompasOpen.js',

packages/external-plugins/scl-template-update

@@ -66,7 +66,7 @@ export default class Export104 extends LitElement {
       if (signal104Data.isMonitorSignal) {
         line.push(signal104Data.ioa ?? '', '');
       } else {
-        line.push('', signal104Data.ioa ?? '');
+        line.push(signal104Data.ioa ?? '', signal104Data.ioa ?? '');
       }
 
       lines.push(line);

packages/plugins/src/menu/Export104.ts

@@ -17,7 +17,7 @@ interface ExtractSignal104Result {
 
 enum SignalType {
   Monitor,
-  Control,
+  MonitorAndControl,
   Unknown
 }
 
@@ -88,7 +88,7 @@ function extractSignal104Data(addressElement: Element, doc: XMLDocument): Extrac
 
   const substationName = parentSubstation.getAttribute('name');
 
-  const name = `${substationName}${voltageLevelName}${bayName}${doiDesc}`;
+  const name = `${substationName} ${voltageLevelName} ${bayName} ${doiDesc}`;
 
   return {
     signal: {
@@ -112,7 +112,7 @@ function getSignalType(tiString: string): SignalType {
   if ((ti >= 1 && ti <= 21) || (ti >= 30 && ti <= 40)) {
     return SignalType.Monitor;
   } else if ((ti >= 45 && ti <= 51) || (ti >= 58 && ti <= 64)) {
-    return SignalType.Control;
+    return SignalType.MonitorAndControl;
   } else {
     return SignalType.Unknown;
   }

packages/plugins/src/menu/export104/foundation.ts

@@ -16,35 +16,35 @@ describe('Export104 foundation', () => {
 
     const expectedSignals = [
       {
-        name: 'S1F2V105Control1',
+        name: 'S1 F2 V105 Control1',
         signalNumber: '3001',
         isMonitorSignal: false,
         ioa: '1053001',
         ti: '50'
       },
       {
-        name: 'S1F2V105Control2',
+        name: 'S1 F2 V105 Control2',
         signalNumber: '3002',
         isMonitorSignal: false,
         ioa: '1053002',
         ti: '64'
       },
       {
-        name: 'S1F1V104Behavior',
+        name: 'S1 F1 V104 Behavior',
         signalNumber: '2001',
         isMonitorSignal: true,
         ioa: '1042001',
         ti: '35'
       },
       {
-        name: 'S1F1V104Behavior',
+        name: 'S1 F1 V104 Behavior',
         signalNumber: '2002',
         isMonitorSignal: true,
         ioa: '1042002',
         ti: '35'
       },
       {
-        name: 'S1F1V103Behavior',
+        name: 'S1 F1 V103 Behavior',
         signalNumber: '1003',
         isMonitorSignal: true,
         ioa: '1031003',