mod-build 3.7.1 → 3.7.2-7.beta-5

package/CHANGELOG.md

@@ -1,5 +1,101 @@
 # Changelog
 
+## 3.7.27
+
+- Adding VWO variation ID to the body tag as an attribute `data-vwo-test-id`.
+
+## 3.7.26
+
+- Added jacuzzi in the sites that should have tcpa below the cta.
+
+## 3.7.25
+
+- Upgraded to new VWO smart code.
+
+## 3.7.24
+
+- Removed `GUTTERS`, `GUTTER_COVERS`, & `SOLAR` from the TCPA placement configurations.
+
+## 3.7.23
+
+- Added `geolocation.min.js` to the `grab-shared-scripts` task to grab & hash that file during build (leaving the file in `grab-cdn` task to not break what is currently there).
+
+## 3.7.22
+
+- Added extra conditions for `addTcpaAboveCta` and `addTcpaBelowCta` helper functions to not break when required data is not passed.
+
+## 3.7.21
+
+- Added `GUTTERS` & `GUTTER_COVERS` to the `addTcpaAboveCta` and `addTcpaBelowCta` configurations.
+
+## 3.7.20
+
+- Added `addTcpaAboveCta` and `addTcpaBelowCta` helper functions to determine where tcpa should be placed based on trade/branded conditions.
+
+## 3.7.19
+
+- Added missed attributes in global questions config of siding and tree services.
+
+## 3.7.18
+
+- Fixing console log
+
+## 3.7.17
+
+- Added in the outer `ServiceType` missing object for Water Treatment trade questions config.
+
+## 3.7.16
+
+- Added the new `getDataAttributeValue` helper function; Also updated the generic error language in `get-default-trade-questions`.
+
+## 3.7.15
+
+- Added the Clients List modal to be grabbed as part of the  `grab-cdn` task.
+
+## 3.7.14
+
+- Added trade steps configs.
+
+## 3.7.13
+
+- An enhancement has been added to the `getConsentCaptureLanguage()` function to replace the subdirectory path throughout the response object.
+
+## 3.7.12
+
+- Added the E-Sign Consent modal to be grabbed as part of the  `grab-cdn` task.
+
+## 3.7.11
+
+- Added branded name to `brandedIncludeExclusivelyConsentCapture` object in consent capture.
+
+## 3.7.10
+
+- Included an option for `service` to be appended to the `brandedIncludeServiceConsentCapture` for consent capture.
+
+## 3.7.9
+
+- Updated `isBranded` sites to grab the display name from HS Form Service API to add to the `brandedConsentLanguage`.
+
+## 3.7.8
+
+- removed race condition from grab-cdn task.
+
+## 3.7.6
+
+- Removing all the `!window.Modalytics.privacyPreferencesDetected` conditionals (as we are no longer moving forward with this integration).
+
+## 3.7.5
+
+- fixed trade directory name issue for section deals pages
+
+## 3.7.4
+
+- Added small enhancements in `grab-mhsadmin-data`
+
+## 3.7.3
+
+- Added `grab-section-deals-components` and `grab-mhsadmin-data` tasks for section deals pages.
+
 ## 3.7.1
 
 - updated clean task.

package/gulp-tasks/build.js

@@ -5,15 +5,15 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		var sequenceOpts;
 
 		if (siteData.useTypescript) {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'compile-prod', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'cache-bust', 'add-path-subdirectories', 'copy-resources-to-dist', 'build-stat'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'get-default-trade-questions', 'grab-form-helpers', 'templates', 'styles', 'compile-prod', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'cache-bust', 'add-path-subdirectories', 'copy-resources-to-dist', 'build-stat'];
 		} else if (siteData.isWhiteLabel) {
 			if (siteData.isQSPage) {
-				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'grab-theme-json', 'combine-files', 'grab-images', 'copy-json', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'copy-files-to-build-path', 'cache-bust', 'add-path-subdirectories', 'grab-tooltips-json', 'copy-resources-to-dist', 'build-stat'];
+				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'get-default-trade-questions', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'grab-theme-json', 'combine-files', 'grab-images', 'copy-json', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'copy-files-to-build-path', 'cache-bust', 'add-path-subdirectories', 'grab-tooltips-json', 'copy-resources-to-dist', 'build-stat'];
 			} else {
-				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'combine-files', 'grab-images', 'js-lint', 'html-min','grab-global-images', 'css-min', 'js-min', 'img-min', 'extras', 'cache-bust', 'add-path-subdirectories', 'grab-tooltips-json', 'copy-resources-to-dist', 'build-stat'];
+				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'get-default-trade-questions', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'combine-files', 'grab-images', 'js-lint', 'html-min', 'grab-global-images', 'css-min', 'js-min', 'img-min', 'extras', 'cache-bust', 'add-path-subdirectories', 'grab-tooltips-json', 'copy-resources-to-dist', 'build-stat'];
 			}
 		} else {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'cache-bust', 'add-path-subdirectories', 'copy-resources-to-dist', 'build-stat'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'get-default-trade-questions', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'cache-bust', 'add-path-subdirectories', 'copy-resources-to-dist', 'build-stat'];
 		}
 
 		if (siteData.copyLocalFontFile) {

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

@@ -0,0 +1,155 @@
+/* globals Promise */
+var merge = require('lodash.merge');
+var tradeQuestionsConfig = require('../src/trade-questions-config.js');
+
+module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
+	if (siteData.useStepsConfig) {
+		console.log('Running trade question config...');
+		return async function() {
+			return await new Promise((resolve) => {
+				const trade = siteData.primary_trade.toLowerCase();
+				const steps = tradeQuestionsConfig.tradeQuestions[trade];
+
+				steps.OwnHome = tradeQuestionsConfig.OwnHome;
+				steps.BuyTimeframe = tradeQuestionsConfig.BuyTimeframe;
+
+				siteData.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') {
+											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) => {
+											if (typeof option.update === 'number') {
+												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;
+								}
+							});
+						}
+					}
+				});
+				resolve();
+			});
+		};
+	}
+};

