@ukhomeoffice/cop-react-form-renderer 6.15.4-alpha → 6.15.4

package/dist/components/FormComponent/FormComponent.js

@@ -76,6 +76,12 @@ const FormComponent = _ref => {
 
       // eslint-disable-next-line no-param-reassign
       target = (0, _helpers.addLabel)(target, component, data);
+      if (component.type === _models.ComponentTypes.SELECT && target.value === '') {
+        // eslint-disable-next-line no-param-reassign
+        target.value = null;
+        // eslint-disable-next-line no-param-reassign
+        target.label = null;
+      }
       onChange({
         target
       });

package/dist/components/FormComponent/helpers/addLabel.js

@@ -10,13 +10,14 @@ exports.default = void 0;
  * @returns The updated target.
  */
 const addLabel = (paramTarget, component, data) => {
+  var _target$value;
   const target = paramTarget;
   // target.value can be an object in which case use value in object attribute
-  const value = typeof target.value === 'object' ? target.value.value : target.value;
+  const value = typeof target.value === 'object' ? (_target$value = target.value) === null || _target$value === void 0 ? void 0 : _target$value.value : target.value;
   // find the reference data item using the value
   const item = data.find(e => String(e.id) === value);
   // if item is null it means that the target.value can be used as a label otherwise use item.label
-  target.label = item === undefined ? target.value : item.label;
+  target.label = item === undefined ? target.value || '' : item.label;
   target.component = component.cya_label;
   return target;
 };

package/dist/components/FormPage/FormPage.js

@@ -19,6 +19,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } // Global imports
 // Local imports.
@@ -67,20 +69,31 @@ const FormPage = _ref => {
       target
     } = _ref2;
     const formPage = page;
-    if (target.value == null) {
+    const {
+      value
+    } = target;
+    if (!value) {
       delete formPage.formData[target.name];
       setPatch(prev => {
-        const data = prev;
-        return delete data[target.name];
+        const _target$name = target.name,
+          {
+            [_target$name]: removedValue
+          } = prev,
+          newState = _objectWithoutProperties(prev, [_target$name].map(_toPropertyKey));
+        return newState;
       });
       setPatchLabel(prev => {
-        const data = prev;
-        return delete data[target.component];
+        const _target$component = target.component,
+          {
+            [_target$component]: removedValue
+          } = prev,
+          newState = _objectWithoutProperties(prev, [_target$component].map(_toPropertyKey));
+        return newState;
       });
     } else {
-      formPage.formData[target.name] = target.value;
+      formPage.formData[target.name] = value;
       setPatch(prev => _objectSpread(_objectSpread({}, prev), {}, {
-        [target.name]: target.value
+        [target.name]: value
       }));
       setPatchLabel(prev => _objectSpread(_objectSpread({}, prev), {}, {
         [target.component]: target.label

package/dist/components/FormPage/FormPage.test.js

@@ -337,5 +337,58 @@ describe('components.FormPage', () => {
       }));
       expect(ON_ACTION_CALLS.length).toEqual(0);
     });
+    it('removed field from the form data when the value is set to null', () => {
+      const AUTOCOMPLETE = {
+        id: 'autocomplete',
+        fieldId: 'autocomplete',
+        label: 'autocomplete',
+        hint: '',
+        type: 'autocomplete',
+        required: true,
+        source: [{
+          id: 'a',
+          name: 'apple'
+        }, {
+          id: 'b',
+          name: 'banana'
+        }, {
+          id: 'c',
+          name: 'cherry'
+        }, {
+          id: 'd',
+          name: 'DURIAN'
+        }],
+        disabled: false
+      };
+      const page = {
+        id: 'page1',
+        title: 'Page title',
+        label: 'Page label',
+        components: [AUTOCOMPLETE],
+        formData: {
+          autocomplete: 'autocomplete value example'
+        },
+        actions: []
+      };
+      const onChangeMock = jest.fn();
+      const {
+        getByLabelText
+      } = (0, _setupTests.renderWithValidation)(/*#__PURE__*/_react2.default.createElement(_FormPage.default, {
+        page: page,
+        fromTarget: true,
+        onAction: onChangeMock,
+        onChange: onChangeMock
+      }));
+      const input = getByLabelText('autocomplete');
+      _react.fireEvent.change(input, {
+        target: {
+          name: 'autocomplete',
+          value: '',
+          component: 'autocomplete'
+        }
+      });
+      const updatedState = onChangeMock.mock.calls.pop()[0];
+      expect(updatedState.autocomplete).toBeUndefined();
+    });
   });
 });

