@ukhomeoffice/cop-react-form-renderer 6.15.8-alpha → 6.15.11-alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/dist/components/CollectionSummary/BannerStrip.scss +4 -0
  2. package/dist/components/FormPage/FormPage.js +8 -10
  3. package/dist/components/FormRenderer/FormRenderer.js +5 -10
  4. package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-page-same-component-reused-one-shown.json +74 -0
  5. package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/input/data-page-same-component-reused-one-shown.json +8 -0
  6. package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/output/data-page-same-component-reused-one-shown-removed.json +7 -0
  7. package/dist/components/FormRenderer/helpers/clearOutUncompletedRoutes.js +239 -174
  8. package/dist/components/FormRenderer/helpers/clearOutUncompletedRoutes.test.js +11 -7
  9. package/dist/components/FormRenderer/helpers/clearOutUncompletedRoutesUtils.js +126 -35
  10. package/dist/components/FormRenderer/helpers/clearOutUncompletedRoutesUtils.test.js +64 -7
  11. package/dist/components/FormRenderer/onCYAAction.js +0 -2
  12. package/dist/components/FormRenderer/onCYAAction.test.js +5 -0
  13. package/dist/components/FormRenderer/onPageAction.js +0 -1
  14. package/dist/hooks/useGetRequest.js +15 -15
  15. package/dist/hooks/useRefData.js +3 -2
  16. package/dist/utils/Component/getDefaultValueFromConfig.js +2 -1
  17. package/dist/utils/Condition/meetsCondition.js +26 -12
  18. package/dist/utils/Condition/meetsCondition.test.js +21 -0
  19. package/dist/utils/Data/getAutocompleteSource.js +68 -51
  20. package/dist/utils/Data/getAutocompleteSource.test.js +31 -18
  21. package/dist/utils/Operate/doesContainValue.js +34 -0
  22. package/dist/utils/Operate/doesContainValue.test.js +75 -0
  23. package/dist/utils/Operate/runPageOperations.js +2 -0
  24. package/dist/utils/Validate/validateOnPageLoad.js +23 -0
  25. package/dist/utils/Validate/validateOnPageLoad.test.js +88 -0
  26. package/package.json +2 -2
@@ -15,202 +15,197 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
15
15
  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; }
16
16
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
17
17
  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); } /* eslint-disable no-param-reassign */
