Merge pull request #134 from com-pas/upstream-v0.13

Merge v0.13.0 from OpenSCD into CoMPAS

Author: Rob Tjalma

CHANGELOG.md

@@ -2,6 +2,34 @@
 
 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.13.0](https://github.com/openscd/open-scd/compare/v0.11.0...v0.13.0) (2022-04-04)
+
+
+### 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/subscriber:** use filtered lists ([#638](https://github.com/openscd/open-scd/issues/638)) ([f255bfb](https://github.com/openscd/open-scd/commits/f255bfb4f205239413f12f7c47e221e739cefdce))
+* **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))
+* **ied-editor/ln-node:** Changed description of LN Node in IED Editor ([#647](https://github.com/openscd/open-scd/issues/647)) ([9a655e8](https://github.com/openscd/open-scd/commits/9a655e88d1a8341ec56a83c6af540e77f4e9c280))
+* **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))
+* **wizard-dialog:** wizard-dialog content definition through `WizardInput` objects ([5f3a7a7](https://github.com/openscd/open-scd/commits/5f3a7a7c4a74bffb5e800b8c75bffdbdb3213e15))
+* **wizards/reportcontrol:** add copy to other IEDs  ([#632](https://github.com/openscd/open-scd/issues/632)) ([1850dfa](https://github.com/openscd/open-scd/commits/1850dfa6c77669fd47ac36379a32267dc54ef913))
+
+
+### 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))
+* **wizards/subnetwork:** incorrect title for create wizard ([#645](https://github.com/openscd/open-scd/issues/645)) ([0210913](https://github.com/openscd/open-scd/commits/0210913cc8eef9cf06d1071a146072ba24e80df0))
+
 ## [0.12.0](https://github.com/openscd/open-scd/compare/v0.11.0...v0.12.0) (2022-03-21)
 
 

README.md

@@ -10,19 +10,41 @@ Open Substation Communication Designer is an editor for SCL files as described i
 
 ## Installation
 
+In order to install OpenSCD on your local device (only for you), simply visit [openscd.github.io](https://openscd.github.io), click the "Install OpenSCD" button in your address bar (Chrome or Edge on desktop) or click the "Add OpenSCD to home screen" notification in any mobile browser.
+
+In order to install your own instance of OpenSCD on your own webserver (e.g. on your company intranet), simply download [our latest release](https://github.com/openscd/open-scd/releases/latest) (`open-scd.zip` or `open-scd.tar.gz`) and extract the archive contents into the "webroot" directory of your web server.
+
+If you don't have your own webserver but still want your own version of OpenSCD hosted locally (e.g. on a system without an internet connection), you can [use a browser plugin that acts as a local webserver](https://github.com/openscd/open-scd/wiki/Install-OpenSCD#offline) (only for you) instead.
+
+## Contributing
+
+### Building
+
+If you want to build OpenSCD yourself in order to make some changes to your local installation or to contribute to the project, you may first want to install [Node.js](https://nodejs.org/) in order to be able to use our local development setup.
+
+Once Node.js is installed on your system, you may get started by entering the following lines in your command prompt:
+
 ```
 git clone https://github.com/openscd/open-scd.git
 cd open-scd
 npm install
 npm start
 ```
 
-## Scripts
+This will start a local development server and open a browser window which will automatically be reloaded as soon as you save any changes to your local source code files.
+
+If you use VSCode to develop, we recommend you install and use the [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) and [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) extensions in order to automatically lint and format your code as you edit it.
+
+### Scripts
+
+We provide the following `npm` scripts for your convenience:
 
-- `start` runs `OpenSCD` for development, reloading on file changes
-- `test` runs the test suite with Karma
-- `lint` runs the linter
-- `doc` builds markdown documentation in the `doc` directory
+- `npm start` runs `OpenSCD` for development, reloading on file changes
+- `npm test` runs the test suite with Karma
+- `npm run lint` runs the linter (fixes problems in your code)
+- `npm run format` runs the formatter (formats your code in a unified way)
+- `npm run doc` builds HTML documentation into the `doc` directory
+- `npm run build` builds a deployable version of the project into the `dist` directory
 
 ### Docker
 It's also possible to run OpenSCD CoMPAS Edition as a docker. Of every release a docker image is created and pushed to Docker Hub.
@@ -50,5 +72,5 @@ distributed under their [end user license agreement](CC-EULA.pdf).
 
 This project is licensed under the [Apache License 2.0](LICENSE.md).
 
-© 2020-2021 OMICRON electronics GmbH
+© 2020-2022 OMICRON electronics GmbH
 

manifest.json

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

package-lock.json

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

@@ -5,7 +5,13 @@ import '@material/mwc-list';
 import '@material/mwc-list/mwc-list-item';
 import '@material/mwc-button';
 
-import {newLogEvent, newPendingStateEvent, newWizardEvent, Wizard, WizardInput} from "../foundation.js";
+import {
+  newLogEvent,
+  newPendingStateEvent,
+  newWizardEvent,
+  Wizard,
+  WizardInputElement
+} from "../foundation.js";
 
 import '../wizard-textfield.js';
 
@@ -120,7 +126,7 @@ export interface AddToCompasWizardOptions {
 }
 export function addVersionToCompasWizard(saveToOptions: AddToCompasWizardOptions): Wizard {
   function uploadToCompas() {
-    return function (inputs: WizardInput[], wizard: Element) {
+    return function (inputs: WizardInputElement[], wizard: Element) {
       const compasAddTo = <CompasUploadVersionElement>wizard.shadowRoot!.querySelector('compas-upload-version')
       if (!compasAddTo.valid()) {
         return [];

src/compas/CompasUploadVersion.ts

@@ -6,7 +6,7 @@ import {
   EditorAction,
   getValue,
   WizardActor,
-  WizardInput,
+  WizardInputElement,
 } from '../../../foundation.js';
 import { SCL_COORDINATES_NAMESPACE } from "../foundation.js";
 
@@ -48,7 +48,7 @@ function updateXYAttribute(element: Element, attributeName: string, value: strin
 }
 
 export function updateNamingAndCoordinatesAction(element: Element): WizardActor {
-  return (inputs: WizardInput[]): EditorAction[] => {
+  return (inputs: WizardInputElement[]): EditorAction[] => {
     const name = getValue(inputs.find(i => i.label === 'name')!)!;
     const desc = getValue(inputs.find(i => i.label === 'desc')!);
     const xCoordinate = getValue(inputs.find(i => i.label === 'xCoordinate')!);

src/editors/singlelinediagram/wizards/foundation.ts

@@ -9,12 +9,12 @@ import {
 import { translate } from 'lit-translate';
 
 import '@material/mwc-icon';
-import '@material/mwc-list';
 import '@material/mwc-list/mwc-list-item';
 
-import './elements/goose-message.js';
+import '../../filtered-list.js';
 import { compareNames, getNameAttribute } from '../../foundation.js';
-import { styles } from './foundation.js';
+import { newGOOSESelectEvent, styles } from './foundation.js';
+import { gooseIcon } from '../../icons/icons.js';
 
 /** An sub element for showing all published GOOSE messages per IED. */
 @customElement('publisher-goose-list')
@@ -43,33 +43,49 @@ export class PublisherGOOSEList extends LitElement {
     );
   }
 
+  private onGooseSelect(element: Element): void {
+    const ln = element.parentElement;
+    const dataset = ln?.querySelector(
+      `DataSet[name=${element.getAttribute('datSet')}]`
+    );
+    this.dispatchEvent(newGOOSESelectEvent(element, dataset!));
+  }
+
+  renderGoose(element: Element): TemplateResult {
+    return html`<mwc-list-item
+      @click=${() => this.onGooseSelect(element)}
+      graphic="large"
+    >
+      <span>${element.getAttribute('name')}</span>
+      <mwc-icon slot="graphic">${gooseIcon}</mwc-icon>
+    </mwc-list-item>`;
+  }
+
   render(): TemplateResult {
     return html` <section>
       <h1>${translate('subscription.publisherGoose.title')}</h1>
-      <mwc-list>
-        ${this.ieds.map(ied =>
-          ied.querySelector('GSEControl')
-            ? html`
-                <mwc-list-item noninteractive graphic="icon">
-                  <span class="iedListTitle">${getNameAttribute(ied)}</span>
-                  <mwc-icon slot="graphic">developer_board</mwc-icon>
-                </mwc-list-item>
-                <li divider role="separator"></li>
-                ${this.getGSEControls(ied).map(
-                  control =>
-                    html`<goose-message .element=${control}></goose-message>`
-                )}
-              `
-            : ``
+      <filtered-list>
+        ${this.ieds.map(
+          ied =>
+            html`
+              <mwc-list-item noninteractive graphic="icon">
+                <span class="iedListTitle">${getNameAttribute(ied)}</span>
+                <mwc-icon slot="graphic">developer_board</mwc-icon>
+              </mwc-list-item>
+              <li divider role="separator"></li>
+              ${this.getGSEControls(ied).map(control =>
+                this.renderGoose(control)
+              )}
+            `
         )}
-      </mwc-list>
+      </filtered-list>
     </section>`;
   }
 
   static styles = css`
     ${styles}
 
-    mwc-list {
+    filtered-list {
       height: 100vh;
       overflow-y: scroll;
     }