mod-build 4.0.59-beta.9 → 4.0.60-beta.1

package/CHANGELOG.md

@@ -1,12 +1,16 @@
 # Changelog
 
+## 4.0.60
+
+- Applying merging of default trade questions and default form config on all the `steps` objects found.
+
 ## 4.0.59
 
-- Adding VWO variation ID to the body tag as an attribute `data-vwo-test-id`
+- Added jacuzzi in the sites that should have tcpa below the cta.
 
 ## 4.0.58
 
-- Upgraded to new vwo smart code
+- Upgraded to new VWO smart code.
 
 ## 4.0.57
 

package/package.json

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

package/src/scripts/utils.js

@@ -45,6 +45,7 @@ function handlebarsX(expression, context) {
 }
 
 const tradesWithTcpaAboveCta = ['HOME_SECURITY'];
+const sitesWithTcpaBelowCta = ['go.jacuzzi.com'];
 
 export const handlebarsHelpers = [
 	// Run any js line
@@ -192,7 +193,8 @@ export const handlebarsHelpers = [
 				return false;
 			}
 			const trade = page.primary_trade.replace(/\s+/g, '_').toUpperCase();
-			return tradesWithTcpaAboveCta.includes(trade) || page.isBranded;
+			const site = page.website_name?.toLowerCase();
+			return (tradesWithTcpaAboveCta.includes(trade) || page.isBranded) && !sitesWithTcpaBelowCta.includes(site);
 		}
 	},
 	{
@@ -202,7 +204,8 @@ export const handlebarsHelpers = [
 				return false;
 			}
 			const trade = page.primary_trade.replace(/\s+/g, '_').toUpperCase();
-			return !tradesWithTcpaAboveCta.includes(trade) && !page.isBranded;
+			const site = page.website_name?.toLowerCase();
+			return (!tradesWithTcpaAboveCta.includes(trade) && !page.isBranded) || sitesWithTcpaBelowCta.includes(site);
 		}
 	}
 ]

package/src/templates/_partials/scripts/vwo-redirect-callback.html

@@ -2,8 +2,7 @@
 	window.VWO = window.VWO || [];
 	window.VWO.push(['onEventReceive', 'vA', function (data) {
 		var experimentId = data[1];
-		var variationId = +data[2];
-		// add sentry log if variationId is NaN?
+		var variationId = data[2];
 		var variationName = _vwo_exp[experimentId].comb_n[variationId];
 		if (typeof(_vwo_exp[experimentId].comb_n[variationId]) !== 'undefined' && ['VISUAL_AB', 'VISUAL', 'SPLIT_URL','SURVEY'].indexOf(_vwo_exp[experimentId].type) > -1) {
 			window._vwo_campaignData = {
@@ -11,12 +10,6 @@
 					n: variationName
 				}
 			}
-			if (variationId !== 1 && window.addVwoTestAttribute) {
-				// Control is assigned variation ID 1 - variations receive incremented IDs starting from 2
-				const actualVariationId = variationId - 1;
-				const vwoTestAttrValue = `${experimentId}-${actualVariationId}`;
-				document.body.setAttribute('data-vwo-test', vwoTestAttrValue);
-			}
 		}
 	}]);
 

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

@@ -3,6 +3,173 @@ import merge from 'lodash.merge';
 import axios from 'axios';
 import { defaultSettings } from '../src/data/config.js';
 
