From 1499d75206c1d85cded1e6e01f1cc82ea265e5ea Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Wed, 1 May 2024 13:37:19 +0200 Subject: [PATCH 1/4] Added plugins to src --- package.json | 3 +- packages/open-scd/CHANGELOG.md | 2 +- packages/open-scd/src/open-scd.ts | 33 +++++++++++-------- .../{public/js/plugins.js => src/plugins.ts} | 0 4 files changed, 23 insertions(+), 15 deletions(-) rename packages/open-scd/{public/js/plugins.js => src/plugins.ts} (100%) diff --git a/package.json b/package.json index 354a352e15..1eb1af930d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "doc": "lerna run doc", "test": "npx nx run-many -t test --all --parallel=false", "graph": "npx nx graph", - "start": "lerna run start" + "start": "lerna run start", + "serve": "npm run build" }, "repository": { "type": "git", diff --git a/packages/open-scd/CHANGELOG.md b/packages/open-scd/CHANGELOG.md index d673b99ec7..eaab8bd2c7 100644 --- a/packages/open-scd/CHANGELOG.md +++ b/packages/open-scd/CHANGELOG.md @@ -541,7 +541,7 @@ All notable changes to this project will be documented in this file. See [standa ## [0.4.0](https://github.com/openscd/open-scd/compare/v0.3.0...v0.4.0) (2021-07-02) > **NB** for plugin developers: -> * All menu item plugins in `public/js/plugins.js` are now listed under `kind: 'menu'` with a `position: 'top' | 'middle' | 'bottom'` determining positioning in the menu and `requireDoc: boolean` indicating whether the plugin requires a `doc` to be loaded in order to be clickable. +> * All menu item plugins in `src/plugins.ts` are now listed under `kind: 'menu'` with a `position: 'top' | 'middle' | 'bottom'` determining positioning in the menu and `requireDoc: boolean` indicating whether the plugin requires a `doc` to be loaded in order to be clickable. > * All menu item and validator plugins now use the unified method signature `run(): Promise` to be triggered. ### Features diff --git a/packages/open-scd/src/open-scd.ts b/packages/open-scd/src/open-scd.ts index 4c0b1a3533..835d4a2cdd 100644 --- a/packages/open-scd/src/open-scd.ts +++ b/packages/open-scd/src/open-scd.ts @@ -45,14 +45,21 @@ import { ActionDetail, List } from '@material/mwc-list'; import { Drawer } from '@material/mwc-drawer'; import { get } from 'lit-translate'; -import { officialPlugins } from '../public/js/plugins.js'; +import { officialPlugins } from './plugins.js'; import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation.js'; import { Select } from '@material/mwc-select'; import { Switch } from '@material/mwc-switch'; import { TextField } from '@material/mwc-textfield'; import { Dialog } from '@material/mwc-dialog'; import { initializeNsdoc, Nsdoc } from './foundation/nsdoc.js'; -import { HistoryUIKind, newEmptyIssuesEvent, newHistoryUIEvent, newRedoEvent, newUndoEvent, UndoRedoChangedEvent } from './addons/History.js'; +import { + HistoryUIKind, + newEmptyIssuesEvent, + newHistoryUIEvent, + newRedoEvent, + newUndoEvent, + UndoRedoChangedEvent, +} from './addons/History.js'; // HOSTING INTERFACES @@ -343,12 +350,12 @@ export class OpenSCD extends LitElement { return html` - { + this.editCount = e.detail.editCount; + this.canRedo = e.detail.canRedo; + this.canUndo = e.detail.canUndo; }}" > { - this.dispatchEvent(newUndoEvent()) + this.dispatchEvent(newUndoEvent()); }, disabled: (): boolean => !this.canUndo, kind: 'static', @@ -582,7 +589,7 @@ export class OpenSCD extends LitElement { name: 'redo', actionItem: true, action: (): void => { - this.dispatchEvent(newRedoEvent()) + this.dispatchEvent(newRedoEvent()); }, disabled: (): boolean => !this.canRedo, kind: 'static', @@ -593,7 +600,7 @@ export class OpenSCD extends LitElement { name: 'menu.viewLog', actionItem: true, action: (): void => { - this.dispatchEvent(newHistoryUIEvent(true, HistoryUIKind.log)) + this.dispatchEvent(newHistoryUIEvent(true, HistoryUIKind.log)); }, kind: 'static', }, @@ -602,7 +609,7 @@ export class OpenSCD extends LitElement { name: 'menu.viewHistory', actionItem: true, action: (): void => { - this.dispatchEvent(newHistoryUIEvent(true, HistoryUIKind.history)) + this.dispatchEvent(newHistoryUIEvent(true, HistoryUIKind.history)); }, kind: 'static', }, @@ -611,7 +618,7 @@ export class OpenSCD extends LitElement { name: 'menu.viewDiag', actionItem: true, action: (): void => { - this.dispatchEvent(newHistoryUIEvent(true, HistoryUIKind.diagnostic)) + this.dispatchEvent(newHistoryUIEvent(true, HistoryUIKind.diagnostic)); }, kind: 'static', }, diff --git a/packages/open-scd/public/js/plugins.js b/packages/open-scd/src/plugins.ts similarity index 100% rename from packages/open-scd/public/js/plugins.js rename to packages/open-scd/src/plugins.ts From 0d99e4c5f67627a89567451fcd2ba4fbb1d3746f Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Wed, 1 May 2024 13:38:54 +0200 Subject: [PATCH 2/4] reverted changelog.md --- packages/open-scd/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/open-scd/CHANGELOG.md b/packages/open-scd/CHANGELOG.md index eaab8bd2c7..d673b99ec7 100644 --- a/packages/open-scd/CHANGELOG.md +++ b/packages/open-scd/CHANGELOG.md @@ -541,7 +541,7 @@ All notable changes to this project will be documented in this file. See [standa ## [0.4.0](https://github.com/openscd/open-scd/compare/v0.3.0...v0.4.0) (2021-07-02) > **NB** for plugin developers: -> * All menu item plugins in `src/plugins.ts` are now listed under `kind: 'menu'` with a `position: 'top' | 'middle' | 'bottom'` determining positioning in the menu and `requireDoc: boolean` indicating whether the plugin requires a `doc` to be loaded in order to be clickable. +> * All menu item plugins in `public/js/plugins.js` are now listed under `kind: 'menu'` with a `position: 'top' | 'middle' | 'bottom'` determining positioning in the menu and `requireDoc: boolean` indicating whether the plugin requires a `doc` to be loaded in order to be clickable. > * All menu item and validator plugins now use the unified method signature `run(): Promise` to be triggered. ### Features From cd2cddfd4915877e2486ba804146ab5ad3934037 Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Wed, 1 May 2024 13:39:32 +0200 Subject: [PATCH 3/4] Reverted package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1eb1af930d..7ba0a8da08 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "test": "npx nx run-many -t test --all --parallel=false", "graph": "npx nx graph", "start": "lerna run start", - "serve": "npm run build" + "preserve": "npm run build" }, "repository": { "type": "git", From 31be3c4586e228ea5bceb04ce6a1f38285716b4a Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Wed, 1 May 2024 13:40:37 +0200 Subject: [PATCH 4/4] Reverted package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 7ba0a8da08..354a352e15 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,7 @@ "doc": "lerna run doc", "test": "npx nx run-many -t test --all --parallel=false", "graph": "npx nx graph", - "start": "lerna run start", - "preserve": "npm run build" + "start": "lerna run start" }, "repository": { "type": "git",