Merge pull request #3 from trusz/pr/danyill/1287-1

ref: separate ui and business logic
danyill · Sep 25, 2023 · f3fb3b1 · f3fb3b1
2 parents ace451a + 2664171
commit f3fb3b1
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/src/editors/IED.ts b/src/editors/IED.ts
@@ -129,12 +129,22 @@ export default class IedPlugin extends LitElement {
           this.selectedIEDs = [iedName];
         }
       }
-      this.selectedLNClasses = this.lnClassList.map(
-        lnClassInfo => lnClassInfo[0]
-      );
     }
   }
 
+  private calcSelectedLNClasses(): string[] {
+    const somethingSelected = this.selectedLNClasses.length > 0;
+    const lnClasses = this.lnClassList.map( lnClassInfo => lnClassInfo[0] );
+
+    let selectedLNClasses = lnClasses;
+
+    if(somethingSelected){
+      selectedLNClasses = lnClasses.filter( lnClass => this.selectedLNClasses.includes(lnClass));
+    }
+
+    return selectedLNClasses;
+  }
+
   render(): TemplateResult {
     const iedList = this.iedList;
     if (iedList.length > 0) {
@@ -165,9 +175,7 @@ export default class IedPlugin extends LitElement {
 
               this.lNClassListOpenedOnce = false;
               this.selectedIEDs = e.detail.selectedItems;
-              this.selectedLNClasses = this.lnClassList.map(
-                lnClassInfo => lnClassInfo[0]
-              );
+              this.selectedLNClasses = [];
               this.requestUpdate('selectedIed');
             }}"
           >
@@ -195,17 +203,9 @@ export default class IedPlugin extends LitElement {
             multi="true"
             .header="${translate('iededitor.lnFilter')}"
             @selected-items-changed="${(e: SelectedItemsChangedEvent) => {
-              let selectedItems = e.detail.selectedItems;
-              const nothingSelected = selectedItems.length === 0;
-              if (nothingSelected) {
-                selectedItems = this.lnClassList.map(
-                  lnClassInfo => lnClassInfo[0]
-                );
-              }
 
-              this.selectedLNClasses = selectedItems;
+              this.selectedLNClasses = e.detail.selectedItems;
               this.requestUpdate('selectedIed');
-              this.lNClassListOpenedOnce = true;
             }}"
           >
             <span slot="icon">${getIcon('lNIcon')}</span>
@@ -214,8 +214,7 @@ export default class IedPlugin extends LitElement {
               const label = lnClassInfo[1];
               return html`<mwc-check-list-item
                 value="${value}"
-                ?selected="${this.lNClassListOpenedOnce &&
-                this.selectedLNClasses.includes(value)}"
+                ?selected="${this.selectedLNClasses.includes(value)}"
               >
                 ${label}
               </mwc-check-list-item>`;
@@ -229,7 +228,7 @@ export default class IedPlugin extends LitElement {
           .editCount=${this.editCount}
           .doc=${this.doc}
           .element=${this.selectedIed}
-          .selectedLNClasses=${this.selectedLNClasses}
+          .selectedLNClasses=${this.calcSelectedLNClasses()}
           .nsdoc=${this.nsdoc}
         ></ied-container>
       </section>`;