Merge pull request #160 from com-pas/upstream-v0.17

Merge Upstream v0.17.0

Author: Rob Tjalma

.travis.yml

@@ -2,6 +2,27 @@
 
 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.17.0](https://github.com/openscd/open-scd/compare/v0.16.0...v0.17.0) (2022-05-30)
+
+
+### Features
+
+* **editor/substation/l-node-editor:** add remove button ([#771](https://github.com/openscd/open-scd/issues/771)) ([7966f0f](https://github.com/openscd/open-scd/commits/7966f0f383bee611b1f840f3222075b56dbe9498))
+* **editors/substation:** add read-only l-node-editor ([#730](https://github.com/openscd/open-scd/issues/730)) ([ecfeb5d](https://github.com/openscd/open-scd/commits/ecfeb5d03a7b36493a10193541afbd3a2edd0e9a)), closes [#752](https://github.com/openscd/open-scd/issues/752)
+* **editors/substation:** remove button to function type editors ([#761](https://github.com/openscd/open-scd/issues/761)) ([ce9dea1](https://github.com/openscd/open-scd/commits/ce9dea1ce9365ff115b14e1174166c466e884539))
+* **editors/subtation:** allow instantiation of LNode from LNodeType's ([#766](https://github.com/openscd/open-scd/issues/766)) ([8ee23fc](https://github.com/openscd/open-scd/commits/8ee23fc8a5c3b3f9dfd57f4d445e9da744edd850))
+* **wizards/function:** add create wizards for Function, SubFunction, EqFunction and EqSubFunction element ([#731](https://github.com/openscd/open-scd/issues/731)) ([774add7](https://github.com/openscd/open-scd/commits/774add7510c4b909fab4e0d09f173cf7d3726027)), closes [#733](https://github.com/openscd/open-scd/issues/733) [#737](https://github.com/openscd/open-scd/issues/737) [#757](https://github.com/openscd/open-scd/issues/757)
+* **wizards/lnode:** add edit wizard ([#778](https://github.com/openscd/open-scd/issues/778)) ([965f10a](https://github.com/openscd/open-scd/commits/965f10a1d7a9c66fdc4e74265e265fdc950c3a09))
+* **wizards/substation/l-node-editor:** add duplicate button ([#782](https://github.com/openscd/open-scd/issues/782)) ([7470e2d](https://github.com/openscd/open-scd/commits/7470e2d0f657002222d771243d4cb609649f5f80))
+* **wizards:** add function type create wizards ([#768](https://github.com/openscd/open-scd/issues/768)) ([6e9c928](https://github.com/openscd/open-scd/commits/6e9c928bc09f7e05282d88c7967840e0b441d811)), closes [#762](https://github.com/openscd/open-scd/issues/762) [#763](https://github.com/openscd/open-scd/issues/763) [#764](https://github.com/openscd/open-scd/issues/764) [#765](https://github.com/openscd/open-scd/issues/765)
+
+
+### Bug Fixes
+
+* **menu/subscriberinfo:** fix lnInst attribute for lnClass LLN0 ([#749](https://github.com/openscd/open-scd/issues/749)) ([2f0bad9](https://github.com/openscd/open-scd/commits/2f0bad905cdc6450c1eec95d3c3a4755afb3098a))
+* **wizard-diagram, wizard-select, wizard-checkbox:**  disabled attribute ([#781](https://github.com/openscd/open-scd/issues/781)) ([528db27](https://github.com/openscd/open-scd/commits/528db27992173630a22056e50bd7c56903a6a283))
+* **wizards/conductingequipment:** on create earth switch add missing ground cNode ([#753](https://github.com/openscd/open-scd/issues/753)) ([8f89f27](https://github.com/openscd/open-scd/commits/8f89f27c6a66316c1b7941fa313ba85d08b1256d))
+
 ## [0.16.0](https://github.com/openscd/open-scd/compare/v0.15.0...v0.16.0) (2022-05-16)
 
 

CHANGELOG.md

@@ -40,5 +40,5 @@
       "purpose": "maskable"
     }
   ],
-  "version": "0.16.0"
+  "version": "0.17.0"
 }

manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "open-scd",
-  "version": "0.16.0",
+  "version": "0.17.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-lock.json

@@ -31,6 +31,9 @@ export class ActionIcon extends LitElement {
   /** highlight pane with dotted outline */
   @property({ type: Boolean })
   highlighted = false;
+  /** disables CSS adoption to action buttons */
+  @property({ type: Boolean })
+  hideActions = false;
 
   async firstUpdated(): Promise<void> {
     this.tabIndex = 0;
@@ -75,16 +78,6 @@ export class ActionIcon extends LitElement {
       --mdc-icon-size: 64px;
     }
 
-    :host(:focus-within) ::slotted([slot='icon']),
-    :host(:focus-within) mwc-icon {
-      outline-style: solid;
-      outline-width: 4px;
-      transform: scale(0.8);
-      transition: all 250ms linear;
-      box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14),
-        0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.2);
-    }
-
     :host([secondary]) ::slotted([slot='icon']),
     :host([secondary]) mwc-icon {
       outline-color: var(--mdc-theme-secondary);
@@ -96,6 +89,20 @@ export class ActionIcon extends LitElement {
       outline-width: 2px;
     }
 
+    :host(:focus-within) ::slotted([slot='icon']),
+    :host(:focus-within) mwc-icon {
+      outline-style: solid;
+      outline-width: 4px;
+    }
+
+    :host(:focus-within:not([hideActions])) ::slotted([slot='icon']),
+    :host(:focus-within:not([hideActions])) mwc-icon {
+      transform: scale(0.8);
+      transition: all 250ms linear;
+      box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14),
+        0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.2);
+    }
+
     ::slotted([slot='icon']:hover),
     mwc-icon:hover {
       outline-style: dashed;
@@ -178,6 +185,10 @@ export class ActionIcon extends LitElement {
         opacity 200ms linear;
     }
 
+    :host([secondary]) header {
+      background-color: var(--mdc-theme-secondary);
+    }
+
     :host(:hover) header {
       position: absolute;
       opacity: 1;
@@ -191,11 +202,18 @@ export class ActionIcon extends LitElement {
     :host(:focus-within) header {
       position: absolute;
       opacity: 1;
-      transform: translate(0, -80px);
       box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14),
         0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.2);
       transition: transform 250ms cubic-bezier(0.4, 0, 0.2, 1),
         opacity 250ms linear;
     }
+
+    :host(:focus-within:not([hideActions])) header {
+      transform: translate(0, -80px);
+    }
+
+    :host(:focus-within[hideActions]) header {
+      transform: translate(0, -40px);
+    }
   `;
 }

package.json

@@ -79,12 +79,8 @@ export class ActionPane extends LitElement {
         return html`<h2>${content}</h2>`;
       case 3:
         return html`<h3>${content}</h3>`;
-      case 4:
-        return html`<h4>${content}</h4>`;
-      case 5:
-        return html`<h5>${content}</h5>`;
       default:
-        return html`<h6>${content}</h6>`;
+        return html`<h4>${content}</h4>`;
     }
   }
 
@@ -150,9 +146,7 @@ export class ActionPane extends LitElement {
     h1,
     h2,
     h3,
-    h4,
-    h5,
-    h6 {
+    h4 {
       color: var(--mdc-theme-on-surface);
       font-family: 'Roboto', sans-serif;
       font-weight: 300;

src/action-icon.ts

@@ -170,6 +170,18 @@ export class CleanupControlBlocks extends LitElement {
       ><span class="unreferencedControl"
         >${controlBlock.getAttribute('name')!}
       </span>
+      <span>
+        <mwc-icon-button
+          label="warning"
+          icon="warning_amber"
+          class="cautionItem"
+          title="${translate(
+            'cleanup.unreferencedControls.addressDefinitionTooltip'
+          )}"
+          ?disabled="${!(getCommAddress(controlBlock) !== null)}"
+        >
+        </mwc-icon-button>
+      </span>
       <span>
         <mwc-icon-button
           label="Edit"
@@ -196,18 +208,6 @@ export class CleanupControlBlocks extends LitElement {
           }}
         ></mwc-icon-button>
       </span>
-      <span>
-        <mwc-icon-button
-          label="warning"
-          icon="warning_amber"
-          class="cautionItem"
-          title="${translate(
-            'cleanup.unreferencedControls.addressDefinitionTooltip'
-          )}"
-          ?disabled="${!(getCommAddress(controlBlock) !== null)}"
-        >
-        </mwc-icon-button>
-      </span>
       <span slot="secondary"
         >${controlBlock.tagName} -
         ${controlBlock.closest('IED')?.getAttribute('name')}
@@ -352,6 +352,17 @@ export class CleanupControlBlocks extends LitElement {
       --mdc-icon-size: 16px;
     }
 
+    .editItem {
+      visibility: hidden;
+      opacity: 0;
+    }
+
+    .cleanupListItem:hover .editItem {
+      visibility: visible;
+      opacity: 1;
+      transition: visibility 0s, opacity 0.5s linear;
+    }
+
     .cautionItem {
       color: var(--yellow);
     }

src/action-pane.ts

@@ -206,6 +206,17 @@ export class CleanupDatasets extends LitElement {
       --mdc-icon-size: 16px;
     }
 
+    .editItem {
+      visibility: hidden;
+      opacity: 0;
+    }
+
+    .checkListItem:hover .editItem {
+      visibility: visible;
+      opacity: 1;
+      transition: visibility 0s, opacity 0.5s linear;
+    }
+
     .cleanupDeleteButton {
       float: right;
     }

src/editors/cleanup/control-blocks-container.ts

@@ -72,7 +72,7 @@ export class BayEditor extends LitElement {
 
   /** Opens a [[`WizardDialog`]] for editing `LNode` connections. */
   openLNodeWizard(): void {
-    const wizard = wizards['LNode'].edit(this.element);
+    const wizard = wizards['LNode'].create(this.element);
     if (wizard) this.dispatchEvent(newWizardEvent(wizard));
   }
 
@@ -99,6 +99,20 @@ export class BayEditor extends LitElement {
     this.addMenu.anchor = <HTMLElement>this.addButton;
   }
 
+  private renderLNodes(): TemplateResult {
+    if (!this.showfunctions) return html``;
+
+    const lNodes = getChildElementsByTagName(this.element, 'LNode');
+
+    return lNodes.length
+      ? html`<div class="container lnode">
+          ${lNodes.map(
+            lNode => html`<l-node-editor .element=${lNode}></l-node-editor>`
+          )}
+        </div>`
+      : html``;
+  }
+
   renderFunctions(): TemplateResult {
     if (!this.showfunctions) return html``;
 
@@ -177,7 +191,7 @@ export class BayEditor extends LitElement {
           >${this.renderAddButtons()}</mwc-menu
         >
       </abbr>
-      ${this.renderIedContainer()} ${this.renderFunctions()}
+      ${this.renderIedContainer()}${this.renderLNodes()}${this.renderFunctions()}
       <div
         class="${classMap({
           content: true,