Filter constraints for empty values

mesosphere · Feb 29, 2016 · b5a1a60 · b5a1a60
1 parent 0b08a96
commit b5a1a60
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - \#3242 - Treat "value" attribute in server-side validation errors as general
   error
 - \#3304 - Marathon UI hangs after being open for a while
+- \#3233 - Cannot remove a constraint
 
 ## 0.15.6 - 2016-02-23
 - \#3192 - Adapt default Mem/CPU settings

diff --git a/src/js/stores/transforms/AppFormFieldToModelTransforms.js b/src/js/stores/transforms/AppFormFieldToModelTransforms.js
@@ -32,7 +32,11 @@ const AppFormFieldToModelTransforms = {
   disk: (value) => parseFloat(value),
   constraints: (constraints) => constraints
     .split(",")
-    .map((constraint) => constraint.split(":").map((value) => value.trim())),
+    .filter((constraint) => constraint != null && constraint !== "")
+    .map((constraint) =>
+      constraint
+        .split(":")
+        .map((value) => value.trim())),
   containerVolumes: rows => {
     return lazy(rows)
       .map((row) => ensureObjectScheme(row, dockerRowSchemes.containerVolumes))

diff --git a/src/test/units/AppFormTransforms.test.js b/src/test/units/AppFormTransforms.test.js
@@ -25,14 +25,22 @@ describe("App Form Field to Model Transform", function () {
       expect(AppFormTransforms.FieldToModel.disk("33.23")).to.equal(33.23);
     });
 
-    it("constraints to array with segements", function () {
-      let constraints = "hostname:UNIQUE, atomic:LIKE:man";
-      expect(AppFormTransforms.FieldToModel.constraints(constraints))
-        .to.deep.equal([
-          ["hostname", "UNIQUE"],
-          ["atomic", "LIKE", "man"]
-        ]);
+    describe("constraints", function () {
+      it("to array with segments", function () {
+        var constraints = "hostname:UNIQUE, atomic:LIKE:man";
+        expect(AppFormTransforms.FieldToModel.constraints(constraints))
+          .to.deep.equal([
+            ["hostname", "UNIQUE"],
+            ["atomic", "LIKE", "man"]
+          ]);
+      });
+      it("without inserting empty items", function () {
+        var constraints = "";
+        expect(AppFormTransforms.FieldToModel.constraints(constraints))
+          .to.deep.equal([]);
+      });
     });
+
     describe("container volumes", function () {
       it("to array of objects", function () {
         expect(AppFormTransforms.FieldToModel.containerVolumes([