Merge pull request #62 from com-pas/test/fix-plugins-tests

chore: Fix plugins tests

Author: clepski

package-lock.json

@@ -45,6 +45,7 @@
     "./dist/wizard-textfield.js": "./dist/wizard-textfield.js",
     "./dist/wizard-checkbox.js": "./dist/wizard-checkbox.js",
     "./dist/wizard-select.js": "./dist/wizard-select.js",
+    "./dist/wizard-dialog.js": "./dist/wizard-dialog.js",
     "./dist/WizardDivider.js": "./dist/WizardDivider.js",
     "./dist/wizards.js": "./dist/wizards.js",
     "./dist/oscd-filter-button.js": "./dist/oscd-filter-button.js",

packages/openscd/package.json

@@ -108,6 +108,10 @@ export class FilteredList extends LitElement {
     return this.list.selected;
   }
 
+  get index() {
+    return this.list.index;
+  }
+
   private onCheckAll(): void {
     const select = !this.isAllSelected;
     this.items
@@ -125,6 +129,10 @@ export class FilteredList extends LitElement {
     );
   }
 
+  layout(updateItems?: boolean): void {
+    this.list.layout(updateItems);
+  }
+
   protected update(
     changedProperties: Map<string | number | symbol, unknown>
   ): void {

packages/openscd/src/filtered-list.ts

@@ -45,6 +45,8 @@ export class WizardTextField extends LitElement {
   disabled = false;
   @property({ type: Boolean })
   required = false;
+  @property({ type: Boolean })
+  readOnly = false;
   @property({ type: String })
   label = '';
   @property({ type: Boolean })
@@ -228,6 +230,7 @@ export class WizardTextField extends LitElement {
           .helperPersistent=${this.helperPersistent}
           .disabled=${this.disabled}
           .required=${this.required}
+          .readOnly=${this.readOnly}
           label=${this.label}
           helper="${ifDefined(this.helper)}"
           validationMessage="${ifDefined(this.helper)}"

packages/openscd/src/wizard-textfield.ts

@@ -49,8 +49,7 @@
     "format:prettier": "prettier \"**/*.js\" \"**/*.ts\" --write --ignore-path .gitignore",
     "lint": "npm run lint:eslint && npm run lint:prettier",
     "format": "npm run format:eslint && npm run format:prettier",
-    "TODO": "ignore tests for now, imports have to be adjusted when plugins package is migrated",
-    "test": "web-test-runner --coverage || exit 0",
+    "test": "web-test-runner --coverage",
     "test:snapshot": "web-test-runner --update-snapshots --coverage",
     "test:manual": "web-test-runner --manual",
     "test:watch": "web-test-runner --watch",
@@ -81,6 +80,7 @@
     "@web/dev-server-esbuild": "^0.2.16",
     "@web/test-runner": "^0.13.22",
     "@web/test-runner-playwright": "^0.11.0",
+    "@web/dev-server-polyfill": "^1.0.6",
     "concurrently": "^6.2.1",
     "deepmerge": "^4.2.2",
     "es-dev-server": "^2.1.0",

packages/plugins/package.json

@@ -25,6 +25,7 @@ import { List, MWCListIndex } from '@material/mwc-list';
 import { ListItem } from '@material/mwc-list/mwc-list-item.js';
 
 import '@compas-oscd/open-scd/dist/filtered-list.js';
+import { FilteredList } from '@compas-oscd/open-scd/dist/filtered-list.js';
 
 import {
   identity,
@@ -87,13 +88,13 @@ export class CleanupControlBlocks extends LitElement {
   unreferencedControls: Element[] = [];
 
   @property({ attribute: false })
-  selectedControlItems: MWCListIndex | [] = [];
+  selectedControlItems: MWCListIndex = new Set<number>();
 
   @query('.deleteButton')
   cleanButton!: Button;
 
   @query('.cleanupList')
-  cleanupList: List | undefined;
+  cleanupList: FilteredList | undefined;
 
   @queryAll('mwc-check-list-item.cleanupListItem')
   cleanupListItems: ListItem[] | undefined;
@@ -130,7 +131,7 @@ export class CleanupControlBlocks extends LitElement {
    */
   async firstUpdated(): Promise<void> {
     this.cleanupList?.addEventListener('selected', () => {
-      this.selectedControlItems = this.cleanupList!.index;
+      this.selectedControlItems = this.cleanupList!.list.index;
     });
     this.toggleHiddenClass('tReportControl');
   }

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

@@ -48,7 +48,7 @@ export class CleanupDatasets extends LitElement {
   unreferencedDataSets: Element[] = [];
 
   @property({ attribute: false })
-  selectedDatasetItems: MWCListIndex | [] = [];
+  selectedDatasetItems: MWCListIndex = new Set<number>();
 
   @query('.deleteButton')
   cleanupButton!: Button;

packages/plugins/src/editors/cleanup/datasets-container.ts

@@ -15,7 +15,7 @@ export class ConnectedAP104Editor extends Base104Container {
   @property({ attribute: false })
   element!: Element;
 
-  private openEditWizard(): void {
+  openEditWizard(): void {
     this.dispatchEvent(
       newWizardEvent(() =>
         editConnectedApWizard(

packages/plugins/src/editors/protocol104/connectedap-editor.ts

@@ -1,10 +1,11 @@
-import { css, html, LitElement, query, TemplateResult } from 'lit-element';
+import { css, LitElement, query, html, TemplateResult } from 'lit-element';
 import { get } from 'lit-translate';
 
 import '@material/mwc-list/mwc-check-list-item';
 import { List } from '@material/mwc-list';
 import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
 
+import { oscdHtml } from '@compas-oscd/open-scd/dist/foundation.js';
 import '@compas-oscd/open-scd/dist/filtered-list.js';
 import {
   find,
@@ -66,7 +67,7 @@ function addDescriptionAction(doc: XMLDocument): WizardActor {
     wizard: Element,
     list: List | null | undefined
   ): WizardAction[] => {
-    const selectedItems = <ListItemBase[]>list!.selected;
+    const selectedItems = <ListItemBase[]>list?.selected ?? [];
 
     const actions = selectedItems.map(item => {
       const desc = (<Element>item.querySelector('span')).textContent;
@@ -96,11 +97,11 @@ function createLogWizard(doc: XMLDocument, items: SignalDescription[]): Wizard {
         action: addDescriptionAction(doc),
       },
       content: [
-        html`<filtered-list multi
+        oscdHtml`<filtered-list multi
           >${Array.from(
             items.map(
               item =>
-                html`<mwc-check-list-item
+                oscdHtml`<mwc-check-list-item
                   twoline
                   selected
                   value="${item.tag + ' | ' + item.identity}"

packages/plugins/src/menu/UpdateDescriptionSEL.ts

@@ -19,10 +19,9 @@ import { WizardTextField } from '@compas-oscd/open-scd/dist/wizard-textfield.js'
 import { maxLength, patterns } from './foundation/limits.js';
 import { predefinedBasicTypeEnum, valKindEnum } from './foundation/enums.js';
 
-function selectType(e: SelectedEvent, data: Element, Val: string | null): void {
-  if (!e.target || !(e.target as Select).parentElement) return;
+function selectType(e: SelectedEvent, typeSelected: string | null, data: Element, Val: string | null): void {
+  if (!e.target || !(e.target as Select).parentElement || !typeSelected) return;
 
-  const typeSelected = (<Select>e.target).selected?.value;
   const selectedBType = (<WizardSelect>(
     (<Select>e.target).parentElement!.querySelector(
       'wizard-select[label="bType"]'
@@ -53,11 +52,10 @@ function selectType(e: SelectedEvent, data: Element, Val: string | null): void {
 
 function selectBType(
   e: SelectedEvent,
+  bTypeSelected: string,
   bType: string | null,
   type: string | null
 ): void {
-  const bTypeSelected = (<Select>e.target).selected!.value;
-
   const typeUI = <Select>(
     (<Select>e.target).parentElement!.querySelector(
       'wizard-select[label="type"]'
@@ -136,7 +134,7 @@ export function wizardContent(
       .value=${bType}
       helper="${get('scl.bType')}"
       required
-      @selected=${(e: SelectedEvent) => selectBType(e, bType, type)}
+      @selected=${(e: SelectedEvent) => selectBType(e, predefinedBasicTypeEnum[e.detail.index as number], bType, type)}
       >${predefinedBasicTypeEnum.map(
         redefinedBType =>
           html`<mwc-list-item value="${redefinedBType}"
@@ -149,7 +147,7 @@ export function wizardContent(
       .maybeValue=${type}
       helper="${get('scl.type')}"
       fixedMenuPosition
-      @selected=${(e: SelectedEvent) => selectType(e, data, Val)}
+      @selected=${(e: SelectedEvent) => selectType(e, types[e.detail.index as number]?.id, data, Val)}
       >${types.map(
         dataType =>
           oscdHtml`<mwc-list-item