@ukhomeoffice/cop-react-form-renderer 5.0.0 → 5.1.0-alpha

package/dist/components/FormComponent/FormComponent.js

@@ -111,7 +111,12 @@ var FormComponent = function FormComponent(_ref) {
       if (component.type === _models.ComponentTypes.FILE) {
         changeMetaDocuments([target.value]);
       } else if (component.type === _models.ComponentTypes.MULTI_FILE) {
-        changeMetaDocuments(target.value);
+        var docsWithIndices = target.value.map(function (doc, index) {
+          return _objectSpread(_objectSpread({}, doc), {}, {
+            indexInField: index
+          });
+        });
+        changeMetaDocuments(docsWithIndices);
       }
     }
   };

package/dist/components/FormRenderer/onTaskAction.js

@@ -22,7 +22,7 @@ var onTaskAction = function onTaskAction(currentTask, pages, setCurrentTask, hub
     });
     setCurrentTask(currentTask);
     var state = _objectSpread({}, task);
-    if (task.state === _models.TaskStates.TYPES.COMPLETE) {
+    if (task.state === _models.TaskStates.TYPES.COMPLETE && !task.alwaysShowFirstPage) {
       if (hubDetails !== null && hubDetails !== void 0 && hubDetails.noTaskCYAs) {
         // If the task is complete and there are no CYA's then show user first page
         /* eslint-disable prefer-destructuring */
@@ -33,12 +33,12 @@ var onTaskAction = function onTaskAction(currentTask, pages, setCurrentTask, hub
       } else {
         onPageChange(_models.FormPages.CYA, state);
       }
-    } else if (task.state === _models.TaskStates.TYPES.IN_PROGRESS) {
+    } else if (task.state === _models.TaskStates.TYPES.IN_PROGRESS && !task.alwaysShowFirstPage) {
       var _currentPage = data.formStatus.tasks[currentTask.name].currentPage;
       /* eslint-enable prefer-destructuring */
       onPageChange(_currentPage || currentTask.pages[0], state);
     } else if (task.firstPage) {
-      onPageChange(currentTask.firstPage, state);
+      onPageChange(task.firstPage, state);
     } else {
       onPageChange(task.pages[0], state);
     }

package/dist/components/FormRenderer/onTaskAction.test.js

@@ -168,6 +168,40 @@ describe('components.FormRenderer.onTaskAction', function () {
       expect(onPageChangeArgs[0].page).toEqual(CUSTOM_ARGS.currentTask.pages[0]);
       expect(onPageChangeArgs[0].state).toEqual(CUSTOM_ARGS.currentTask);
     });
+    it('should navigate to firstPage if alwaysShowFirstPage is set if state is in progress', function () {
+      var TASK = {
+        name: 'taskalwaysShowFirstPageInProgress',
+        state: _models.TaskStates.TYPES.IN_PROGRESS,
+        firstPage: 'page2',
+        alwaysShowFirstPage: true,
+        pages: ['page1', 'page2', 'page3']
+      };
+      var CUSTOM_ARGS = _objectSpread(_objectSpread({}, ARGS), {}, {
+        currentTask: TASK
+      });
+      _onTaskAction.default.apply(void 0, Object.values(CUSTOM_ARGS));
+      genericChecks(CUSTOM_ARGS.currentTask);
+      expect(onPageChangeArgs.length).toEqual(1);
+      expect(onPageChangeArgs[0].page).toEqual(CUSTOM_ARGS.currentTask.pages[1]);
+      expect(onPageChangeArgs[0].state).toEqual(CUSTOM_ARGS.currentTask);
+    });
+    it('should navigate to firstPage if alwaysShowFirstPage is set if state is in progress', function () {
+      var TASK = {
+        name: 'taskalwaysShowFirstPageComplete',
+        state: _models.TaskStates.TYPES.COMPLETE,
+        firstPage: 'page2',
+        alwaysShowFirstPage: true,
+        pages: ['page1', 'page2', 'page3']
+      };
+      var CUSTOM_ARGS = _objectSpread(_objectSpread({}, ARGS), {}, {
+        currentTask: TASK
+      });
+      _onTaskAction.default.apply(void 0, Object.values(CUSTOM_ARGS));
+      genericChecks(CUSTOM_ARGS.currentTask);
+      expect(onPageChangeArgs.length).toEqual(1);
+      expect(onPageChangeArgs[0].page).toEqual(CUSTOM_ARGS.currentTask.pages[1]);
+      expect(onPageChangeArgs[0].state).toEqual(CUSTOM_ARGS.currentTask);
+    });
   });
   var otherStates = Object.values(_models.TaskStates.TYPES).filter(function (t) {
     return t !== _models.TaskStates.TYPES.IN_PROGRESS && t !== _models.TaskStates.TYPES.COMPLETE;

package/dist/components/TaskList/TaskList.js

@@ -136,7 +136,9 @@ TaskList.propTypes = {
       name: _propTypes.default.string.isRequired,
       pages: _propTypes.default.arrayOf(_propTypes.default.string).isRequired,
       state: _propTypes.default.string,
-      displayName: _propTypes.default.string
+      displayName: _propTypes.default.string,
+      firstPage: _propTypes.default.string,
+      alwaysShowFirstPage: _propTypes.default.bool
     })).isRequired
   })).isRequired
 };
