Merge pull request #129 from com-pas/upstream-v0.12

Merge Upstream v0.12.0 into CoMPAS

Author: Rob Tjalma

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.12.0](https://github.com/openscd/open-scd/compare/v0.11.0...v0.12.0) (2022-03-21)
+
+
+### Features
+
+* **Editing:** check globally for ID uniqueness ([c2b14fb](https://github.com/openscd/open-scd/commits/c2b14fb337adb9f55874dbb3add0aefda8622946))
+* **editors/cleanup:** unreferenced DataSet ([#568](https://github.com/openscd/open-scd/issues/568)) ([edc133c](https://github.com/openscd/open-scd/commits/edc133cdecce61abf53d043bc45292d1a1a36c7c))
+* **editors/Substation:** Add PowerTransformer Components to Substation Editor ([22555b6](https://github.com/openscd/open-scd/commits/22555b6713c9f2c8e882269ffce9a826d016e87b))
+* **editors/template/lnodetype-wizards:** make use of -7-420 NSD ([0a2d5a4](https://github.com/openscd/open-scd/commits/0a2d5a40c50d5a0cc66fd7c5b31f6493aa7c4600))
+* **plugins/IED:** Add icon set to IED editor containers ([9878259](https://github.com/openscd/open-scd/commits/9878259665be2e34bd99dd1d5f72c1944b3dca1f))
+* **plugins/SampledValues:** Create Sampled Values tab in Subscription plugin ([f94b042](https://github.com/openscd/open-scd/commits/f94b0422253940785a0982ae72910f1bbbc2ac62))
+* **plugins/SampledValues:** Small bug fix + Added Integration tests ([a58f305](https://github.com/openscd/open-scd/commits/a58f305c78a65c056c617e9f09e8d648f4aaf610))
+* **plugins/Subscription:** Create 'Subscription' plugin for GOOSE subscriptions  ([25fae6f](https://github.com/openscd/open-scd/commits/25fae6fc42ad76f269ef029848d5cae6329eee33))
+* **wizard-dialog:** allow used-defined actions in menu ([f8c5a93](https://github.com/openscd/open-scd/commits/f8c5a93100e4c7e922627337ffee32f6169b12cf))
+
+
+### Bug Fixes
+
+* **action-pane:** adjust css rules for icon slot ([#594](https://github.com/openscd/open-scd/issues/594)) ([8bc0549](https://github.com/openscd/open-scd/commits/8bc0549bc791ef6b7fe0b1dfd4d5a6f1dfccde2d))
+* **editors/template:** on id attribute update adopt references as well ([#590](https://github.com/openscd/open-scd/issues/590)) ([af246dd](https://github.com/openscd/open-scd/commits/af246ddcde907688081aaa20d295faeb978b0a6f))
+* **editors/template:** properly update xxxType list after add/editing ([#582](https://github.com/openscd/open-scd/issues/582)) ([2e11cc8](https://github.com/openscd/open-scd/commits/2e11cc8c277d31dd693ae54656e1c3b4cd23f8f3))
+* **wizard-dialog:** make sure to close on non empty editor action ([8fb125c](https://github.com/openscd/open-scd/commits/8fb125c1c353feb37a4c988d59a608090fb0425b))
+
 ## [0.11.0](https://github.com/openscd/open-scd/compare/v0.10.0...v0.11.0) (2022-03-08)
 
 

manifest.json

@@ -40,5 +40,5 @@
       "purpose": "maskable"
     }
   ],
-  "version": "0.11.0"
+  "version": "0.12.0"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "open-scd",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "repository": "https://github.com/openscd/open-scd.git",
   "description": "A bottom-up substation configuration designer for projects described using SCL `IEC 61850-6` Edition 2 or greater.",
   "keywords": [

package.json

@@ -20,6 +20,20 @@ export const officialPlugins = [
     default: true,
     kind: 'editor',
   },
+  {
+    name: 'Subscription',
+    src: '/src/editors/Subscription.js',
+    icon: 'link',
+    default: true,
+    kind: 'editor',
+  },
+  {
+    name: 'Sampled Values Subscriber',
+    src: '/src/editors/SampledValues.js',
+    icon: 'link',
+    default: true,
+    kind: 'editor',
+  },
   {
     name: 'Communication',
     src: '/src/editors/Communication.js',
@@ -142,6 +156,13 @@ export const officialPlugins = [
     requireDoc: true,
     position: 'middle'
   },
+  {
+    name: 'Cleanup',
+    src: '/src/editors/Cleanup.js',
+    icon: 'cleaning_services',
+    default: false,
+    kind: 'editor',
+  },
   {
     name: 'Auto Align SLD',
     src: '/src/menu/CompasAutoAlignment.js',

public/js/plugins.js

@@ -50,7 +50,7 @@ export function Editing<TBase extends LitElementConstructor>(Base: TBase) {
       )
         return true;
 
-      const invalid =
+      const invalidNaming =
         create.new.element.hasAttribute('name') &&
         Array.from(create.new.parent.children).some(
           elm =>
@@ -59,7 +59,7 @@ export function Editing<TBase extends LitElementConstructor>(Base: TBase) {
               (<Element>create.new.element).getAttribute('name')
         );
 
-      if (invalid)
+      if (invalidNaming) {
         this.dispatchEvent(
           newLogEvent({
             kind: 'error',
@@ -77,7 +77,38 @@ export function Editing<TBase extends LitElementConstructor>(Base: TBase) {
           })
         );
 
-      return !invalid;
+        return false;
+      }
+
+      const invalidId =
+        create.new.element.hasAttribute('id') &&
+        Array.from(
+          create.new.parent.ownerDocument.querySelectorAll(
+            'LNodeType, DOType, DAType, EnumType'
+          )
+        ).some(
+          elm =>
+            elm.getAttribute('id') ===
+            (<Element>create.new.element).getAttribute('id')
+        );
+
+      if (invalidId) {
+        this.dispatchEvent(
+          newLogEvent({
+            kind: 'error',
+            title: get('editing.error.create', {
+              name: create.new.element.tagName,
+            }),
+            message: get('editing.error.idClash', {
+              id: create.new.element.getAttribute('id')!,
+            }),
+          })
+        );
+
+        return false;
+      }
+
+      return true;
     }
 
     private onCreate(action: Create) {
@@ -199,7 +230,7 @@ export function Editing<TBase extends LitElementConstructor>(Base: TBase) {
     private checkReplaceValidity(replace: Replace): boolean {
       if (replace.checkValidity !== undefined) return replace.checkValidity();
 
-      const invalid =
+      const invalidNaming =
         replace.new.element.hasAttribute('name') &&
         replace.new.element.getAttribute('name') !==
           replace.old.element.getAttribute('name') &&
@@ -210,7 +241,7 @@ export function Editing<TBase extends LitElementConstructor>(Base: TBase) {
               replace.new.element.getAttribute('name')
         );
 
-      if (invalid)
+      if (invalidNaming) {
         this.dispatchEvent(
           newLogEvent({
             kind: 'error',
@@ -225,7 +256,40 @@ export function Editing<TBase extends LitElementConstructor>(Base: TBase) {
           })
         );
 
-      return !invalid;
+        return false;
+      }
+
+      const invalidId =
+        replace.new.element.hasAttribute('id') &&
+        replace.new.element.getAttribute('id') !==
+          replace.old.element.getAttribute('id') &&
+        Array.from(
+          replace.new.element.ownerDocument.querySelectorAll(
+            'LNodeType, DOType, DAType, EnumType'
+          )
+        ).some(
+          elm =>
+            elm.getAttribute('id') ===
+            (<Element>replace.new.element).getAttribute('id')
+        );
+
+      if (invalidId) {
+        this.dispatchEvent(
+          newLogEvent({
+            kind: 'error',
+            title: get('editing.error.update', {
+              name: replace.new.element.tagName,
+            }),
+            message: get('editing.error.idClash', {
+              id: replace.new.element.getAttribute('id')!,
+            }),
+          })
+        );
+
+        return false;
+      }
+
+      return true;
     }
 
     private onReplace(action: Replace) {
@@ -255,15 +319,15 @@ export function Editing<TBase extends LitElementConstructor>(Base: TBase) {
     private checkUpdateValidity(update: Update): boolean {
       if (update.checkValidity !== undefined) return update.checkValidity();
 
-      const invalid = Array.from(
+      const invalidNaming = Array.from(
         update.element.parentElement?.children ?? []
       ).some(
         elm =>
           elm.tagName === update.element.tagName &&
           elm.getAttribute('name') === update.newAttributes['name']
       );
 
-      if (invalid)
+      if (invalidNaming) {
         this.dispatchEvent(
           newLogEvent({
             kind: 'error',
@@ -278,7 +342,34 @@ export function Editing<TBase extends LitElementConstructor>(Base: TBase) {
           })
         );
 
-      return !invalid;
+        return false;
+      }
+
+      const invalidId =
+        update.newAttributes['id'] &&
+        Array.from(
+          update.element.ownerDocument.querySelectorAll(
+            'LNodeType, DOType, DAType, EnumType'
+          )
+        ).some(elm => elm.getAttribute('id') === update.newAttributes['id']);
+
+      if (invalidId) {
+        this.dispatchEvent(
+          newLogEvent({
+            kind: 'error',
+            title: get('editing.error.update', {
+              name: update.element.tagName,
+            }),
+            message: get('editing.error.idClash', {
+              id: update.newAttributes['id']!,
+            }),
+          })
+        );
+
+        return false;
+      }
+
+      return true;
     }
 
     private onUpdate(action: Update) {

public/xml/IEC_61850-7-420_2019A4.nsd

@@ -35,7 +35,7 @@ import {
   OpenDocEvent,
   SclhistoryEntry,
 } from './foundation.js';
-import { getFilterIcon, iconColors } from './icons.js';
+import { getFilterIcon, iconColors } from './icons/icons.js';
 import { Plugin } from './Plugging.js';
 
 const icons = {

src/Editing.ts

@@ -170,5 +170,12 @@ export class ActionPane extends LitElement {
       top: -0.1em;
       --mdc-icon-size: 1em;
     }
+
+    ::slotted([slot='icon']) {
+      vertical-align: middle;
+      position: relative;
+      top: -0.1em;
+      --mdc-icon-size: 1em;
+    }
   `;
 }