+function applyDefaultTradeConfigOnSteps(config, steps) {
+	if (!config || typeof config !== 'object') return;
+
+	if (data.steps && typeof data.steps === 'object' && data.steps.items) {
+		mergeDefaultTradeQuestions(config, steps);
+	}
+	// 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) {
+				applyDefaultTradeConfigOnSteps(value, steps);
+			}
+		}
+	}
+}
+
+function mergeDefaultTradeQuestions(config, steps) {
+	if (!config || !config.steps || !config.steps.items || !Array.isArray(config.steps.items)) {
+		return;
+	}
+
+	config.steps.items.forEach((item) => {
+		const stepName = item.attributes.data['step-name'];
+		if (steps[stepName]) {
+			if (!item.stepContent) {
+				item.stepContent = {};
+			}
+
+			if (!item.stepContent.fields) {
+				item.stepContent.fields = [];
+			}
+			const defaultStepFields = steps[stepName].fields;
+			let defaultStepOptions = [];
+			let defaultQuestionLegend = {};
+			defaultStepFields.forEach((defaultField) => {
+				defaultStepOptions = defaultField.options;
+				defaultQuestionLegend = defaultField.legend;
+			});
+
+			item.stepContent.fields.forEach((field) => {
+				if (field.legend) {
+					field.legend = merge(defaultQuestionLegend, field.legend);
+				} else {
+					field.legend = defaultQuestionLegend;
+				}
+
+				if (field && field.remove) {
+					if (field.remove.includes('all')) {
+						defaultStepOptions = [];
+					} else {
+						defaultStepOptions = defaultStepOptions.filter((_, i) => !field.remove.includes(i));
+					}
+				}
+
+				if (field.fieldType === 'radio') {
+					if (!field.errorMessage) {
+						field.errorMessage = 'Professionals need this info to generate a quote.';
+					}
+
+					if (field.options && Array.isArray(field.options) && field.options.length) {
+						field.options.forEach((option) => {
+							if (typeof option.update === 'number') {
+								if (option.attributes && option.attributes.checked === false) {
+									delete option.attributes.checked;
+									delete defaultStepOptions[option.update].attributes.checked;
+								}
+								merge(defaultStepOptions[option.update], option);
+							} else {
+								if (typeof option.insertAt === 'number') {
+									defaultStepOptions.splice(option.insertAt, 0, option);
+								} else {
+									defaultStepOptions.push(option);
+								}
+							}
+						});
+					}
+					field.options = defaultStepOptions;
+				} else {
+					if (field && Array.isArray(field) && field.length) {
+						if (typeof field.update === 'number') {
+							merge(defaultStepFields[field.update], field);
+						} else {
+							if (typeof field.insertAt === 'number') {
+								defaultStepFields.splice(field.insertAt, 0, field);
+							} else {
+								defaultStepFields.push(field);
+							}
+						}
+					}
+
+					field = defaultStepFields;
+				}
+			});
+
+			// extra question block
+			if (item.stepContent.extraQuestionBlock) {
+				if (!item.stepContent.extraQuestionBlock.fields) {
+					item.stepContent.extraQuestionBlock.fields = [];
+				}
+
+				const defaultExtraQuestionFields = steps[stepName].extraQuestionBlock.fields;
+				let defaultExtraQuestionOptions = [];
+				let defaultExtraQuestionLegend = {};
+				defaultExtraQuestionFields.forEach((defaultExtraQuestionField) => {
+					defaultExtraQuestionOptions = defaultExtraQuestionField.options;
+					defaultExtraQuestionLegend = defaultExtraQuestionField.legend;
+				});
+				item.stepContent.extraQuestionBlock.fields.forEach((field) => {
+
+					if (field.legend) {
+						field.legend = merge(defaultExtraQuestionLegend, field.legend);
+					} else {
+						field.legend = defaultExtraQuestionLegend;
+					}
+
+					if (field && field.remove) {
+						if (field.remove.includes('all')) {
+							defaultExtraQuestionOptions = [];
+						} else {
+							defaultExtraQuestionOptions = defaultExtraQuestionOptions.filter((_, i) => !field.remove.includes(i));
+						}
+					}
+
+					if (field.fieldType === 'radio') {
+						if (!field.errorMessage) {
+							field.errorMessage = 'Professionals need this info to generate a quote.';
+						}
+
+						if (field.options && Array.isArray(field.options) && field.options.length) {
+							field.options.forEach((option, optionIndex) => {
+								if (typeof option.update === 'number') {
+									if (option.attributes && option.attributes.checked === false) {
+										delete option.attributes.checked;
+										delete defaultStepOptions[option.update].attributes.checked;
+									}
+									merge(defaultExtraQuestionOptions[option.update], option);
+								} else {
+									if (typeof option.insertAt === 'number') {
+										defaultExtraQuestionOptions.splice(option.insertAt, 0, option);
+									} else {
+										defaultExtraQuestionOptions.push(option);
+									}
+								}
+							});
+						}
+						field.options = defaultExtraQuestionOptions;
+					} else {
+						if (field && Array.isArray(field) && field.length) {
+							if (typeof field.update === 'number') {
+								merge(defaultExtraQuestionFields[field.update], field);
+							} else {
+								if (typeof field.insertAt === 'number') {
+									defaultExtraQuestionFields.splice(field.insertAt, 0, field);
+								} else {
+									defaultExtraQuestionFields.push(field);
+								}
+							}
+						}
+						field = defaultExtraQuestionFields;
+					}
+				});
+			}
+		}
+	});
+}
+
 export default async function(config) {
 	if (config.useStepsConfig) {
 		console.log('Starting get-default-trade-questions...');
@@ -35,149 +202,7 @@ export default async function(config) {
 							steps.OwnHome = commonQuestions.OwnHome;
 							steps.BuyTimeframe = commonQuestions.BuyTimeframe;
 
-							config.steps.items.forEach((item) => {
-								const stepName = item.attributes.data['step-name'];
-								if (steps[stepName]) {
-									if (!item.stepContent) {
-										item.stepContent = {};
-									}
-
-									if (!item.stepContent.fields) {
-										item.stepContent.fields = [];
-									}
-									const defaultStepFields = steps[stepName].fields;
-									let defaultStepOptions = [];
-									let defaultQuestionLegend = {};
-									defaultStepFields.forEach((defaultField) => {
-										defaultStepOptions = defaultField.options;
-										defaultQuestionLegend = defaultField.legend;
-									});
-
-									item.stepContent.fields.forEach((field) => {
-										if (field.legend) {
-											field.legend = merge(defaultQuestionLegend, field.legend);
-										} else {
-											field.legend = defaultQuestionLegend;
-										}
-
-										if (field && field.remove) {
-											if (field.remove.includes('all')) {
-												defaultStepOptions = [];
-											} else {
-												defaultStepOptions = defaultStepOptions.filter((_, i) => !field.remove.includes(i));
-											}
-										}
-
-										if (field.fieldType === 'radio') {
-											if (!field.errorMessage) {
-												field.errorMessage = 'Professionals need this info to generate a quote.';
-											}
-
-											if (field.options && Array.isArray(field.options) && field.options.length) {
-												field.options.forEach((option) => {
-													if (typeof option.update === 'number') {
-														if (option.attributes && option.attributes.checked === false) {
-															delete option.attributes.checked;
-															delete defaultStepOptions[option.update].attributes.checked;
-														}
-														merge(defaultStepOptions[option.update], option);
-													} else {
-														if (typeof option.insertAt === 'number') {
-															defaultStepOptions.splice(option.insertAt, 0, option);
-														} else {
-															defaultStepOptions.push(option);
-														}
-													}
-												});
-											}
-											field.options = defaultStepOptions;
-										} else {
-											if (field && Array.isArray(field) && field.length) {
-												if (typeof field.update === 'number') {
-													merge(defaultStepFields[field.update], field);
-												} else {
-													if (typeof field.insertAt === 'number') {
-														defaultStepFields.splice(field.insertAt, 0, field);
-													} else {
-														defaultStepFields.push(field);
-													}
-												}
-											}
-
-											field = defaultStepFields;
-										}
-									});
-
-									// extra question block
-									if (item.stepContent.extraQuestionBlock) {
-										if (!item.stepContent.extraQuestionBlock.fields) {
-											item.stepContent.extraQuestionBlock.fields = [];
-										}
-
-										const defaultExtraQuestionFields = steps[stepName].extraQuestionBlock.fields;
-										let defaultExtraQuestionOptions = [];
-										let defaultExtraQuestionLegend = {};
-										defaultExtraQuestionFields.forEach((defaultExtraQuestionField) => {
-											defaultExtraQuestionOptions = defaultExtraQuestionField.options;
-											defaultExtraQuestionLegend = defaultExtraQuestionField.legend;
-										});
-										item.stepContent.extraQuestionBlock.fields.forEach((field) => {
-
-											if (field.legend) {
-												field.legend = merge(defaultExtraQuestionLegend, field.legend);
-											} else {
-												field.legend = defaultExtraQuestionLegend;
-											}
-
-											if (field && field.remove) {
-												if (field.remove.includes('all')) {
-													defaultExtraQuestionOptions = [];
-												} else {
-													defaultExtraQuestionOptions = defaultExtraQuestionOptions.filter((_, i) => !field.remove.includes(i));
-												}
-											}
-
-											if (field.fieldType === 'radio') {
-												if (!field.errorMessage) {
-													field.errorMessage = 'Professionals need this info to generate a quote.';
-												}
-
-												if (field.options && Array.isArray(field.options) && field.options.length) {
-													field.options.forEach((option, optionIndex) => {
-														if (typeof option.update === 'number') {
-															if (option.attributes && option.attributes.checked === false) {
-																delete option.attributes.checked;
-																delete defaultStepOptions[option.update].attributes.checked;
-															}
-															merge(defaultExtraQuestionOptions[option.update], option);
-														} else {
-															if (typeof option.insertAt === 'number') {
-																defaultExtraQuestionOptions.splice(option.insertAt, 0, option);
-															} else {
-																defaultExtraQuestionOptions.push(option);
-															}
-														}
-													});
-												}
-												field.options = defaultExtraQuestionOptions;
-											} else {
-												if (field && Array.isArray(field) && field.length) {
-													if (typeof field.update === 'number') {
-														merge(defaultExtraQuestionFields[field.update], field);
-													} else {
-														if (typeof field.insertAt === 'number') {
-															defaultExtraQuestionFields.splice(field.insertAt, 0, field);
-														} else {
-															defaultExtraQuestionFields.push(field);
-														}
-													}
-												}
-												field = defaultExtraQuestionFields;
-											}
-										});
-									}
-								}
-							});
+							applyDefaultTradeConfigOnSteps(config, steps);
 							resolve();
 						})
 						.catch(error => {

package/tasks/templates.js

@@ -15,7 +15,26 @@ responseInterceptor(axiosInstance);
 responseInterceptor(tcpaAxiosInstance);
 responseInterceptor(consentCaptureAxiosInstance);
 
-function mergeDefaultFormFieldConfig(defaultConfig, config) {
+async function applyDefaultConfigOnSteps(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);
+			}
+		}
+	}
+}
+
+function mergeDefaultFormFieldConfig(defaultConfig, config, parentConfig) {
 	const { steps } = config;
 
 	if (!steps.items) {
@@ -23,7 +42,7 @@ function mergeDefaultFormFieldConfig(defaultConfig, config) {
 		return steps;
 	}
 
-	if (config.useAccessibleConfig) {
+	if (parentConfig.useAccessibleConfig) {
 		steps.items.forEach(item => {
 			if (item.stepContent.fields) {
 				item.stepContent.fields = item.stepContent.fields.map(field => {
@@ -60,9 +79,7 @@ const getDefaultFormFieldConfig = async (config, folder = 'accessible-components
 					throw new Error(`${resp.status}:  Error while fetching ${folder}/defaultFormFieldConfig.json`);
 				}
 				const defaultConfig = resp.data;
-				if (config.steps) {
-					config.steps = await mergeDefaultFormFieldConfig(defaultConfig, config);
-				}
+				applyDefaultConfigOnSteps(defaultConfig, config, config);
 				resolve();
 			}).catch(error => {
 				console.error(error);