fix(plain-compare-list): swap list relations (#1096)

Signed-off-by: Pascal Wilbrink <pascal.wilbrink@alliander.com> Signed-off-by: Pascal Wilbrink <pascal.wilbrink@alliander.com>
openscd · Nov 28, 2022 · 9fbfbcd · 9fbfbcd
1 parent 95ba5ab
commit 9fbfbcd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 39 deletions.
diff --git a/src/plain-compare-list.ts b/src/plain-compare-list.ts
@@ -60,10 +60,7 @@ export class PlainCompareList extends LitElement {
 
   render(): TemplateResult {
     return html`
-      <div class="container">
-        <div class="flex"></div>
-        ${this.renderFilterCheckbox()}
-      </div>
+      ${this.renderFilterCheckbox()}
       <div class="container container--alt">
         <div class="list__container list__container--left">
           <h3 class="mdc-dialog__title">${this.leftHandTitle}</h3>
@@ -83,8 +80,8 @@ export class PlainCompareList extends LitElement {
       ${this.leftHandObject && this.rightHandObject
         ? html`
             ${renderDiff(
-              this.leftHandObject,
               this.rightHandObject,
+              this.leftHandObject,
               this.filterMutables ? this.filterToIgnore : {}
             )}
           `
@@ -93,13 +90,21 @@ export class PlainCompareList extends LitElement {
   }
 
   protected renderFilterCheckbox(): TemplateResult {
-    return html`<mwc-formfield label="${translate('compare.filterMutables')}">
-      <mwc-checkbox
-        ?checked=${this.filterMutables}
-        @change=${() => (this.filterMutables = !this.filterMutables)}
-      >
-      </mwc-checkbox>
-    </mwc-formfield> `;
+    if (this.filterToIgnore) {
+      return html`
+        <div class="container">
+          <div class="flex"></div>
+          <mwc-formfield label="${translate('compare.filterMutables')}">
+            <mwc-checkbox
+              ?checked=${this.filterMutables}
+              @change=${() => (this.filterMutables = !this.filterMutables)}
+            >
+            </mwc-checkbox>
+          </mwc-formfield>
+        </div>
+      `;
+    }
+    return html``;
   }
 
   static styles = css`

diff --git a/test/unit/__snapshots__/plain-compare-list.test.snap.js b/test/unit/__snapshots__/plain-compare-list.test.snap.js
@@ -2,15 +2,7 @@
 export const snapshots = {};
 
 snapshots["Plain Compare List Empty list looks like the latest snapshot"] = 
-`<div class="container">
-  <div class="flex">
-  </div>
-  <mwc-formfield label="[compare.filterMutables]">
-    <mwc-checkbox checked="">
-    </mwc-checkbox>
-  </mwc-formfield>
-</div>
-<div class="container container--alt">
+`<div class="container container--alt">
   <div class="list__container list__container--left">
     <h3 class="mdc-dialog__title">
     </h3>
@@ -24,15 +16,7 @@ snapshots["Plain Compare List Empty list looks like the latest snapshot"] =
 /* end snapshot Plain Compare List Empty list looks like the latest snapshot */
 
 snapshots["Plain Compare List Basic List looks like the latest snapshot"] = 
-`<div class="container">
-  <div class="flex">
-  </div>
-  <mwc-formfield label="[compare.filterMutables]">
-    <mwc-checkbox checked="">
-    </mwc-checkbox>
-  </mwc-formfield>
-</div>
-<div class="container container--alt">
+`<div class="container container--alt">
   <div class="list__container list__container--left">
     <h3 class="mdc-dialog__title">
       Project doc
@@ -48,15 +32,7 @@ snapshots["Plain Compare List Basic List looks like the latest snapshot"] =
 /* end snapshot Plain Compare List Basic List looks like the latest snapshot */
 
 snapshots["Plain Compare List Basic List Has a subtitlte, so looks like the latest snapshot"] = 
-`<div class="container">
-  <div class="flex">
-  </div>
-  <mwc-formfield label="[compare.filterMutables]">
-    <mwc-checkbox checked="">
-    </mwc-checkbox>
-  </mwc-formfield>
-</div>
-<div class="container container--alt">
+`<div class="container container--alt">
   <div class="list__container list__container--left">
     <h3 class="mdc-dialog__title">
       Project doc