mod-build 4.0.60-beta.1 → 4.0.60-beta.10

package/package.json

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

package/tasks/get-default-trade-questions.js

@@ -3,24 +3,24 @@ import merge from 'lodash.merge';
 import axios from 'axios';
 import { defaultSettings } from '../src/data/config.js';
 
-function applyDefaultTradeConfigOnSteps(config, steps) {
+function mergeDefaultTradeQuestionsConfigOnSteps(config, steps) {
 	if (!config || typeof config !== 'object') return;
 
-	if (data.steps && typeof data.steps === 'object' && data.steps.items) {
-		mergeDefaultTradeQuestions(config, steps);
+	if (config.steps && typeof config.steps === 'object' && config.steps.items) {
+		mergeDefaultTradeQuestionsConfig(config, steps);
 	}
-	// Recursively go through all object properties
-	for (const key in data) {
-		if (data.hasOwnProperty(key)) {
-			const value = data[key];
+
+	for (const key in config) {
+		if (config.hasOwnProperty(key)) {
+			const value = config[key];
 			if (typeof value === 'object' && value !== null) {
-				applyDefaultTradeConfigOnSteps(value, steps);
+				mergeDefaultTradeQuestionsConfigOnSteps(value, steps);
 			}
 		}
 	}
 }
 
-function mergeDefaultTradeQuestions(config, steps) {
+function mergeDefaultTradeQuestionsConfig(config, steps) {
 	if (!config || !config.steps || !config.steps.items || !Array.isArray(config.steps.items)) {
 		return;
 	}
@@ -202,7 +202,7 @@ export default async function(config) {
 							steps.OwnHome = commonQuestions.OwnHome;
 							steps.BuyTimeframe = commonQuestions.BuyTimeframe;
 
-							applyDefaultTradeConfigOnSteps(config, steps);
+							mergeDefaultTradeQuestionsConfigOnSteps(config, steps);
 							resolve();
 						})
 						.catch(error => {

package/tasks/templates.js

@@ -15,20 +15,18 @@ responseInterceptor(axiosInstance);
 responseInterceptor(tcpaAxiosInstance);
 responseInterceptor(consentCaptureAxiosInstance);
 
-async function applyDefaultConfigOnSteps(defaultConfig, data, parentConfig) {
+async function mergeDefaultFormFieldConfigOnSteps(defaultConfig, data, parentConfig) {
 	if (!data || typeof data !== 'object') return;
 
-	// If "steps" is an object, merge its config
 	if (data.steps && typeof data.steps === 'object') {
 		data.steps = await mergeDefaultFormFieldConfig(defaultConfig, data, parentConfig);
 	}
 
-	// Recursively go through all object properties
 	for (const key in data) {
 		if (data.hasOwnProperty(key)) {
 			const value = data[key];
 			if (typeof value === 'object' && value !== null) {
-				await applyDefaultConfigOnSteps(defaultConfig, value, parentConfig);
+				await mergeDefaultFormFieldConfigOnSteps(defaultConfig, value, parentConfig);
 			}
 		}
 	}
@@ -79,7 +77,7 @@ const getDefaultFormFieldConfig = async (config, folder = 'accessible-components
 					throw new Error(`${resp.status}:  Error while fetching ${folder}/defaultFormFieldConfig.json`);
 				}
 				const defaultConfig = resp.data;
-				applyDefaultConfigOnSteps(defaultConfig, config, config);
+				mergeDefaultFormFieldConfigOnSteps(defaultConfig, config, config);
 				resolve();
 			}).catch(error => {
 				console.error(error);