Disallow rule create with no distributions; update imports (flipt-io#759

)
albertchae · Mar 20, 2022 · 8ca6e39 · 8ca6e39
1 parent 549104c
commit 8ca6e39
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/ui/src/components/Flags/DebugConsole.vue b/ui/src/components/Flags/DebugConsole.vue
@@ -35,8 +35,7 @@
 </template>
 
 <script>
-import clone from "lodash/clone";
-import isEmpty from "lodash/isEmpty";
+import { clone, isEmpty } from "lodash";
 import { v4 as uuidv4 } from "uuid";
 
 import { Api } from "@/services/api";

diff --git a/ui/src/components/Flags/Flag.vue b/ui/src/components/Flags/Flag.vue
@@ -317,9 +317,7 @@
 </template>
 
 <script>
-import clone from "lodash/clone";
-import cloneDeep from "lodash/cloneDeep";
-import capitalize from "lodash/capitalize";
+import { capitalize, clone, cloneDeep } from "lodash";
 
 import { Api } from "@/services/api";
 import notify from "@/mixins/notify";

diff --git a/ui/src/components/Flags/Targeting.vue b/ui/src/components/Flags/Targeting.vue
@@ -266,12 +266,16 @@
 </template>
 
 <script>
-import clone from "lodash/clone";
-import cloneDeep from "lodash/cloneDeep";
-import capitalize from "lodash/capitalize";
-import map from "lodash/map";
-import find from "lodash/find";
-import forEach from "lodash/forEach";
+import {
+  capitalize,
+  clone,
+  cloneDeep,
+  find,
+  forEach,
+  isEmpty,
+  map,
+} from "lodash";
+
 import draggable from "vuedraggable";
 
 import { Api } from "@/services/api";
@@ -341,7 +345,10 @@ export default {
       return this.flag.variants && this.flag.variants.length > 0;
     },
     canAddRule() {
-      return this.isPresent(this.newRule.segmentKey);
+      return (
+        this.isPresent(this.newRule.segmentKey) &&
+        !isEmpty(this.newRule.distributions)
+      );
     },
   },
   mounted() {
@@ -523,7 +530,9 @@ export default {
     },
     ruleTypeChanged(event) {
       let val = event.target.value;
-      if (val === "rollout") {
+      if (val === "") {
+        this.newRule.distributions = [];
+      } else if (val === "rollout") {
         let n = this.flag.variants.length;
         let percentages = this.computePercentages(n);
         let distributions = [];

diff --git a/ui/src/components/Segments/Segment.vue b/ui/src/components/Segments/Segment.vue
@@ -364,10 +364,7 @@
 </template>
 
 <script>
-import clone from "lodash/clone";
-import cloneDeep from "lodash/cloneDeep";
-import capitalize from "lodash/capitalize";
-import merge from "lodash/merge";
+import { capitalize, clone, cloneDeep, merge } from "lodash";
 
 import { Api } from "@/services/api";
 import notify from "@/mixins/notify";