@@ -148,10 +150,10 @@ TaskList.defaultProps = {
   formData: {},
   id: '',
   incompleteTitle: DEFAULT_INCOMPLETE_TITLE,
-  onTaskAction: undefined,
   notes: {},
-  refTitle: undefined,
-  refNumber: undefined
+  onTaskAction: undefined,
+  refNumber: undefined,
+  refTitle: undefined
 };
 var _default = TaskList;
 exports.default = _default;

package/dist/utils/Component/getComponentTests/getComponent.radios.test.js

@@ -97,6 +97,92 @@ describe('utils.Component.get', function () {
     expect(ON_CHANGE_CALLS.length).toEqual(2); // No change, so no new event should have fired.
   });
 
+  it('should work correctly with the returnFullData property on the radios component', function () {
+    var ID = 'test-id';
+    var FIELD_ID = 'field-id';
+    var LABEL = 'label';
+    var OPTIONS = [{
+      value: 'a',
+      label: 'Alpha'
+    }, {
+      value: 'b',
+      label: 'Bravo'
+    }];
+    var ON_CHANGE_CALLS = [];
+    var ON_CHANGE = function ON_CHANGE(e) {
+      ON_CHANGE_CALLS.push(e.target);
+    };
+    var COMPONENT = {
+      type: _models.ComponentTypes.RADIOS,
+      id: ID,
+      fieldId: FIELD_ID,
+      label: LABEL,
+      data: {
+        options: OPTIONS
+      },
+      returnFullData: true,
+      onChange: ON_CHANGE,
+      'data-testid': ID
+    };
+    var _render2 = (0, _react.render)((0, _getComponent.default)(COMPONENT)),
+      container = _render2.container;
+    var _getAllByTestId3 = (0, _react.getAllByTestId)(container, ID),
+      _getAllByTestId4 = _slicedToArray(_getAllByTestId3, 2),
+      formGroup = _getAllByTestId4[0],
+      radios = _getAllByTestId4[1];
+    expect(formGroup.tagName).toEqual('DIV');
+    expect(formGroup.classList).toContain('govuk-form-group');
+    var label;
+    formGroup.childNodes.forEach(function (node) {
+      // Check if it's an element.
+      if (node instanceof Element) {
+        if (node.tagName === 'LABEL') {
+          label = node;
+        }
+      }
+    });
+    expect(label).toBeDefined();
+    expect(label.innerHTML).toContain(LABEL);
+    expect(label.getAttribute('for')).toEqual(ID);
+    expect(radios.tagName).toEqual('DIV');
+    expect(radios.classList).toContain('govuk-radios');
+    expect(radios.childNodes.length).toEqual(OPTIONS.length);
+    var radioItems = [];
+    OPTIONS.forEach(function (_, index) {
+      var radio = radios.childNodes[index];
+      expect(radio instanceof Element).toBeTruthy();
+      if (radio instanceof Element) {
+        radioItems.push(radio);
+      }
+    });
+    expect(radioItems.length).toEqual(OPTIONS.length);
+    OPTIONS.forEach(function (option, index) {
+      var radio = radioItems[index];
+      expect(radio.tagName).toEqual('DIV');
+      expect(radio.classList).toContain('govuk-radios__item');
+      var _radio$childNodes2 = _slicedToArray(radio.childNodes, 2),
+        input = _radio$childNodes2[0],
+        inputLabel = _radio$childNodes2[1];
+      expect(input.tagName).toEqual('INPUT');
+      expect(input.type).toEqual('radio');
+      expect(inputLabel.textContent).toEqual(option.label);
+    });
+    _react.fireEvent.click(radioItems[0].childNodes[0]); // alpha
+    expect(ON_CHANGE_CALLS.length).toEqual(1);
+    expect(ON_CHANGE_CALLS[0]).toMatchObject({
+      name: FIELD_ID,
+      value: OPTIONS[0]
+    });
+    _react.fireEvent.click(radioItems[1].childNodes[0]); // bravo
+    expect(ON_CHANGE_CALLS.length).toEqual(2);
+    expect(ON_CHANGE_CALLS[1]).toMatchObject({
+      name: FIELD_ID,
+      value: OPTIONS[1]
+    });
+    _react.fireEvent.click(radioItems[1].childNodes[0]); // bravo (already selected, above)
+    expect(ON_CHANGE_CALLS.length).toEqual(2); // No change, so no new event should have fired.
+  });
+
   it('should return an appropriately rendered radios component with nested components', function () {
     var ID = 'test-id';
     var FIELD_ID = 'field-id';
@@ -132,10 +218,10 @@ describe('utils.Component.get', function () {
     };
     var _renderWithValidation = (0, _setupTests.renderWithValidation)((0, _getComponent.default)(COMPONENT)),
       container = _renderWithValidation.container;
-    var _getAllByTestId3 = (0, _react.getAllByTestId)(container, ID),
-      _getAllByTestId4 = _slicedToArray(_getAllByTestId3, 2),
-      formGroup = _getAllByTestId4[0],
-      radios = _getAllByTestId4[1];
+    var _getAllByTestId5 = (0, _react.getAllByTestId)(container, ID),
+      _getAllByTestId6 = _slicedToArray(_getAllByTestId5, 2),
+      formGroup = _getAllByTestId6[0],
+      radios = _getAllByTestId6[1];
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
     expect(radios.tagName).toEqual('DIV');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "5.0.0",
+  "version": "5.1.0-alpha",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "^3.0.0",
+    "@ukhomeoffice/cop-react-components": "3.1.0-alpha",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",