Fix duplicate expressions and null values

rancher · Jan 6, 2021 · 4d614ee · 4d614ee
1 parent 844ae9a
commit 4d614ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/components/form/MatchExpressions.vue b/components/form/MatchExpressions.vue
@@ -160,7 +160,9 @@ export default {
             return;
           }
 
-          matchExpression.values = val ? val.split(/\s*,\s*/).filter(x => !!x) : null;
+          if ( val !== null ) {
+            matchExpression.values = val.split(/\s*,\s*/).filter(x => !!x);
+          }
 
           return matchExpression;
         }).filter(x => !!x);

diff --git a/edit/fleet.cattle.io.clustergroup.vue b/edit/fleet.cattle.io.clustergroup.vue
@@ -38,18 +38,20 @@ export default {
       };
     }
 
-    this.updateMatchingClusters();
+    const expressions = convert(
+      this.value.spec.selector.matchLabels || {},
+      this.value.spec.selector.matchExpressions || []
+    );
+
+    this.matchChanged(expressions);
   },
 
   data() {
     return {
       allClusters:      null,
       allWorkspaces:    null,
       matchingClusters: null,
-      expressions:      [
-        ...convert(this.value.spec.selector.matchLabels || {}),
-        ...(this.value.spec.selector.matchExpressions || []),
-      ],
+      expressions:      null,
     };
   },