18
- const addValue = (key, value, multiMap) => {
19
- if (!multiMap.has(key)) {
20
- multiMap.set(key, []);
21
- }
22
- multiMap.get(key).push(value);
23
- };
24
- const pruneSingleComponent = (formData, path, component, componentsToKeep) => {
25
- // If there is more than one entry for this component, then it is being used elsewhere in a visible page. Don't prune, but reduce the count by 1
26
- if (componentsToKeep[path] > 1) {
27
- componentsToKeep[path] -= 1;
28
- } else {
18
+ /**
19
+ *
20
+ * This function recursively reads in the non-collection pages and components and builds lists from it:
21
+ *
22
+ * 1: allComponents. This is a map of all components in the form, keyed by the fully qualified component path.
23
+ * If the component belongs to a page (or other parent entity) that has its own show_when rule, then this rule
24
+ * is combined with the show_when rule of the component, so the decision as to whether the component's data should
25
+ * exist can be made just by processing the component.
26
+ * The main purpose of this map is to allow us to build a dependency graph in the function createComponentDependenciesGraph
27
+ *
28
+ * 2: componentsToKeep: This is an object containing a count of how many times each component is defined. This is to support the
29
+ * fact that a component can be used more than once in a form (but with mutually exclusive show_when rules so only used
30
+ * once with the same path).
31
+ *
32
+ * @param {Array} condensedPages All pages in the form, with the collection pages collated into a single object per collection
33
+ * @param {Map} allCollections A map of collection objects, which are a grouping of the pages that make up a single collection
34
+ * @param {Object} formData The form payload
35
+ * @param {Map} componentByIdMap Map of all components, to enable performant lookup by id
36
+ * @param {Map} componentByFieldIdMap Map of all components, to enable performant lookup by fieldId
37
+ * @param {Map} allComponents All components in form (including nested), keyed by path
38
+ * @param {Object} componentsToKeep A count of how many times each component is used, to prevent us deleting components defined > 1 times
39
+ * @return allComponents and componentsToKeep updated in place
40
+ */
41
+ const createComponentMapsFromForm = (condensedPages, allCollections, componentByIdMap, componentByFieldIdMap, allComponents, componentsToKeep, formData) => {
42
+ /*
43
+ * Inner function to support the recursion required to traverse through the nested structures of the form
44
+ */
45
+ const recursivelyMapFieldsAndDeleteHiddenNested = (page, component, path) => {
29
46
  var _component$data;
30
- Utils.deleteNodeByPath(formData, path);
31
- // If the component has options, go through each option removing the data for any nested fields. Required as nested options are in the payload at the same heirarchical level.
32
- if (component !== null && component !== void 0 && (_component$data = component.data) !== null && _component$data !== void 0 && _component$data.options) {
33
- var _component$data2;
34
- component === null || component === void 0 || (_component$data2 = component.data) === null || _component$data2 === void 0 || (_component$data2 = _component$data2.options) === null || _component$data2 === void 0 || _component$data2.forEach(option => {
35
- var _option$nested;
36
- (_option$nested = option.nested) === null || _option$nested === void 0 || _option$nested.forEach(nested => {
37
- Utils.deleteNodeByPath(formData, Utils.getNestedQuestionPath(path, nested.fieldId));
38
- });
39
- });
40
- }
41
- }
42
- };
43
- const toArray = value => Array.isArray(value) ? value : [value];
44
- const recursivelyMapFieldsAndDeleteHiddenNested = (page, component, path, allComponents, componentsToKeep, formData) => {
45
- var _component$data3;
46
- // Many component, such as warnings, html and details do not have data so we can ignore them
47
- if (!component.fieldId) return;
48
- path = path ? "".concat(path, ".").concat(component.fieldId) : component.fieldId;
49
-
50
- // Components can be referenced from more than one page. We need to keep track of the count of each component path, to avoid pruning paths that exist elsewhere
51
- componentsToKeep[path] = (componentsToKeep[path] || 0) + 1;
52
-
53
- // add the fully qualified path to the component, which will be required when resolving the dependencies later
54
- component.path = path;
55
-
56
- // If the parent page has a rule, combine it with any component rule
57
- if (page.show_when) {
58
- component.show_when = component.show_when ? [].concat(toArray(page.show_when), toArray(component.show_when)) : page.show_when;
59
- }
47
+ if (!component.fieldId) return; // Many component, such as warnings, html and details do not have data so we can ignore them
48
+ path = path ? "".concat(path, ".").concat(component.fieldId) : component.fieldId; // Build up the path to reflect nested components
49
+ componentsToKeep[path] = (componentsToKeep[path] || 0) + 1; // We need to keep track of the count of each component path, to avoid pruning paths that exist elsewhere
50
+ component.path = path; // Add the fully qualified path to the component, which will be required when resolving the dependencies later
60
51
 
61
- // this is the master repository of all components. Can be more than one component per path, so keep a map of <path, array>
62
- addValue(path, component, allComponents);
63
- if (component.components) {
64
- component.components.forEach(c => {
65
- recursivelyMapFieldsAndDeleteHiddenNested(page, c, path, allComponents, componentsToKeep, formData);
66
- });
67
- } else if (component !== null && component !== void 0 && (_component$data3 = component.data) !== null && _component$data3 !== void 0 && _component$data3.options) {
68
- var _component$data4;
69
- /**
70
- * Perform processing for any options, and any options containing nested questions.
71
- * - set hidden nested questions when the parent option is not selected
72
- * - any nested questions must be treated as components which can be shown/hidden
73
- */
74
- component === null || component === void 0 || (_component$data4 = component.data) === null || _component$data4 === void 0 || (_component$data4 = _component$data4.options) === null || _component$data4 === void 0 || _component$data4.forEach(option => {
75
- if (option.nested) {
76
- if (!(0, _optionIsSelected.default)(formData[component.id], option)) {
77
- option.nested.forEach(nestedComponent => {
78
- // It is safe to delete this now, as we know this data item can not be required as the associated option is not selected
79
- Utils.deleteNodeByPath(formData, Utils.getNestedQuestionPath(path, nestedComponent.fieldId));
80
- });
81
- } else {
82
- // If the option is selected, then add any nested components to the allComponents list. If the nested block has a show_when, pass it down to the child questions
83
- const blockShowWhen = option.show_when;
84
- option.nested.forEach(nestedComponent => {
85
- if (blockShowWhen) nestedComponent.show_when = blockShowWhen;
86
- recursivelyMapFieldsAndDeleteHiddenNested(page, nestedComponent, Utils.getImmediateParent(path), allComponents, componentsToKeep, formData);
87
- });
88
- }
89
- }
90
- });
91
- }
92
- };
93
- const recursivelyMapDependencies = (component, allDependencyRelationships) => {
94
- // Non data components can be ignored - can we remove this when doing the allcomponents thing?
95
- if (!component.fieldId) return;
96
- const componentDependencies = Utils.getDependencies(component);
97
- if (componentDependencies) {
98
- // This path may already exist (if a component is defined twice in the form) so build up the dependencies
99
- if (allDependencyRelationships.has(component.path)) {
100
- const existingSet = allDependencyRelationships.get(component.path);
101
- componentDependencies.forEach(dep => existingSet.add(dep));
102
- } else {
103
- allDependencyRelationships.set(component.path, new Set(componentDependencies));
52
+ // If the parent page has a rule, combine it with any component rule as we will be resolving dependencies for components only
53
+ if (page.show_when) {
54
+ component.show_when = component.show_when ? [].concat(Utils.toArray(page.show_when), Utils.toArray(component.show_when)) : page.show_when;
104
55
  }
105
- }
106
- if (component.components) {
107
- component.components.forEach(c => {
108
- recursivelyMapDependencies(c, allDependencyRelationships);
109
- });
110
- }
111
- };
112
- const recursivelyResolveDependencies = (visited, dependentEntity, dependencyRelationships, form, formData, allComponents, componentsToKeep, allCollections) => {
113
- if (visited.has(dependentEntity)) return;
114
- visited.add(dependentEntity);
115
- const neighbours = dependencyRelationships.get(dependentEntity.path);
116
- neighbours === null || neighbours === void 0 || neighbours.forEach(neighbourPath => {
117
- const neighbourArray = Utils.getDependencyObjectFromPath(neighbourPath, allComponents);
118
- if (neighbourArray) {
119
- neighbourArray.forEach(neighbour => {
120
- if (!visited.has(neighbour)) {
121
- recursivelyResolveDependencies(visited, neighbour, dependencyRelationships, form, formData, allComponents, componentsToKeep, allCollections);
122
- }
56
+ Utils.addValue(path, component, allComponents); // There can be more than one component per path, so keep a map of <path, array>
57
+ // recurse if there is nesting
58
+ if (component.components) {
59
+ component.components.forEach(c => {
60
+ recursivelyMapFieldsAndDeleteHiddenNested(page, c, path, allComponents, componentsToKeep, formData);
123
61
  });
124
- } else {
125
- // Refactor out helper methods
126
- const arrayNamePattern = /([a-zA-Z_$][\w$]*)\[\d+\]/;
127
- const match = neighbourPath.match(arrayNamePattern);
128
- if (match) {
129
- const collectionName = match[1];
130
- const collection = allCollections.get(collectionName);
131
- if (collection) {
132
- var _collection$childPage;
133
- (_collection$childPage = collection.childPages) === null || _collection$childPage === void 0 || _collection$childPage.forEach(childPage => {
134
- if (childPage.show_when) {
135
- const message = "It is not possible to reliably clean hidden data when a component is dependent on a \n collection's data, and that collection is itself dependent on data elsewhere in the form.\n The dependency path is ".concat(neighbourPath, ", and the chained show_when is ").concat(JSON.stringify(childPage.show_when), ".\n The form will need to be changed to break this chained dependency");
136
- throw new Error(message);
137
- }
138
- ;
139
- });
62
+ } else if (component !== null && component !== void 0 && (_component$data = component.data) !== null && _component$data !== void 0 && _component$data.options) {
63
+ var _component$data2;
64
+ component === null || component === void 0 || (_component$data2 = component.data) === null || _component$data2 === void 0 || (_component$data2 = _component$data2.options) === null || _component$data2 === void 0 || _component$data2.forEach(option => {
65
+ if (option.nested) {
66
+ if (!(0, _optionIsSelected.default)(formData[component.id], option)) {
67
+ option.nested.forEach(nestedComponent => {
68
+ // delete hidden nested question payload items when the parent option is not selected
69
+ Utils.deleteNodeByPath(formData, Utils.getNestedQuestionPath(path, nestedComponent.fieldId));
70
+ });
71
+ } else {
72
+ // If the option is selected, then add any nested components to the allComponents list. If the nested block has a show_when, pass it down to the child questions
73
+ const blockShowWhen = option.show_when;
74
+ option.nested.forEach(nestedComponent => {
75
+ if (blockShowWhen) nestedComponent.show_when = blockShowWhen;
76
+ recursivelyMapFieldsAndDeleteHiddenNested(page, nestedComponent, Utils.getImmediateParent(path), allComponents, componentsToKeep, formData);
77
+ });
78
+ }
140
79
  }
141
- }
142
- }
143
- });
144
- // Whilst unravelling the recursion, we can start pruning from the leaf upwards
145
- if (!Utils.isShowEntity(dependentEntity, formData)) {
146
- pruneSingleComponent(formData, dependentEntity.path, dependentEntity, componentsToKeep);
147
- }
148
- };
149
- const pruneCollectionEntry = (pathsToKeep, componentsToPrune, collectionDataObject, formData) => {
150
- componentsToPrune.forEach(component => {
151
- if (!pathsToKeep.has(component.fieldId)) {
152
- var _component$data5;
153
- if (component.type === "multifile") {
154
- Utils.deleteCorrespondingMetaInfo(component, collectionDataObject, formData);
155
- }
156
- Utils.deleteNodeByPath(collectionDataObject, component.fieldId);
157
-
158
- // REFACTOR
159
- // If the component has options, go through each option removing the data for any nested fields. Required as nested options are in the payload at the same heirarchical level.
160
- if (component !== null && component !== void 0 && (_component$data5 = component.data) !== null && _component$data5 !== void 0 && _component$data5.options) {
161
- var _component$data6;
162
- component === null || component === void 0 || (_component$data6 = component.data) === null || _component$data6 === void 0 || (_component$data6 = _component$data6.options) === null || _component$data6 === void 0 || _component$data6.forEach(option => {
163
- var _option$nested2;
164
- (_option$nested2 = option.nested) === null || _option$nested2 === void 0 || _option$nested2.forEach(nested => {
165
- Utils.deleteNodeByPath(collectionDataObject, Utils.getNestedQuestionPath(component.fieldId, nested.fieldId));
166
- });
167
- });
168
- }
80
+ });
169
81
  }
170
- });
171
- };
172
- const clearOutUncompletedRoutes = (form, formData) => {
173
- // Load components into maps keyed on id and field for subsequent efficient access
174
- const componentByIdMap = new Map(form.components.map(c => [c.id, c]));
175
- const componentByFieldIdMap = new Map(form.components.map(c => [c.fieldId, c]));
176
-
177
- // Recurse through the whole form, building a map of all fields and their owning component id.
178
- // This is required to build the component->dependency graph in the next step, as the dependencies reference fields, not components.
179
-
180
- const condensedPages = (0, _mergeCollectionPages.default)(form.pages);
181
- const allComponents = new Map();
182
- const componentsToKeep = {};
183
- const allCollections = new Map();
82
+ };
83
+ // Entry point for the recursive traverse of the form specification.
184
84
  condensedPages === null || condensedPages === void 0 || condensedPages.forEach(page => {
85
+ // Make the distinction between collections (which will be processed separately) and non-collections, which will be processed here.
185
86
  if (page.childPages) {
186
87
  allCollections.set(page.collection.name, page);
187
88
  } else {
188
89
  var _page$components;
189
90
  (_page$components = page.components) === null || _page$components === void 0 || _page$components.forEach(useComponentInPage => {
190
91
  const componentObj = Utils.findComponentDefinitionInForm(useComponentInPage, componentByIdMap, componentByFieldIdMap);
191
- recursivelyMapFieldsAndDeleteHiddenNested(page, componentObj, null, allComponents, componentsToKeep, formData);
92
+ recursivelyMapFieldsAndDeleteHiddenNested(page, componentObj, null);
192
93
  });
193
94
  }
194
95
  });
195
- const allDependencyRelationships = new Map();
96
+ };
97
+ /**
98
+ *
99
+ * This function iterates through the allComponents list. For each component, it will derive all payload paths
100
+ * that this component is dependent on. The same component might be defined more than once in the form, so add the dependencies
101
+ * for all the component definitions.
102
+ *
103
+ * @param {Map} allDependencyRelationships A map of each component with dependencies. The key is the fully qualified path and the value is a Set of all the paths that this component is dependent on.
104
+ * @param {Map} allComponents All components in form (including nested), keyed by path. Used to build the allDependencyRelationships
105
+ * @return allDependencyRelationships updated in place
106
+ */
107
+ const createComponentDependenciesGraph = (allComponents, allDependencyRelationships) => {
196
108
  allComponents === null || allComponents === void 0 || allComponents.forEach(componentArray => {
197
109
  componentArray === null || componentArray === void 0 || componentArray.forEach(component => {
198
- recursivelyMapDependencies(component, allDependencyRelationships);
110
+ if (!component.fieldId) return;
111
+ const componentDependencies = Utils.getDependencies(component);
112
+ if (componentDependencies) {
113
+ if (allDependencyRelationships.has(component.path)) {
114
+ const existingSet = allDependencyRelationships.get(component.path);
115
+ componentDependencies.forEach(dep => existingSet.add(dep));
116
+ } else {
117
+ allDependencyRelationships.set(component.path, new Set(componentDependencies));
118
+ }
119
+ }
199
120
  });
200
121
  });
122
+ };
201
123
 
202
- // Visit all components with 'show_whens' and resolve the dependency. Only delete the data at the leaf element, or when un-winding the recursion
203
- // to deal with the edge case that an element is dependent on a data item that is hidden by a different constraint
124
+ /**
125
+ *
126
+ * This function loops through each entry in the allDependencyRelationships map. Each entry will contain a Set of all
127
+ * paths that the key path is dependent on. Recursively delve into each dependency path and repeat the process until we
128
+ * have reached an entry that has no dependencies. At this point we can safely resolve the dependency using its show_when rule,
129
+ * and unwind the recursion.
130
+ *
131
+ * Because all the components are inter-connected, this could result in resolving the same entry repeatedly, so keep a 'visited'
132
+ * array to prevent this.
133
+ *
134
+ * @param {Object} formData The form payload
135
+ * @param {Map} allComponents All components in form (including nested), keyed by path
136
+ * @param {Object} componentsToKeep A count of how many times each component is used, to prevent us deleting components defined > 1 times
137
+ * @param {Map} allDependencyRelationships A map of each component with dependencies. The key is the fully qualified path and the value is a Set of all the paths that this component is dependent on.
138
+ * @param {Map} allCollections A map of collection objects, which are a grouping of the pages that make up a single collection
139
+ * @param {Object} form The form specification
140
+ */
141
+ const resolveComponentDependenciesGraph = (allDependencyRelationships, allComponents, componentsToKeep, allCollections, form, formData) => {
142
+ /*
143
+ * Inner function to support the recursion required to traverse through the nested nature of the allDependencyRelationships
144
+ */
145
+ const recursivelyResolveDependencies = (visited, dependentComponent, dependencyRelationships) => {
146
+ if (visited.has(dependentComponent)) return;
147
+ visited.add(dependentComponent);
148
+ const dependencies = dependencyRelationships.get(dependentComponent.path);
149
+ dependencies === null || dependencies === void 0 || dependencies.forEach(dependencyPath => {
150
+ const dependencyComponents = Utils.getDependencyObjectFromPath(dependencyPath, allComponents);
151
+ if (dependencyComponents) {
152
+ dependencyComponents.forEach(dependency => {
153
+ if (!visited.has(dependency)) {
154
+ recursivelyResolveDependencies(visited, dependency, dependencyRelationships);
155
+ }
156
+ });
157
+ } else {
158
+ // We are here if the dependency path was not found in the list of allComponents. This is valid and can happen when
159
+ // a component is dependent on a field that was generated by cop-ui, e.g. jobHolderStaffDetails.linemanagerEmail.
160
+ // However, there is an edge case (described in the message below) that we need to validate for.
161
+ const arrayNamePattern = /([a-zA-Z_$][\w$]*)\[\d+\]/;
162
+ const match = dependencyPath.match(arrayNamePattern);
163
+ if (match) {
164
+ const collectionName = match[1];
165
+ const collection = allCollections.get(collectionName);
166
+ if (collection) {
167
+ var _collection$childPage;
168
+ (_collection$childPage = collection.childPages) === null || _collection$childPage === void 0 || _collection$childPage.forEach(childPage => {
169
+ if (childPage.show_when) {
170
+ const message = "It is not possible to reliably clean hidden data when a component is dependent on a \n collection's data, and that collection is itself dependent on data elsewhere in the form.\n The dependency path is ".concat(dependencyPath, ", and the chained show_when is ").concat(JSON.stringify(childPage.show_when), ".\n The form will need to be changed to break this chained dependency");
171
+ throw new Error(message);
172
+ }
173
+ ;
174
+ });
175
+ }
176
+ }
177
+ }
178
+ });
179
+ // Whilst unravelling the recursion, we can start deleting from the leaf upwards
180
+ if (!Utils.isShowEntity(dependentComponent, formData)) {
181
+ Utils.deleteComponentData(formData, dependentComponent.path, dependentComponent, componentsToKeep);
182
+ }
183
+ };
204
184
  const visited = new Set();
205
- allDependencyRelationships === null || allDependencyRelationships === void 0 || allDependencyRelationships.forEach((neighbours, dependentEntityPath) => {
185
+ allDependencyRelationships === null || allDependencyRelationships === void 0 || allDependencyRelationships.forEach((dependencies, dependentComponentPath) => {
206
186
  // Each path that a component is dependent on may have > 1 possible dependent components, if a field is used twice
207
- const dependentEntities = allComponents.get(dependentEntityPath);
208
- dependentEntities === null || dependentEntities === void 0 || dependentEntities.forEach(dependentEntity => {
209
- if (!visited.has(dependentEntity)) {
210
- recursivelyResolveDependencies(visited, dependentEntity, allDependencyRelationships, form, formData, allComponents, componentsToKeep, allCollections);
187
+ const dependentComponents = allComponents.get(dependentComponentPath);
188
+ dependentComponents === null || dependentComponents === void 0 || dependentComponents.forEach(dependentComponent => {
189
+ if (!visited.has(dependentComponent)) {
190
+ recursivelyResolveDependencies(visited, dependentComponent, allDependencyRelationships, form, formData, allComponents, componentsToKeep, allCollections);
211
191
  }
212
192
  });
213
193
  });
194
+ };
195
+
196
+ /**
197
+ * For each collection, iterate through the payload array's objects, and apply the collections show_when
198
+ * rules for each payload object.
199
+ *
200
+ * Some of the rules may be dependent on payload items outside the collection. These will already have been cleansed
201
+ * so will be in a reliable state.
202
+ *
203
+ * @param {Map} allCollections A map of collection objects, which are a grouping of the pages that make up a single collection
204
+ * @param {Object} formData The form payload
205
+ * @param {Map} componentByIdMap Map of all components, to enable performant lookup by id
206
+ * @param {Map} componentByFieldIdMap Map of all components, to enable performant lookup by fieldId
207
+ */
208
+ const cleanseCollectionData = (allCollections, formData, componentByIdMap, componentByFieldIdMap) => {
214
209
  allCollections === null || allCollections === void 0 || allCollections.forEach((collection, collectionName) => {
215
210
  const collectionDataArray = formData[collectionName];
216
211
  collectionDataArray === null || collectionDataArray === void 0 || collectionDataArray.forEach(collectionDataEntry => {
@@ -225,23 +220,93 @@ const clearOutUncompletedRoutes = (form, formData) => {
225
220
  const showPage = Utils.isShowEntity(childPage, dataForEvaluation);
226
221
  (_childPage$components = childPage.components) === null || _childPage$components === void 0 || _childPage$components.forEach(useComponentInPage => {
227
222
  const componentObj = Utils.findComponentDefinitionInForm(useComponentInPage, componentByIdMap, componentByFieldIdMap);
228
-
229
223
  // Non-data components can be ignored (eg html)
230
224
  if (!componentObj.fieldId) return;
231
225
  const showComponentOnPage = Utils.isShowEntity(useComponentInPage, dataForEvaluation);
232
226
  if (showPage && showComponentOnPage && Utils.isShowEntity(componentObj, dataForEvaluation)) {
233
- // There may be 2 components with the same path (eg quantity in EAB2), so don't delete hidden components if they are required elsewhere
227
+ // There may be >1 components with the same path (eg quantity in EAB2), so don't delete hidden components if they are required elsewhere
234
228
  pathsToKeep.add(componentObj.fieldId);
235
229
  } else {
236
230
  componentsToPrune.set(componentObj.id, componentObj);
237
231
  }
238
232
  });
239
233
  });
240
- pruneCollectionEntry(pathsToKeep, componentsToPrune, collectionDataEntry, formData);
234
+ Utils.pruneCollectionEntry(pathsToKeep, componentsToPrune, collectionDataEntry, formData);
241
235
  });
242
236
  //
243
- if (collectionDataArray) Utils.removeObjectWithSingleIdFieldInPlace(collectionDataArray);
237
+ if (collectionDataArray) Utils.removeObjectWithOnlySingleIdField(collectionDataArray);
244
238
  });
239
+ };
240
+
241
+ /**
242
+ *
243
+ * The purpose of this function is to apply the show_when rules defined in the form specification to the
244
+ * form payload (formData), and remove any data that should not be shown according to those rules.
245
+ * (the reason this data exists in the payload is that users can answer a question in such a way that
246
+ * other questions are 'shown' to them, which are then complete. The user can then go back and change the original
247
+ * question to then 'hide' those questions, but the answers they gave persist in the payload. The must be cleansed
248
+ * before being submitted.
249
+ *
250
+ * There are 2 types of payload data that have to be treated differently by this function for it to work.
251
+ *
252
+ * 1. Data from non-repeating pages, containing components.
253
+ *
254
+ * Each data item captured will be written to the payload as a field with the name of the fieldId of the payload.
255
+ * In the case of components that are nested within 'container' components, the payload will reflect the nesting.
256
+ * There is no limit to the level of nesting in a form.
257
+ *
258
+ * To cleanse the payload for this type of data, we do the following (high level description, see method comments for detail):
259
+ *
260
+ * - build a map of all components, keyed by their payload path (required for the next step)
261
+ * - for all of these components that have dependencies (show_when rules), create a graph datastructure to show all components
262
+ * on which a component is dependent, and then all components that those components may be dependent on. There is no limit to
263
+ * the depth of these chained dependencies.
264
+ * - the reason for building a graph of these dependency chains is so we know the sequence in which we must resolve the dependencies.
265
+ * For any given chain of dependencies it is essential that we resolve the dependencies starting at the end of the chains, and work our way
266
+ * back up the chain. If not, we could be resolving a dependency based on a payload item that itself will later be deleted.
267
+ * Therefore, the final step is to recursively traverse the dependency graph, resolving the dependency rule for the components in
268
+ * the chain from the leaf back up to the parent node.
269
+ *
270
+ * 2. Page collection data
271
+ *
272
+ * A page collection is a set of one or more pages which (as a group) can be filled in as many times is required
273
+ * by the user. For example, in EAB, you can add as many item-seal-details to an EAB form as are required. An item-seal-detail
274
+ * is made up of several different pages, all grouped. The data saved will be an array representing the whole collection, with
275
+ * each object in the array representing a single collection entry (a single item-seal-detail in this example).
276
+ *
277
+ * Cleanse collection data has to be driven from the payload rather than the form, as there are repeated objects in an array
278
+ * representing the data. Each one has to be treated independently as the data to be cleansed can be different in each one.
279
+ *
280
+ * - For each collection type, iterate through each payload object and treat it like an independent payload..
281
+ * - For each collection payload object, iterate through the collection's pages and components, and apply all the show_when rules
282
+ * found at both page and component level to the payload.
283
+ * - Repeat for each payload object
284
+ * - Repeat for all collections
285
+ *
286
+ * @param {*} form
287
+ * @param {*} formData
288
+ * @returns {*} cleansed form data
289
+ */
290
+ const clearOutUncompletedRoutes = (form, formData) => {
291
+ // Load components into maps keyed on id and field for subsequent performant access
292
+ const componentByIdMap = new Map(form.components.map(c => [c.id, c]));
293
+ const componentByFieldIdMap = new Map(form.components.map(c => [c.fieldId, c]));
294
+
295
+ // Instantiate data structures to hold the form specification and the dependency graph
296
+ const allComponents = new Map();
297
+ const componentsToKeep = {};
298
+ const allCollections = new Map();
299
+ const allDependencyRelationships = new Map();
300
+
301
+ // Group all pages relating to a page-collection into a single object to aid collection
302
+ // processing, and to allow us to differentiate between a collection and non-collection page.
303
+ const condensedPages = (0, _mergeCollectionPages.default)(form.pages);
304
+ createComponentMapsFromForm(condensedPages, allCollections, componentByIdMap, componentByFieldIdMap, allComponents, componentsToKeep, formData);
305
+ createComponentDependenciesGraph(allComponents, allDependencyRelationships);
306
+ resolveComponentDependenciesGraph(allDependencyRelationships, allComponents, componentsToKeep, allCollections, form, formData);
307
+ cleanseCollectionData(allCollections, formData, componentByIdMap, componentByFieldIdMap);
308
+
309
+ // The cleansing above may have left empty arrays and collection IDs. Tidy these up.
245
310
  Utils.removeEmptyArraysAndUnusedCollectionIDs(formData);
246
311
  return formData;
247
312
  };
@@ -40,6 +40,9 @@ var _dataHiddenPageRemoved = _interopRequireDefault(require("../clear-uncomplete
40
40
  var _formHiddenPageSameComponentReused = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/forms/form-hidden-page-same-component-reused.json"));
41
41
  var _dataHiddenPageSameComponentReused = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/data-hidden-page-same-component-reused.json"));
42
42
  var _dataHiddenPageSameComponentReusedRemoved = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/data-hidden-page-same-component-reused-removed.json"));
43
+ var _formPageSameComponentReusedOneShown = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/forms/form-page-same-component-reused-one-shown.json"));
44
+ var _dataPageSameComponentReusedOneShown = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/data-page-same-component-reused-one-shown.json"));
45
+ var _dataPageSameComponentReusedOneShownRemoved = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/data-page-same-component-reused-one-shown-removed.json"));
43
46
  var _formHiddenPageComponentUsedElsewhere = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/forms/form-hidden-page-component-used-elsewhere.json"));
44
47
  var _dataHiddenPageComponentUsedElsewhere = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/data-hidden-page-component-used-elsewhere.json"));
45
48
  var _dataHiddenPageComponentUsedElsewhereRemoved = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/data-hidden-page-component-used-elsewhere-removed.json"));
@@ -114,6 +117,8 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
114
117
 
115
118
  // Hidden page containing same component reused
116
119
 
120
+ // should show component when reused but only one show_when true
121
+
117
122
  // Hidden page with component used elsewhere
118
123
 
119
124
  // Hidden component with show_when rule referring to a collection
@@ -227,13 +232,12 @@ describe('FormRenderer', () => {
227
232
  const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
228
233
  expect(result).toEqual(_dataHiddenPageSameComponentReusedRemoved.default);
229
234
  });
230
-
231
- // TEST FOR 3 components with the same name, a page show_when, 1 of which is shown.
232
-
233
- // Check the visited thing is working.
234
-
235
- // Refactor and comment the toArray method.
236
-
235
+ it('should show component when reused but only one show_when true.', () => {
236
+ const submissionData = JSON.parse(JSON.stringify(_dataPageSameComponentReusedOneShown.default));
237
+ const form = JSON.parse(JSON.stringify(_formPageSameComponentReusedOneShown.default));
238
+ const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
239
+ expect(result).toEqual(_dataPageSameComponentReusedOneShownRemoved.default);
240
+ });
237
241
  it('should remove a hidden collection on a page.', () => {
238
242
  const submissionData = JSON.parse(JSON.stringify(_dataHiddenPageCollection.default));
239
243
  const form = JSON.parse(JSON.stringify(_formHiddenPageCollection.default));