fixup! fix(gv-policy-studio): allow to reset condition

gravitee-io · Jun 22, 2021 · edc6965 · edc6965
1 parent e2d03d7
commit edc6965
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/policy-studio/gv-policy-studio.js b/src/policy-studio/gv-policy-studio.js
@@ -839,10 +839,8 @@ export class GvPolicyStudio extends KeyboardElement(LitElement) {
 
   _onSubmitFlow({ detail: { values } }) {
     const selectedFlow = this.getSelectedFlow();
-    const selectedFlowUpdated = Object.assign({}, selectedFlow, values);
-    if (!values.condition) {
-      selectedFlowUpdated.condition = null;
-    }
+    const _values = Object.assign({}, this._createFlowFromSchema(), values);
+    const selectedFlowUpdated = Object.assign({}, selectedFlow, _values);
     if (!deepEqual(selectedFlow, selectedFlowUpdated)) {
       Object.assign(selectedFlow, selectedFlowUpdated, { _dirty: true });
       this.isDirty = true;
@@ -1230,6 +1228,8 @@ export class GvPolicyStudio extends KeyboardElement(LitElement) {
         }
         if (entry.default !== undefined) {
           property[key] = entry.default;
+        } else if (entry.type === 'string') {
+          property[key] = '';
         }
       }
     }

diff --git a/stories/policy-studio/gv-policy-studio.test.js b/stories/policy-studio/gv-policy-studio.test.js
@@ -19,6 +19,7 @@ import definition from '../resources/apim-definition.json';
 import policies from '../resources/apim-policies.json';
 import resourceTypes from '../resources/apim-resource-types.json';
 import '../../src/policy-studio/gv-policy-studio';
+import apimFlowSchema from '../resources/schemas/apim-flow.json';
 
 describe('P O L I C Y  S T U D I O', () => {
   let page, component;
@@ -371,7 +372,9 @@ describe('P O L I C Y  S T U D I O', () => {
       }
     });
 
-    test('should reset condition', async () => {
+    test('should reset field', async () => {
+      component.flowSchema = apimFlowSchema;
+
       const _id = 'foobar';
       const _stepId = 'foobar-step';
       const step = { _id: _stepId, name: 'step', description: 'step description', configuration: {}, policy: 'api-key' };
@@ -385,7 +388,6 @@ describe('P O L I C Y  S T U D I O', () => {
       };
       const values = {
         _id,
-        name: 'Updated flow',
         description: 'test',
         pre: [step],
         post: [],
@@ -398,7 +400,8 @@ describe('P O L I C Y  S T U D I O', () => {
 
       expect(component.definition.flows.length).toEqual(1);
       expect(component.definition.flows[0]._id).toEqual(_id);
-      expect(component.definition.flows[0].condition).toBeNull();
+      expect(component.definition.flows[0].name).toEqual('');
+      expect(component.definition.flows[0].condition).toEqual('');
     });
   });
 });