Merge from v0.25.0 of OpenSCD into CoMPAS OpenSCD

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 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.25.0](https://github.com/openscd/open-scd/compare/v0.24.0...v0.25.0) (2022-10-17)
+
+
+### Features
+
+* **editor/subscriber:** Added plugin for Subscriber Logical Nodes (GOOSE/SMV) ([#1036](https://github.com/openscd/open-scd/issues/1036)) ([971f0c1](https://github.com/openscd/open-scd/commits/971f0c10d112b4c68791daa1aada2c94cbc3b20b))
+* **editor/subscriber:** Show counter for Subscriber Plugins (Logical Nodes / Later) (GOOSE/SMV) ([#1040](https://github.com/openscd/open-scd/issues/1040)) ([02ec714](https://github.com/openscd/open-scd/commits/02ec714e7ac44204a972b55a872e0445eab66e72))
+* **editor/subscriber:** Subscribe and unsubscribe for Subscriber Logical Nodes (GOOSE/SMV) ([#1039](https://github.com/openscd/open-scd/issues/1039)) ([1c55aed](https://github.com/openscd/open-scd/commits/1c55aede2f89eb85a069b213a6a4ea709e171b02))
+* **editors/communication:** add GSE and SMV editor type elements ([#1021](https://github.com/openscd/open-scd/issues/1021)) ([81487c1](https://github.com/openscd/open-scd/commits/81487c184d610def07fec4a8919f9be8f133c730))
+* **filter-button:** Added option to disable filter button ([205449b](https://github.com/openscd/open-scd/commits/205449b019f31c4b412e8e41379133f2846478c3))
+* **filtered-list:** Add ? and * wildcards to filtered-search, closes [#1006](https://github.com/openscd/open-scd/issues/1006). ([#1007](https://github.com/openscd/open-scd/issues/1007)) ([48ef7ea](https://github.com/openscd/open-scd/commits/48ef7ea26d772573027f9627612fb56e3a982d67))
+* **wizard/connectedap:** auto create GSE and SMV elements ([#1019](https://github.com/openscd/open-scd/issues/1019)) ([984652a](https://github.com/openscd/open-scd/commits/984652ae435729b20b3939624e1b88924684454b))
+
+
+### Bug Fixes
+
+* **editors/later-binding:** Resolve absent prefix in ExtRef for later binding subscription ([#1026](https://github.com/openscd/open-scd/issues/1026)) ([31fd177](https://github.com/openscd/open-scd/commits/31fd1777eebce8ff5627d70559127d2458915571)), closes [#1005](https://github.com/openscd/open-scd/issues/1005)
+* **editors/subscriber-later-binding:** Add GOOSE icon to later binding editor, closes [#1017](https://github.com/openscd/open-scd/issues/1017) ([#1022](https://github.com/openscd/open-scd/issues/1022)) ([49e9007](https://github.com/openscd/open-scd/commits/49e9007d072bd2832fcfc513c2b592d91543f4ff))
+* **menu/importieds:** allow import to new projects ([#1012](https://github.com/openscd/open-scd/issues/1012)) ([216226c](https://github.com/openscd/open-scd/commits/216226c0a8497b048ff6d1dc3c9e6157c9a67eec))
+
 ## [0.24.0](https://github.com/openscd/open-scd/compare/v0.23.0...v0.24.0) (2022-09-19)
 
 

README.md

@@ -4,6 +4,12 @@
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5925/badge)](https://bestpractices.coreinfrastructure.org/projects/5925)
 [![Slack](https://raw.githubusercontent.com/com-pas/compas-architecture/master/public/LFEnergy-slack.svg)](http://lfenergy.slack.com/)
 
+Open Substation Communication Designer is an editor for SCL files as described in `IEC 61850-6`.
+
+Make sure your webbrowser has enough free memory! if needed, disable plug-ins and close unused browertabs.
+
+## Installation
+
 CoMPAS Open Substation Communication Designer is an editor for SCL files as described in `IEC 61850-6`.
 
 CoMPAS OpenSCD is a fork of the [OpenSCD](https://github.com/openscd/open-scd) project. The idea is to add functionality
@@ -20,4 +26,6 @@ distributed under their [end user license agreement](CC-EULA.pdf).
 
 This project is licensed under the [Apache License 2.0](LICENSE.md).
 
-© 2020-2022 OMICRON electronics GmbH, Jakob Vogelsang, TransnetBW GmbH, Alliander N.V., and others
+© 2020-2022 OMICRON electronics GmbH, TransnetBW GmbH, Alliander N.V., and others
+
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fopenscd%2Fopen-scd.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fopenscd%2Fopen-scd?ref=badge_large)

manifest.json

@@ -40,5 +40,5 @@
       "purpose": "maskable"
     }
   ],
-  "version": "0.24.0"
+  "version": "0.25.0"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-scd",
-  "version": "0.24.0",
+  "version": "0.25.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": [

public/js/plugins.js

@@ -21,8 +21,15 @@ export const officialPlugins = [
     kind: 'editor',
   },
   {
-    name: 'Subscriber (GOOSE)',
-    src: '/src/editors/GooseControlSubscription.js',
+    name: 'Subscriber Message Binding (GOOSE)',
+    src: '/src/editors/GooseSubscriberMessageBinding.js',
+    icon: 'link',
+    default: true,
+    kind: 'editor',
+  },
+  {
+    name: 'Subscriber Data Binding (GOOSE)',
+    src: '/src/editors/GooseSubscriberDataBinding.js',
     icon: 'link',
     default: true,
     kind: 'editor',
@@ -31,12 +38,19 @@ export const officialPlugins = [
     name: 'Subscriber Later Binding (GOOSE)',
     src: '/src/editors/GooseSubscriberLaterBinding.js',
     icon: 'link',
-    default: false,
+    default: true,
+    kind: 'editor',
+  },
+  {
+    name: 'Subscriber Message Binding (SMV)',
+    src: '/src/editors/SMVSubscriberMessageBinding.js',
+    icon: 'link',
+    default: true,
     kind: 'editor',
   },
   {
-    name: 'Subscriber (SMV)',
-    src: '/src/editors/SampledValuesSubscription.js',
+    name: 'Subscriber Data Binding (SMV)',
+    src: '/src/editors/SMVSubscriberDataBinding.js',
     icon: 'link',
     default: true,
     kind: 'editor',

public/md/Extensions.md

@@ -0,0 +1,17 @@
+OpenSCD uses extensions to provide built-in functionality and to allow additional functionality beyond the OpenSCD defaults.
+
+Utilities, IED manufacturers, system integrators or other parties can create extensions and provide an interface for viewing or modifying SCL (including modification of private namespaces).
+
+There are three types of extensions:
+
+1. _Menu_ extensions - shown on the project menu after enabling them.
+2. _Editor_ extensions - shown in the main window after enabling them.
+3. _Validator_ extensions - ensure file compliance with a schema or design rules.
+
+To enable extensions, open the project menu by clicking on the top three lines in the top left, scrolling to the bottom and selecting the _Extensions_ item. 
+Then select and deselect functionality. 
+If you are confident in the source of a custom extension, you can also add an extension from a URL.
+
+> NOTE: Infrequently used or in-development extensions are disabled by default.
+
+> NOTE: Where there are many editor extensions, scroll through them by using Shift + Wheel Mouse button.

public/md/Home.md

@@ -3,8 +3,10 @@ This is an open repository of information on OpenSCD and IEC 61850-6. You are we
 You can find information related to topics like
 
 - [Installation](https://github.com/openscd/open-scd/wiki/Install-OpenSCD)
+- [Interface](https://github.com/openscd/open-scd/wiki/Interface)
 - [Project workflow](https://github.com/openscd/open-scd/wiki/Project-workflow)
 - [Validators used in OpenSCD](https://github.com/openscd/open-scd/wiki/Validators)
+- [Extensions](https://github.com/openscd/open-scd/wiki/Extensions)
 
 as well as features that allow you to manipulate or add specific information to the project covering
 

public/md/Interface.md

@@ -0,0 +1,6 @@
+OpenSCD makes extensive use of lists which allow filtering by a search query.
+
+You can use wildcards as part of a search query:
+
+* A question mark, `?` will match any single character 
+* An asterisk, `*` will match one or more characters

public/md/_Sidebar.md

@@ -2,6 +2,8 @@
 
 ### 1.1 [Install OpenSCD](https://github.com/openscd/open-scd/wiki/Install-OpenSCD)
 
+### 1.2 [Interface](https://github.com/openscd/open-scd/wiki/Interface)
+
 ## 2. [Project management](https://github.com/openscd/open-scd/wiki/Project-workflow)
 
 ### 2.1 [Import IEDs](https://github.com/openscd/open-scd/wiki/Import-IEDs)
@@ -32,7 +34,7 @@
 
 ## 5.4 [Conducting Equipment element](https://github.com/openscd/open-scd/wiki/Conducting-Equipment)
 
-## 5.5 [Conducting Equipment element](https://github.com/openscd/open-scd/wiki/Power-Transformer)
+## 5.5 [Power Transformer element](https://github.com/openscd/open-scd/wiki/Power-Transformer)
 
 ## 5.6 [Logical Node References (LNode)](https://github.com/openscd/open-scd/wiki/Logical-Node-Reference)
 
@@ -108,4 +110,6 @@
 
 ### 9.2 [Create SPECIFICATION IED from function elements](https://github.com/openscd/open-scd/wiki/Create-Specification-IED-from-functions)
 
-## 10. [CoMPAS Versions Editor](https://github.com/openscd/open-scd/wiki/CoMPAS-Versions-Editor)
+## 10. [Extensions](https://github.com/openscd/open-scd/wiki/Extensions)
+
+## 11. [CoMPAS Versions Editor](https://github.com/openscd/open-scd/wiki/CoMPAS-Versions-Editor)

src/editors/GooseSubscriberDataBinding.ts

@@ -0,0 +1,55 @@
+import { css, html, LitElement, property, TemplateResult } from 'lit-element';
+
+import { Nsdoc } from '../foundation/nsdoc.js';
+
+import './subscription/fcda-binding-list.js';
+import './subscription/later-binding/ext-ref-ln-binding-list.js';
+
+/** An editor [[`plugin`]] for Subscribe Data Binding (GOOSE). */
+export default class GooseSubscribeDataBindingPlugin extends LitElement {
+  @property({ attribute: false })
+  doc!: XMLDocument;
+  @property()
+  nsdoc!: Nsdoc;
+
+  render(): TemplateResult {
+    return html`<div>
+      <div class="container">
+        <fcda-binding-list
+          class="column"
+          controlTag="GSEControl"
+          .includeLaterBinding="${false}"
+          .doc="${this.doc}"
+        >
+        </fcda-binding-list>
+        <extref-ln-binding-list
+          class="column"
+          controlTag="GSEControl"
+          .doc="${this.doc}"
+          .nsdoc="${this.nsdoc}"
+        >
+        </extref-ln-binding-list>
+      </div>
+    </div>`;
+  }
+
+  static styles = css`
+    :host {
+      width: 100vw;
+    }
+
+    .container {
+      display: flex;
+      padding: 8px 6px 16px;
+      height: calc(100vh - 136px);
+    }
+
+    .column {
+      flex: 50%;
+      margin: 0px 6px 0px;
+      min-width: 300px;
+      height: 100%;
+      overflow-y: auto;
+    }
+  `;
+}

src/editors/GooseSubscriberLaterBinding.ts

@@ -1,25 +1,27 @@
-import { LitElement, property, html, TemplateResult, css } from 'lit-element';
+import { css, html, LitElement, property, TemplateResult } from 'lit-element';
 
-import './subscription/later-binding/fcda-later-binding-list.js';
+import './subscription/fcda-binding-list.js';
 import './subscription/later-binding/ext-ref-later-binding-list.js';
 
+/** An editor [[`plugin`]] for Subscribe Later Binding (GOOSE). */
 export default class GooseSubscribeLaterBindingPlugin extends LitElement {
   @property({ attribute: false })
   doc!: XMLDocument;
 
   render(): TemplateResult {
     return html`<div>
       <div class="container">
-        <fcda-later-binding-list
+        <fcda-binding-list
           class="column"
-          .doc=${this.doc}
           controlTag="GSEControl"
+          .includeLaterBinding="${true}"
+          .doc="${this.doc}"
         >
-        </fcda-later-binding-list>
+        </fcda-binding-list>
         <extref-later-binding-list
           class="column"
           controlTag="GSEControl"
-          .doc=${this.doc}
+          .doc="${this.doc}"
         >
         </extref-later-binding-list>
       </div>

src/editors/GooseControlSubscription.ts → src/editors/GooseSubscriberMessageBinding.ts

@@ -1,10 +1,10 @@
 import {
-  LitElement,
+  css,
   html,
-  TemplateResult,
+  LitElement,
   property,
-  css,
   query,
+  TemplateResult,
 } from 'lit-element';
 import { translate } from 'lit-translate';
 
@@ -21,7 +21,7 @@ import { newViewEvent, View, ViewEvent } from './subscription/foundation.js';
 let view: View = View.PUBLISHER;
 
 /** An editor [[`plugin`]] for subscribing IEDs to GOOSE messages. */
-export default class GooseControlSubscriptionPlugin extends LitElement {
+export default class GooseSubscriberMessageBindingPlugin extends LitElement {
   /** The document being edited as provided to plugins by [[`OpenSCD`]]. */
   @property()
   doc!: XMLDocument;
@@ -76,7 +76,11 @@ export default class GooseControlSubscriptionPlugin extends LitElement {
       <div class="container">
         ${view == View.PUBLISHER
           ? html`<goose-list class="row" .doc=${this.doc}></goose-list>`
-          : html`<ied-list class="row" .doc=${this.doc} serviceType="goose"></ied-list>`}
+          : html`<ied-list
+              class="row"
+              .doc=${this.doc}
+              serviceType="goose"
+            ></ied-list>`}
         <subscriber-list-goose
           class="row"
           .doc=${this.doc}

src/editors/SMVSubscriberDataBinding.ts

@@ -0,0 +1,55 @@
+import { css, html, LitElement, property, TemplateResult } from 'lit-element';
+
+import { Nsdoc } from '../foundation/nsdoc.js';
+
+import './subscription/fcda-binding-list.js';
+import './subscription/later-binding/ext-ref-ln-binding-list.js';
+
+/** An editor [[`plugin`]] for Subscribe Data Binding (SMV). */
+export default class SMVSubscribeDataBindingPlugin extends LitElement {
+  @property({ attribute: false })
+  doc!: XMLDocument;
+  @property()
+  nsdoc!: Nsdoc;
+
+  render(): TemplateResult {
+    return html`<div>
+      <div class="container">
+        <fcda-binding-list
+          class="column"
+          controlTag="SampledValueControl"
+          .includeLaterBinding="${false}"
+          .doc="${this.doc}"
+        >
+        </fcda-binding-list>
+        <extref-ln-binding-list
+          class="column"
+          controlTag="SampledValueControl"
+          .doc="${this.doc}"
+          .nsdoc="${this.nsdoc}"
+        >
+        </extref-ln-binding-list>
+      </div>
+    </div>`;
+  }
+
+  static styles = css`
+    :host {
+      width: 100vw;
+    }
+
+    .container {
+      display: flex;
+      padding: 8px 6px 16px;
+      height: calc(100vh - 136px);
+    }
+
+    .column {
+      flex: 50%;
+      margin: 0px 6px 0px;
+      min-width: 300px;
+      height: 100%;
+      overflow-y: auto;
+    }
+  `;
+}

src/editors/SMVSubscriberLaterBinding.ts

@@ -1,6 +1,6 @@
 import { css, html, LitElement, property, TemplateResult } from 'lit-element';
 
-import './subscription/later-binding/fcda-later-binding-list.js';
+import './subscription/fcda-binding-list.js';
 import './subscription/later-binding/ext-ref-later-binding-list.js';
 
 /** An editor [[`plugin`]] for Subscribe Later Binding (SMV). */
@@ -11,16 +11,17 @@ export default class SMVSubscribeLaterBindingPlugin extends LitElement {
   render(): TemplateResult {
     return html`<div>
       <div class="container">
-        <fcda-later-binding-list
+        <fcda-binding-list
           class="column"
-          .doc=${this.doc}
           controlTag="SampledValueControl"
+          .includeLaterBinding="${true}"
+          .doc="${this.doc}"
         >
-        </fcda-later-binding-list>
+        </fcda-binding-list>
         <extref-later-binding-list
           class="column"
-          .doc=${this.doc}
           controlTag="SampledValueControl"
+          .doc="${this.doc}"
         >
         </extref-later-binding-list>
       </div>