From 4297c1f27fc7b3f6aa2cfcda5c37d658e2ba7fa0 Mon Sep 17 00:00:00 2001 From: Steffen van den Driest Date: Fri, 15 Mar 2024 11:19:06 +0100 Subject: [PATCH 1/2] feat: optional nsd upload button Signed-off-by: Steffen van den Driest --- packages/open-scd/src/addons/Settings.ts | 13 +- .../__snapshots__/Setting.test.snap.js | 2 +- packages/open-scd/test/unit/Setting.test.ts | 18 + .../unit/__snapshots__/Setting.test.snap.js | 342 +++++++++++++++++- 4 files changed, 368 insertions(+), 7 deletions(-) diff --git a/packages/open-scd/src/addons/Settings.ts b/packages/open-scd/src/addons/Settings.ts index 9bbb683d0..a8b3f14ed 100644 --- a/packages/open-scd/src/addons/Settings.ts +++ b/packages/open-scd/src/addons/Settings.ts @@ -112,6 +112,9 @@ export class OscdSettings extends LitElement { }) host!: HTMLElement; + @property({ type: Boolean }) + nsdUploadButton = true; + /** * Get the versions of the current OpenSCD NSD files. * @returns Current version, revision and release for all current OpenSCD NSD files. @@ -424,10 +427,12 @@ export class OscdSettings extends LitElement { -
-

${translate('settings.loadNsdTranslations')}

- ${this.renderFileSelect()} -
+ ${this.nsdUploadButton + ? html`
+

${translate('settings.loadNsdTranslations')}

+ ${this.renderFileSelect()} +
` + : html``} ${this.renderNsdocItem('IEC 61850-7-2')} ${this.renderNsdocItem('IEC 61850-7-3')} diff --git a/packages/open-scd/test/integration/__snapshots__/Setting.test.snap.js b/packages/open-scd/test/integration/__snapshots__/Setting.test.snap.js index 2e9c41bb9..4872c19b3 100644 --- a/packages/open-scd/test/integration/__snapshots__/Setting.test.snap.js +++ b/packages/open-scd/test/integration/__snapshots__/Setting.test.snap.js @@ -52,7 +52,7 @@ snapshots["Oscd-Settings upload .nsdoc file using event and looks like latest sn -
+

Uploaded NSDoc files

diff --git a/packages/open-scd/test/unit/Setting.test.ts b/packages/open-scd/test/unit/Setting.test.ts index 9a7d43127..15b9d6f40 100644 --- a/packages/open-scd/test/unit/Setting.test.ts +++ b/packages/open-scd/test/unit/Setting.test.ts @@ -51,6 +51,24 @@ describe('OSCD-Settings', () => { expect(element).to.have.deep.property('settings', defaults); }); + it('enables/shows the upload .nsdoc file button by default', async () => { + element.settingsUI.show(); + await element.settingsUI.updateComplete; + expect(element.settingsUI.querySelector('section[id="shownsdbutton"]')).to + .not.be.null; + await expect(element).shadowDom.to.equalSnapshot(); + }); + + it('disables/hides the upload .nsdoc file button', async () => { + element.settingsUI.show(); + await element.settingsUI.updateComplete; + element.nsdUploadButton = false; + await element.requestUpdate(); + expect(element.settingsUI.querySelector('section[id="shownsdbutton"]')).to + .be.null; + await expect(element).shadowDom.to.equalSnapshot(); + }); + it('saves chosen .nsdoc file and looks like latest snapshot', async () => { element.settingsUI.show(); await element.settingsUI.updateComplete; diff --git a/packages/open-scd/test/unit/__snapshots__/Setting.test.snap.js b/packages/open-scd/test/unit/__snapshots__/Setting.test.snap.js index 9491f83fb..53d88fad9 100644 --- a/packages/open-scd/test/unit/__snapshots__/Setting.test.snap.js +++ b/packages/open-scd/test/unit/__snapshots__/Setting.test.snap.js @@ -1,6 +1,344 @@ /* @web/test-runner snapshot v1 */ export const snapshots = {}; +snapshots["OSCD-Settings enables/shows the upload .nsdoc file button by default"] = +` +
+ + + English + + + German (Deutsch) + + + + + + + + + + + + + + +
+ + +
+

+ Uploaded NSDoc files +

+ + + +
+ + + + IEC 61850-7-2 + + + close + + + + + IEC 61850-7-3 + + + close + + + + + IEC 61850-7-4 + + + close + + + + + IEC 61850-8-1 + + + close + + + + + Cancel + + + Reset + + + Save + + + + +`; +/* end snapshot OSCD-Settings enables/shows the upload .nsdoc file button by default */ + +snapshots["OSCD-Settings disables/hides the upload .nsdoc file button"] = +` +
+ + + English + + + German (Deutsch) + + + + + + + + + + + + + + +
+ + + + + + IEC 61850-7-2 + + + close + + + + + IEC 61850-7-3 + + + close + + + + + IEC 61850-7-4 + + + close + + + + + IEC 61850-8-1 + + + close + + + + + Cancel + + + Reset + + + Save + + + + +`; +/* end snapshot OSCD-Settings disables/hides the upload .nsdoc file button */ + snapshots["OSCD-Settings saves chosen .nsdoc file and looks like latest snapshot"] = ` -
+

Uploaded NSDoc files

@@ -238,7 +576,7 @@ snapshots["OSCD-Settings deletes a chosen .nsdoc file and looks like latest snap -
+

Uploaded NSDoc files

From 84728c010245d8a2cfee9b0e33a2d22eb1335e6d Mon Sep 17 00:00:00 2001 From: Steffen van den Driest Date: Fri, 15 Mar 2024 11:29:53 +0100 Subject: [PATCH 2/2] chore: removed translate Signed-off-by: Steffen van den Driest --- packages/open-scd/src/addons/Settings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/open-scd/src/addons/Settings.ts b/packages/open-scd/src/addons/Settings.ts index 8a0083c4b..8e831be3f 100644 --- a/packages/open-scd/src/addons/Settings.ts +++ b/packages/open-scd/src/addons/Settings.ts @@ -429,7 +429,7 @@ export class OscdSettings extends LitElement { ${this.nsdUploadButton ? html`
-

${translate('settings.loadNsdTranslations')}

+

${get('settings.loadNsdTranslations')}

${this.renderFileSelect()}
` : html``}