mod-build 4.0.76-beta.7 → 4.0.78-beta.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.0.78
+
+- Updating `mergeDefaultFormFieldConfig` to be recursive and merge to nested fields (so we can wrap multiple fields in a `fieldset`).
+
 ## 4.0.76
 
 - Discarded usage of qs_gtm_container_id and has-qs-params function, which is no longer necessary and we will only rely on gtm_container_id that is set in site config

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mod-build",
-	"version": "4.0.76-beta.7",
+	"version": "4.0.78-beta.1",
 	"description": "Share components for S3 sites.",
 	"type": "module",
 	"scripts": {

package/tasks/templates.js

@@ -18,7 +18,9 @@ responseInterceptor(tcpaAxiosInstance);
 responseInterceptor(consentCaptureAxiosInstance);
 
 async function mergeDefaultFormFieldConfigOnSteps(defaultConfig, data, parentConfig) {
-	if (!data || typeof data !== 'object') return;
+	if (!data || typeof data !== 'object') {
+		return;
+	}
 
 	if (data.steps && typeof data.steps === 'object') {
 		data.steps = await mergeDefaultFormFieldConfig(defaultConfig, data, parentConfig);
@@ -42,31 +44,35 @@ function mergeDefaultFormFieldConfig(defaultConfig, config, parentConfig) {
 		return steps;
 	}
 
-	if (parentConfig.useAccessibleConfig) {
-		steps.items.forEach(item => {
-			if (item.stepContent.fields) {
-				item.stepContent.fields = item.stepContent.fields.map(field => {
-					if (field.attributes && field.attributes.name && defaultConfig[field.attributes.name]) {
-						field = merge(cloneDeep(defaultConfig[field.attributes.name]), field);
-					}
-					return field;
-				});
-			}
-		});
-	} else {
-		steps.items.forEach(item => {
-			if (item.fields) {
-				item.fields = item.fields.map(field => {
-					if (field.name && defaultConfig[field.name]) {
-						field = Object.assign(cloneDeep(defaultConfig[field.name]), field);
-					}
-					return field;
-				});
+	steps.items.forEach(item => {
+		processFieldsInObject(defaultConfig, item);
+	});
+
+	return steps;
+}
+
+function processFieldsInObject(defaultConfig, obj) {
+	if (!obj || typeof obj !== 'object') {
+		return;
+	}
+
+	if (obj.fields && Array.isArray(obj.fields)) {
+		obj.fields = obj.fields.map(field => {
+			if (field.attributes && field.attributes.name && defaultConfig[field.attributes.name]) {
+				field = merge(cloneDeep(defaultConfig[field.attributes.name]), field);
 			}
+			return field;
 		});
 	}
 
-	return steps;
+	for (const key in obj) {
+		if (obj.hasOwnProperty(key)) {
+			const value = obj[key];
+			if (typeof value === 'object' && value !== null) {
+				processFieldsInObject(defaultConfig, value);
+			}
+		}
+	}
 }
 
 const getDefaultFormFieldConfig = async (config, folder = 'accessible-components') => {
@@ -283,11 +289,7 @@ export default async function(config) {
 
 	if (Object.keys(config).length > 0) {
 		if (!config.doNotUseDefaultFieldConfig && !tempConfigCreated) {
-			if (config.useAccessibleConfig) {
-				await getDefaultFormFieldConfig(config, 'accessible-components');
-			} else {
-				await getDefaultFormFieldConfig(config, 'shared-components');
-			}
+			await getDefaultFormFieldConfig(config, 'accessible-components');
 		}
 		if (!config.tcpaText && config.primary_trade && !tempConfigCreated) {
 			await fetchTcpaFromSitegenie(config, tempConfig, pathSubdirectory);