@ukhomeoffice/cop-react-form-renderer 5.0.0 → 5.0.1

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",