package/dist/components/FormRenderer/FormRenderer.js

@@ -144,12 +144,6 @@ const InternalFormRenderer = _ref2 => {
     setGoingBack(true);
     hooks.onGoingBack(e.state ? e.state : null);
     if (components && pages && data && (_formState$page = formState.page) !== null && _formState$page !== void 0 && _formState$page.formData && pagePoint === undefined) {
-      var _formState$page$formD, _formState$page$formD2;
-      // clear current formTasks when going back
-      if ((_formState$page$formD = formState.page.formData) !== null && _formState$page$formD !== void 0 && (_formState$page$formD = _formState$page$formD.formStatus) !== null && _formState$page$formD !== void 0 && _formState$page$formD.tasks && (_formState$page$formD2 = formState.page.formData) !== null && _formState$page$formD2 !== void 0 && (_formState$page$formD2 = _formState$page$formD2.formStatus) !== null && _formState$page$formD2 !== void 0 && _formState$page$formD2.taskPage) {
-        formState.page.formData.formStatus.tasks = {};
-        formState.page.formData.formStatus.taskPage = null;
-      }
       const submissionData = _utils.default.Format.form({
         pages,
         components

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-chained-component-show-whens-containerised.json

@@ -0,0 +1,119 @@
+{
+  "id": "example-form",
+  "version": "0.0.1",
+  "name": "example-form",
+  "title": "Example form",
+  "type": "form",
+  "components": [
+    {
+      "id": "alpha-parent",
+      "fieldId": "alpha-parent",
+      "type": "container",
+      "components": [
+        {
+          "id": "alpha",
+          "fieldId": "alpha",
+          "label": "Alpha",
+          "type": "text",
+          "show_when": {
+            "op": "=",
+            "field": "bravo-parent.bravo",
+            "value": "bravo-value"
+          }
+        }
+      ]
+    },
+    {
+      "id": "bravo-parent",
+      "fieldId": "bravo-parent",
+      "type": "container",
+      "components": [
+        {
+          "id": "bravo",
+          "fieldId": "bravo",
+          "label": "Bravo",
+          "type": "text",
+          "show_when": {
+            "op": "=",
+            "field": "gamma-parent.gamma",
+            "value": "gamma-value"
+          }
+        }
+      ]
+    },
+    {
+      "id": "personKnown",
+      "fieldId": "personKnown",
+      "type": "radios",
+      "data": {
+        "options": [
+          {
+            "value": "yes",
+            "label": "Yes",
+            "nested": [
+              {
+                "id": "telephone",
+                "fieldId": "telephone",
+                "type": "text",
+                "label": "Telephone",
+                "required": true
+              }
+            ]
+          },
+          {
+            "value": "no",
+            "label": "No"
+          }
+        ]
+      }
+    },
+    {
+      "id": "gamma-parent",
+      "fieldId": "gamma-parent",
+      "type": "container",
+      "components": [
+        {
+          "id": "gamma",
+          "fieldId": "gamma",
+          "label": "Gamma",
+          "type": "text",
+          "show_when": {
+            "op": "=",
+            "field": "epsilon",
+            "value": "epsilon-value"
+          }
+        }
+      ]
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "visiblePage",
+      "name": "visiblePage",
+      "title": "Visible Page",
+      "components": [
+        {
+          "use": "alpha-parent"
+        },
+        {
+          "use": "bravo-parent"
+        },
+        {
+          "use": "personKnown"
+        },
+        {
+          "use": "gamma-parent"
+        },
+        {
+          "use": "epsilon"
+        }
+      ]
+    }
+  ]
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-chained-component-show-whens-dependent-component-nested-block.json

@@ -0,0 +1,112 @@
+{
+  "id": "example-form",
+  "version": "0.0.1",
+  "name": "example-form",
+  "title": "Example form",
+  "type": "form",
+  "components": [
+    {
+      "id": "alpha",
+      "fieldId": "alpha",
+      "label": "Alpha",
+      "type": "text"      
+    },
+    {
+      "id": "bravo",
+      "fieldId": "bravo",
+      "label": "Bravo",
+      "type": "text",
+      "show_when": [
+        {
+          "type": "or",
+          "conditions": [
+            {
+              "op": "=",
+              "field": "gamma",
+              "value": "NOT-gamma-value"
+            },
+            {
+              "op": "=",
+              "field": "epsilon",
+              "value": "NOT-epsilon-value"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "personKnown",
+      "fieldId": "personKnown",
+      "type": "radios",
+      "data": {
+        "options": [
+          {
+            "value": "yes",
+            "label": "Yes",
+            "nested": [
+              {
+                "id": "telephone",
+                "fieldId": "telephone",
+                "type": "text",
+                "label": "Telephone",
+                "required": true  
+              },
+              {
+                "id": "address",
+                "fieldId": "address",
+                "type": "text",
+                "label": "Address",
+                "required": true  
+              }
+            ],
+            "show_when": {
+              "op": "=",
+              "field": "bravo",
+              "value": "bravo-value"
+            }
+          },
+          {
+            "value": "no",
+            "label": "No"
+          }
+        ]
+      }
+    },
+    {
+      "id": "gamma",
+      "fieldId": "gamma",
+      "label": "Gamma",
+      "type": "text"
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "visiblePage",
+      "name": "visiblePage",
+      "title": "Visible Page",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo"
+        },
+        {
+          "use": "personKnown"
+        },
+        {
+          "use": "gamma"
+        },
+        {
+          "use": "epsilon"
+        }
+      ]
+    }
+  ]
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-chained-component-show-whens-dependent-component-nested.json

@@ -0,0 +1,105 @@
+{
+  "id": "example-form",
+  "version": "0.0.1",
+  "name": "example-form",
+  "title": "Example form",
+  "type": "form",
+  "components": [
+    {
+      "id": "alpha",
+      "fieldId": "alpha",
+      "label": "Alpha",
+      "type": "text"      
+    },
+    {
+      "id": "bravo",
+      "fieldId": "bravo",
+      "label": "Bravo",
+      "type": "text",
+      "show_when": [
+        {
+          "type": "or",
+          "conditions": [
+            {
+              "op": "=",
+              "field": "gamma",
+              "value": "NOT-gamma-value"
+            },
+            {
+              "op": "=",
+              "field": "epsilon",
+              "value": "NOT-epsilon-value"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "personKnown",
+      "fieldId": "personKnown",
+      "type": "radios",
+      "data": {
+        "options": [
+          {
+            "value": "yes",
+            "label": "Yes",
+            "nested": [
+              {
+                "id": "telephone",
+                "fieldId": "telephone",
+                "type": "text",
+                "label": "Telephone",
+                "required": true,
+                "show_when": {
+                  "op": "=",
+                  "field": "bravo",
+                  "value": "bravo-value"
+                }
+              }
+            ]
+          },
+          {
+            "value": "no",
+            "label": "No"
+          }
+        ]
+      }
+    },
+    {
+      "id": "gamma",
+      "fieldId": "gamma",
+      "label": "Gamma",
+      "type": "text"
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "visiblePage",
+      "name": "visiblePage",
+      "title": "Visible Page",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo"
+        },
+        {
+          "use": "personKnown"
+        },
+        {
+          "use": "gamma"
+        },
+        {
+          "use": "epsilon"
+        }
+      ]
+    }
+  ]
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-chained-component-show-whens-refdata.json

@@ -0,0 +1,105 @@
+{
+  "id": "example-form",
+  "version": "0.0.1",
+  "name": "example-form",
+  "title": "Example form",
+  "type": "form",
+  "components": [
+    {
+      "id": "alpha",
+      "fieldId": "alpha",
+      "label": "Alpha",
+      "type": "text",
+      "show_when": {
+        "op": "=",
+        "field": "bravo.id",
+        "value": "bravo-value.id"
+      }
+    },
+    {
+      "id": "bravo",
+      "fieldId": "bravo",
+      "label": "Bravo",
+      "type": "text",
+      "show_when": [
+        {
+          "type": "or",
+          "conditions": [
+            {
+              "op": "=",
+              "field": "gamma",
+              "value": "NOT-gamma-value"
+            },
+            {
+              "op": "=",
+              "field": "epsilon",
+              "value": "NOT-epsilon-value"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "personKnown",
+      "fieldId": "personKnown",
+      "type": "radios",
+      "data": {
+        "options": [
+          {
+            "value": "yes",
+            "label": "Yes",
+            "nested": [
+              {
+                "id": "telephone",
+                "fieldId": "telephone",
+                "type": "text",
+                "label": "Telephone",
+                "required": true
+              }
+            ]
+          },
+          {
+            "value": "no",
+            "label": "No"
+          }
+        ]
+      }
+    },
+    {
+      "id": "gamma",
+      "fieldId": "gamma",
+      "label": "Gamma",
+      "type": "text"
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "visiblePage",
+      "name": "visiblePage",
+      "title": "Visible Page",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo"
+        },
+        {
+          "use": "personKnown"
+        },
+        {
+          "use": "gamma"
+        },
+        {
+          "use": "epsilon"
+        }
+      ]
+    }
+  ]
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-chained-component-show-whens-target-component-nested.json

@@ -0,0 +1,98 @@
+{
+  "id": "example-form",
+  "version": "0.0.1",
+  "name": "example-form",
+  "title": "Example form",
+  "type": "form",
+  "components": [
+    {
+      "id": "alpha",
+      "fieldId": "alpha",
+      "label": "Alpha",
+      "type": "text"
+    },
+    {
+      "id": "bravo",
+      "fieldId": "bravo",
+      "label": "Bravo",
+      "type": "text",
+      "show_when": {
+        "op": "=",
+        "field": "telephone",
+        "value": "telephone-value"
+      }
+    },
+    {
+      "id": "personKnown",
+      "fieldId": "personKnown",
+      "type": "radios",
+      "data": {
+        "options": [
+          {
+            "value": "yes",
+            "label": "Yes",
+            "nested": [
+              {
+                "id": "telephone",
+                "fieldId": "telephone",
+                "type": "text",
+                "label": "Telephone",
+                "required": true,
+                "show_when": {
+                  "op": "=",
+                  "field": "epsilon",
+                  "value": "NOT-epsilon-value"
+                }
+              }
+            ]
+          },
+          {
+            "value": "no",
+            "label": "No"
+          }
+        ]
+      }
+    },
+    {
+      "id": "gamma",
+      "fieldId": "gamma",
+      "label": "Gamma",
+      "type": "text",
+      "show_when": {
+        "op": "=",
+        "field": "bravo",
+        "value": "bravo-value"
+      }
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "visiblePage",
+      "name": "visiblePage",
+      "title": "Visible Page",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo"
+        },
+        {
+          "use": "personKnown"
+        },
+        {
+          "use": "gamma"
+        },
+        {
+          "use": "epsilon"
+        }
+      ]
+    }
+  ]
+}