package/gulp-tasks/grab-cdn.js

@@ -1,16 +1,19 @@
+/* globals Promise */
 var request = require('request');
 var source = require('vinyl-source-stream');
 
 // helper to allow us to define an "end" event to multiple streams
-function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName) {
+async function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName, index) {
 	var url = `https://${siteSettings.nodeEnv}${inputPath}`;
-
-	return new Promise(resolve => { // eslint-disable-line no-undef
+	return await new Promise(async function(resolve) { // eslint-disable-line no-undef
+		console.time(`${index + 1} Finished after`);
+		console.log(`${index + 1} Starting:`, url);
 		request(url)
-			.on('response', resp => {
+			.on('response', async function(resp) {
 				if (resp.statusCode !== 200) {
 					throw new Error(`Error fetching ${url}`);
 				}
+				console.timeEnd(`${index + 1} Finished after`);
 			})
 			.pipe(source(fileName))
 			.pipe(gulp.dest(`${siteSettings.srcFolder}/${destPath}`))
@@ -19,7 +22,7 @@ function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName)
 }
 
 module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
-	return function() {
+	return async function() {
 		const { nodeEnv, isLocal } = siteSettings;
 		const { isQSPage, isWhiteLabel, domain } = siteData;
 		const isModWhiteLabel = isWhiteLabel && !isQSPage;
@@ -30,7 +33,8 @@ module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
 		// key: inputPath, value: destPath
 
 		externalResources = {
-			'/quote/resources/mod-site/templates/scripts/trusted-form.html': ['/templates/scripts/', 'trusted-form.html']
+			'/quote/resources/mod-site/templates/scripts/trusted-form.html': ['/templates/scripts/', 'trusted-form.html'],
+			'/quote/resources/shared-resources/scripts/geolocation/geolocation.min.js': ['resources/scripts/geolocation/', 'geolocation.min.js']
 		};
 
 		// grab footer modals and place under the resources
@@ -39,11 +43,13 @@ module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
 			'/quote/resources/shared-resources/templates/modals/privacy/': ['/resources/templates/modals/privacy/', 'index.html'],
 			'/quote/resources/shared-resources/templates/modals/terms/': ['/resources/templates/modals/terms/', 'index.html'],
 			'/quote/resources/shared-resources/templates/modals/contact-us/': ['/resources/templates/modals/contact-us/', 'index.html'],
-			'/quote/resources/shared-resources/templates/modals/faq/': ['/resources/templates/modals/faq/', 'index.html']
+			'/quote/resources/shared-resources/templates/modals/faq/': ['/resources/templates/modals/faq/', 'index.html'],
+			'/quote/resources/shared-resources/templates/modals/e-sign-consent/': ['/resources/templates/modals/e-sign-consent/', 'index.html'],
+			'/quote/resources/shared-resources/templates/modals/clients/': [`/resources/templates/modals/clients/`, 'index.html']
 		});
 
 		if (isModWhiteLabel || domainHasModernize) {
-			Object.assign(externalResources, {'/quote/resources/mod-site/templates/scripts/recaptcha.html': ['/templates/scripts/', 'recaptcha.html']});
+			Object.assign(externalResources, { '/quote/resources/mod-site/templates/scripts/recaptcha.html': ['/templates/scripts/', 'recaptcha.html'] });
 		}
 
 		// local dev files
@@ -60,20 +66,19 @@ module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
 			externalResources = { ...externalResources, ...remoteFilesForLocalDev };
 		}
 
-		// Geolocation js
-		Object.assign(externalResources, {
-			'/quote/resources/shared-resources/scripts/geolocation/geolocation.min.js': [
-				'resources/scripts/geolocation/', 'geolocation.min.js'
-			]
-		});
+		const totalRequests = Object.keys(externalResources).length;
+		return await new Promise(async function(resolve) {
+			const sequentialRequests = async function(key, index) {
+				if (index === totalRequests) {
+					resolve();
+					return;
+				}
+				const destinationPath = externalResources[key][0];
+				const fileName = externalResources[key][1];
+				return await streamToDestination(gulp, siteSettings, key, destinationPath, fileName, index).then(() => sequentialRequests(Object.keys(externalResources)[index + 1], index + 1));
+			};
 
-		const filesPromiseMap = Object.keys(externalResources).map(key => {
-			const destinationPath = externalResources[key][0];
-			const fileName = externalResources[key][1];
-			return streamToDestination(gulp, siteSettings, key, destinationPath, fileName);
+			sequentialRequests(Object.keys(externalResources)[0], 0);
 		});
-
-		// when Promise.all resolves, the streams are done and we can go to the next step
-		return Promise.all(filesPromiseMap); // eslint-disable-line no-undef
 	};
 };