@ukhomeoffice/cop-react-form-renderer 6.16.1-alpha → 6.16.2-alpha

package/dist/components/FormRenderer/onPageAction.js

@@ -61,6 +61,22 @@ const onPageAction = (action, patch, patchLabel, hooks, data, formState, validat
       setSubmitting(false);
     } else {
       let pageUpdate = next => onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, next));
+      let collectionName;
+      let addAnotherName;
+      if (action.collection) {
+        collectionName = action.collection;
+        const collectionNameCapitalised = collectionName.charAt(0).toUpperCase() + collectionName.slice(1);
+        addAnotherName = "addAnother".concat(collectionNameCapitalised).slice(0, -1);
+      }
+      let collectionArray;
+      let index;
+      if (collectionName) {
+        collectionArray = form.page.formData[collectionName];
+        if (collectionArray && collectionArray.length > 0 && form.page.formData["".concat(collectionName, "ActiveId")]) {
+          index = collectionArray.findIndex(obj => obj.id === form.page.formData["".concat(collectionName, "ActiveId")]);
+        }
+      }
+
       /* eslint-disable no-case-declarations */
       switch (action.type) {
         case _models.PageAction.TYPES.SUBMIT:
@@ -68,10 +84,37 @@ const onPageAction = (action, patch, patchLabel, hooks, data, formState, validat
           break;
         case _models.PageAction.TYPES.SAVE_AND_NAVIGATE:
           const state = _objectSpread({}, currentTask);
+          // If resetActiveId is true then point active ID to first entry in collection
+          if (collectionArray && collectionArray.length > 0 && action.resetActiveId) {
+            form.page.formData["".concat(collectionName, "ActiveId")] = collectionArray[0].id;
+          }
+          // If resetActiveId is false
+          if (collectionArray && collectionArray.length > 0 && !action.resetActiveId) {
+            // Truncate collection if user has selected no to more entries
+            if (index !== undefined && action.truncateCollection && form.page.formData[addAnotherName] === 'No') {
+              form.page.formData[collectionName] = collectionArray.filter((_data, idx) => idx <= index);
+            }
+            // Set addAnother field to yes if not reached last entry in collection
+            if (index !== undefined && index + 1 < collectionArray.length) {
+              form.page.formData[addAnotherName] = 'Yes';
+            }
+            // Set addAnother field to no if reached last entry
+            if (index !== undefined && index + 1 === collectionArray.length && form.page.formData[addAnotherName]) {
+              form.page.formData[addAnotherName] = 'No';
+            }
+          }
           pageUpdate = () => _handlers.default.navigate(action, pageId, onPageChange, state);
           break;
         case _models.PageAction.TYPES.COLLECTION_ADD:
-          _utils.default.CollectionPage.addEntry(action.collection, form.page.formData);
+          // Only add item if the index is undefined,
+          // the array is empty
+          // or the active ID is the last one in the collection,
+          // otherwise move to next item.
+          if (index === undefined || collectionArray.length === 0 || index + 1 === form.page.formData[collectionName].length) {
+            _utils.default.CollectionPage.addEntry(action.collection, form.page.formData);
+          } else {
+            form.page.formData["".concat(action.collection, "ActiveId")] = collectionArray[index + 1].id;
+          }
 
           // We need to delete the collection entry fields from formData as it will be holding previous values.
           if (form.page.formData["".concat(action.collection)] && form.page.formData["".concat(action.collection)].length > 0) {
@@ -105,16 +148,13 @@ const onPageAction = (action, patch, patchLabel, hooks, data, formState, validat
             removedEntryFieldsToDelete.forEach(i => delete form.page.formData[i]);
           }
 
-          // 3. Retrieve the collection array from formData.
-          const collectionArray = form.page.formData[action.collection];
-
-          // 4. Assign the fields in the last collection entry to formData.
+          // 3. Assign the fields in the last collection entry to formData.
           Object.assign(form.page.formData, collectionArray[collectionArray.length - 1]);
 
-          // 5. Assign the formData ID back to the formData.
+          // 4. Assign the formData ID back to the formData.
           form.page.formData.id = formDataId;
 
-          // 6. If the collection array has entries set the correct ActiveId 
+          // 5. If the collection array has entries set the correct ActiveId 
           // otherwise delete it as well as the collection array.
           if (collectionArray.length > 0) {
             form.page.formData["".concat(action.collection, "ActiveId")] = collectionArray[collectionArray.length - 1].id;

package/dist/utils/CollectionPage/removeCollectionPageEntry.js

@@ -28,6 +28,8 @@ const removeCollectionPageEntry = (collectionName, formData, id) => {
   }
   const deletedEntry = collectionData[indexToDelete];
   collectionData.splice(indexToDelete, 1);
+  const data = formData;
+  data["".concat(collectionName, "ActiveId")] = collectionData.length > 0 ? collectionData[0].id : null;
   return deletedEntry;
 };
 var _default = exports.default = removeCollectionPageEntry;

package/package.json

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