Merge pull request #2523 from dcos/ph/feature/DCOS-19657-add-type-to-…

…constraint DCOS-19657: add advanced type to constraints input
dcos · Nov 30, 2017 · 08eed89 · 08eed89
2 parents d1a90bb + ed3198a
commit 08eed89
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/plugins/services/src/js/reducers/serviceForm/FormReducers/Constraints.js b/plugins/services/src/js/reducers/serviceForm/FormReducers/Constraints.js
@@ -13,13 +13,22 @@ function processTransaction(state, { type, path, value }) {
   let newState = state.slice();
 
   if (type === ADD_ITEM) {
-    newState.push({ fieldName: null, operator: null, value: null });
+    let defaultValue = { fieldName: null, operator: null, value: null };
+
+    if (value != null && value.type != null) {
+      defaultValue = Object.assign({}, defaultValue, value);
+    }
+
+    newState.push(defaultValue);
   }
   if (type === REMOVE_ITEM) {
     newState = newState.filter((item, index) => {
       return index !== value;
     });
   }
+  if (type === SET && name === "type") {
+    newState[index].type = value;
+  }
   if (
     type === SET &&
     CONSTRAINT_FIELDS.includes(name) &&

diff --git a/src/js/components/PlacementConstraintsPartial.js b/src/js/components/PlacementConstraintsPartial.js
@@ -220,7 +220,8 @@ export default class PlacementSection extends Component {
           <FormGroup className="column-12">
             <AddButton
               onClick={this.props.onAddItem.bind(this, {
-                path: "constraints"
+                path: "constraints",
+                value: { type: "default" }
               })}
             >
               Add Placement Constraint