mod-build 4.0.48 → 4.0.49

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

@@ -1,153 +1,193 @@
 /* globals Promise */
 import merge from 'lodash.merge';
-import { tradeQuestionsConfig } from '../src/data/trade-questions-config';
+import axios from 'axios';
+import { defaultSettings } from '../src/data/config.js';
 
 export default async function(config) {
 	if (config.useStepsConfig) {
-		console.log('Running trade question config...');
-		await new Promise((resolve) => {
-			const trade = config.primary_trade.toLowerCase();
-			const steps = tradeQuestionsConfig.tradeQuestions[trade];
-
-			steps.OwnHome = tradeQuestionsConfig.OwnHome;
-			steps.BuyTimeframe = tradeQuestionsConfig.BuyTimeframe;
-
-			config.steps.items.forEach((item) => {
-				const stepName = item.attributes.data['step-name'];
-				if (steps[stepName]) {
-					if (!item.stepContent) {
-						item.stepContent = {};
+		console.log('Starting get-default-trade-questions...');
+		const trade = config.primary_trade.toLowerCase();
+		const resourcePath = 'quote/resources/mod-site/data/trade-questions';
+		let commonQuestions = {};
+		const commonQuestionsURL = `https://${defaultSettings.nodeEnv}/${resourcePath}/common.json`;
+		const tradeQuestionsURL = `https://${defaultSettings.nodeEnv}/${resourcePath}/${trade}.json`;
+		await new Promise(async (resolve) => {
+			console.log(`Started fetching common questions config...\n ${commonQuestionsURL}`);
+			await axios.get(commonQuestionsURL)
+				.then(async (resp) => {
+					if (resp.status !== 200) {
+						throw new Error(`${resp.status}: Error while fetching ${commonQuestionsURL}`);
 					}
 
-					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));
-							}
-						}
+					commonQuestions = { ...commonQuestions, ...resp.data };
 
-						if (field.fieldType === 'radio') {
-							if (!field.errorMessage) {
-								field.errorMessage = 'Professionals need this info to generate a quote.';
+					console.log('Finished fetching common questions config...');
+					console.log(`Started fetching ${trade} questions config...\n ${tradeQuestionsURL}`);
+					await axios.get(tradeQuestionsURL)
+						.then((response) => {
+							if (resp.status !== 200) {
+								throw new Error(`${resp.status}: Error while fetching ${tradeQuestionsURL}`);
 							}
 
-							if (field.options && Array.isArray(field.options) && field.options.length) {
-								field.options.forEach((option) => {
-									if (typeof option.update === 'number') {
-										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);
+							console.log(`Finished fetching ${trade} questions config...`);
+
+							const steps = response.data;
+							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 = {};
 									}
-								}
-							}
 
-							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 (!item.stepContent.fields) {
+										item.stepContent.fields = [];
+									}
+									const defaultStepFields = steps[stepName].fields;
+									let defaultStepOptions = [];
+									let defaultQuestionLegend = {};
+									defaultStepFields.forEach((defaultField) => {
+										defaultStepOptions = defaultField.options;
+										defaultQuestionLegend = defaultField.legend;
+									});
 
-							if (field.legend) {
-								field.legend = merge(defaultExtraQuestionLegend, field.legend);
-							} else {
-								field.legend = defaultExtraQuestionLegend;
-							}
+									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')) {
-									defaultExtraQuestionOptions = [];
-								} else {
-									defaultExtraQuestionOptions = defaultExtraQuestionOptions.filter((_, i) => !field.remove.includes(i));
-								}
-							}
+										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.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') {
-											merge(defaultExtraQuestionOptions[option.update], option);
+											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 (typeof option.insertAt === 'number') {
-												defaultExtraQuestionOptions.splice(option.insertAt, 0, option);
-											} else {
-												defaultExtraQuestionOptions.push(option);
+											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;
 										}
 									});
-								}
-								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);
+
+									// 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;
+											}
+										});
 									}
 								}
-								field = defaultExtraQuestionFields;
-							}
+							});
+							resolve();
+						})
+						.catch(error => {
+							console.error(error);
+							process.exit(1);
 						});
-					}
-				}
-			});
-			resolve();
-		});
+				}).catch(error => {
+					console.error(error);
+					process.exit(1);
+				});
+		}).then(() => console.log('Finished get-default-trade-questions...'));
 	}
-};
+};

package/tasks/serve.js

@@ -11,9 +11,9 @@ export async function startModBuild(config) {
 	addEditorConfig();
 	createStylelintFile();
 	await grabCdn(config);
+	await getDefaultTradeQuestions(config);
 	await Promise.all([
 		grabSharedComponents(config),
-		getDefaultTradeQuestions(config),
 		grabFormHelpers(config),
 		templates(config)
 	]).then(async () => {

package/src/data/trade-questions/alerts_medical.js

@@ -1,109 +0,0 @@
-/* eslint-disable */
-export const alerts_medical = {
-	WhoseMedicalAlert: {
-		fields: [
-			{
-				legend: {
-					text: 'Who is the medical alert for?'
-				},
-				options: [
-					{
-						text: 'Myself',
-						attributes: {
-							name: 'WhoseMedicalAlert',
-							value: 'Myself',
-							checked: '',
-							data: {
-								required: 'nonempty'
-							}
-						}
-					},
-					{
-						text: 'Somebody Else',
-						attributes: {
-							name: 'WhoseMedicalAlert',
-							value: 'SomebodyElse',
-							data: {
-								required: 'nonempty'
-							}
-						}
-					}
-				]
-			}
-		]
-	},
-	MedicalAlertProtectionAt: {
-		fields: [
-			{
-				legend: {
-					text: 'Are you looking for protection at home or on the go?'
-				},
-				options: [
-					{
-						text: 'At Home',
-						attributes: {
-							name: 'MedicalAlertProtectionAt',
-							value: 'Home',
-							checked: '',
-							data: {
-								required: 'nonempty'
-							}
-						}
-					},
-					{
-						text: 'On the Go',
-						attributes: {
-							name: 'MedicalAlertProtectionAt',
-							value: 'OnTheGo',
-							data: {
-								required: 'nonempty'
-							}
-						}
-					},
-					{
-						text: 'Both',
-						attributes: {
-							name: 'MedicalAlertProtectionAt',
-							value: 'Both',
-							data: {
-								required: 'nonempty'
-							}
-						}
-					}
-				]
-			}
-		]
-	},
-	HasLandlineAtHome: {
-		fields: [
-			{
-				legend: {
-					text: 'Do you have a landline telephone at home?',
-				},
-				options: [
-					{
-						text: 'Yes',
-						attributes: {
-							name: 'HasLandlineAtHome',
-							value: 'Yes',
-							checked: '',
-							data: {
-								required: 'nonempty'
-							}
-						}
-					},
-					{
-						text: 'No',
-						attributes: {
-							name: 'HasLandlineAtHome',
-							value: 'No',
-							data: {
-								required: 'nonempty'
-							}
-						}
-					}
-				]
-			}
-		]
-	}
-};

package/src/data/trade-questions/bathroom_refacing.js

@@ -1,94 +0,0 @@
-export const bathroom_refacing = {
-	BathProjectScope: {
-		fields: [
-			{
-				legend: {
-					text: 'Which of these best describe your needs?'
-				},
-				options: [
-					{
-						attributes: {
-							name: 'BathProjectScope',
-							value: 'Shower Conversion',
-							data: {
-								required: 'nonempty'
-							}
-						},
-						text: 'Bathtub to Shower Conversion'
-					},
-					{
-						attributes: {
-							name: 'BathProjectScope',
-							value: 'Bathtub / Shower Updates',
-							data: {
-								required: 'nonempty'
-							}
-						},
-						text: 'Bathtub/Shower Updates'
-					},
-					{
-						attributes: {
-							name: 'BathProjectScope',
-							value: 'Bathtub Liner / Shower Enclosure',
-							data: {
-								required: 'nonempty'
-							}
-						},
-						text: 'Bathtub Liner/Shower Enclosure'
-					},
-					{
-						attributes: {
-							name: 'BathProjectScope',
-							value: 'Walk-in Shower',
-							data: {
-								required: 'nonempty'
-							}
-						},
-						text: 'Walk-in Shower'
-					},
-					{
-						attributes: {
-							name: 'BathProjectScope',
-							value: 'Bathroom Remodel',
-							data: {
-								required: 'nonempty'
-							}
-						},
-						text: 'Complete Bathroom Remodel'
-					}
-				]
-			}
-		]
-	},
-	OptIn1: {
-		fields: [
-			{
-				legend: {
-					text: 'Will you need to add or remove walls?'
-				},
-				options: [
-					{
-						attributes: {
-							name: 'OptIn1',
-							value: 'Yes',
-							data: {
-								required: 'nonempty'
-							}
-						},
-						text: 'Yes'
-					},
-					{
-						attributes: {
-							name: 'OptIn1',
-							value: 'No',
-							data: {
-								required: 'nonempty'
-							}
-						},
-						text: 'No'
-					}
-				]
-			}
-		]
-	}
-};