mod-build 3.7.35-beta.1 → 3.7.35

package/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## 3.7.34
+## 3.7.35
 
-- Added support for dynamic gtm based on traffic source
+- Add 'grab-b2b-data' task to build/serve
 
 ## 3.7.34
 

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', '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'];
+			sequenceOpts = ['clean', 'grab-b2b-data', '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', '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'];
+				sequenceOpts = ['clean', 'grab-b2b-data', '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', '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'];
+				sequenceOpts = ['clean', 'grab-b2b-data', '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', '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'];
+			sequenceOpts = ['clean', 'grab-b2b-data', '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/grab-b2b-data.js

@@ -0,0 +1,87 @@
+/* globals Promise */
+var request = require('request');
+var source = require('vinyl-source-stream');
+var fs = require('fs');
+
+// helper to allow us to define an "end" event to multiple streams
+async function streamToDestination(gulp, siteSettings, siteData, inputPath, destPath, fileName, index) {
+	var url = `https://${siteSettings.nodeEnv}${inputPath}`;
+	return await new Promise(async function(resolve) { // eslint-disable-line no-undef
+		console.time(`${index + 1} B2B data finished after`);
+		console.log(`${index + 1} Starting B2B data:`, url);
+		
+		// Collect JSON data for processing
+		let jsonData = '';
+		
+		request(url)
+			.on('response', async function(resp) {
+				if (resp.statusCode !== 200) {
+					throw new Error(`Error fetching ${url}`);
+				}
+				console.timeEnd(`${index + 1} B2B data finished after`);
+			})
+			.on('data', function(chunk) {
+				jsonData += chunk.toString();
+			})
+			.pipe(source(fileName))
+			.pipe(gulp.dest(`${siteSettings.srcFolder}/${destPath}`))
+			.on('finish', function() {
+				// Parse the JSON data and add to siteData
+				try {
+					const parsedData = JSON.parse(jsonData);
+					const keyName = fileName.replace('.json', '');
+					// turn to camelCase so lead-form.json becomes leadForm
+					const camelCaseKeyName = keyName.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+					siteData[camelCaseKeyName] = parsedData;
+					console.log(`B2B data '${camelCaseKeyName}' added to siteData`);
+				} catch (error) {
+					console.error(`Error parsing JSON from ${url}:`, error.message);
+				}
+				resolve();
+			});
+	});
+}
+
+module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
+	return async function() {
+		if (siteData.b2b === undefined || siteData.b2b === false) {
+			return;
+		}
+
+		const { nodeEnv } = siteSettings;
+
+		if (!nodeEnv) {
+			throw new Error('Missing environment variables. Did you start with gulp instead of npm run...?');
+		}
+
+		// B2B data files to fetch
+		// key: inputPath, value: [destPath, fileName]
+		const b2bDataFiles = {
+			'/pros/wp-content/themes/modernize/app/Data/b2b-lead-form.json': ['data/', 'lead-form.json'],
+			'/pros/wp-content/themes/modernize/app/Data/trades.json': ['data/', 'trades.json']
+		};
+
+		const totalRequests = Object.keys(b2bDataFiles).length;
+		return await new Promise(async function(resolve) {
+			const sequentialRequests = async function(key, index) {
+				if (index === totalRequests) {
+					console.log('All B2B data files have been fetched successfully.');
+					resolve();
+					return;
+				}
+				
+				const destinationPath = b2bDataFiles[key][0];
+				const fileName = b2bDataFiles[key][1];
+				
+				// Add cache buster to prevent cached responses
+				const cachebuster = Math.round(new Date().getTime() / 1000);
+				const inputPathWithCacheBuster = `${key}?cb=${cachebuster}`;
+				
+				return await streamToDestination(gulp, siteSettings, siteData, inputPathWithCacheBuster, destinationPath, fileName, index)
+					.then(() => sequentialRequests(Object.keys(b2bDataFiles)[index + 1], index + 1));
+			};
+
+			sequentialRequests(Object.keys(b2bDataFiles)[0], 0);
+		});
+	};
+};

package/gulp-tasks/serve.js

@@ -4,11 +4,11 @@ module.exports.src = function(gulp, gulpPlugins, siteSettings, siteData) {
 		var runSequence = require('run-sequence');
 		var sequenceOpts;
 		if (siteData.useTypescript) {
-			sequenceOpts = ['clean', 'add-editorconfig', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'get-default-trade-questions', 'grab-form-helpers', 'templates', 'styles', 'compile', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'add-editorconfig', 'grab-b2b-data', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'get-default-trade-questions', 'grab-form-helpers', 'templates', 'styles', 'compile', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		} else if (siteData.isQSPage) {
-			sequenceOpts = ['clean', 'add-editorconfig', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'get-default-trade-questions', 'grab-form-helpers', 'templates', 'styles', 'grab-theme-json', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'add-editorconfig', 'grab-b2b-data', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'get-default-trade-questions', 'grab-form-helpers', 'templates', 'styles', 'grab-theme-json', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		} else {
-			sequenceOpts = ['clean', 'add-editorconfig', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'get-default-trade-questions', 'grab-form-helpers', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images', 'grab-global-images', 'js-lint'];
+			sequenceOpts = ['clean', 'add-editorconfig', 'grab-b2b-data', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'get-default-trade-questions', 'grab-form-helpers', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images', 'grab-global-images', 'js-lint'];
 		}
 		runSequence(...sequenceOpts, () => {
 			// Run a BrowserSync server

package/gulp-tasks/tasks.js

@@ -28,6 +28,17 @@ module.exports = function() {
 			}
 		},
 
+		'grab-b2b-data': {
+			subtasks: [],
+			func: function(opts) {
+				if ('undefined' === typeof opts.gulpTasksFolderPath) {
+					opts.gulpTasksFolderPath = '.';
+				}
+
+				return require(opts.gulpTasksFolderPath + '/grab-b2b-data')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
+			}
+		},
+
 		// Grab html files from CDN so they can be swapped into build
 		'grab-cdn': {
 			subtasks: [],

package/gulp-tasks/templates.js

@@ -100,8 +100,6 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	// Apply seasonal updates
 	applySeasonalUpdates();
 
-	var templatesData = Object.assign(commonData(), qsFooterData(siteData), quoteFooterData(siteData), siteData, { isLocal, nodeEnv, assetsPath, buildPath });
-
 	// This is helper function to evaluate JS expressions
 	// in Handlebars, e.g. for conditions
 	var handlebarsX = function(expression, context) {
@@ -331,7 +329,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		return steps;
 	};
 
-	var getDefaultFormFieldConfig = async function(folder) {
+	var getDefaultFormFieldConfig = async function(folder, templatesData) {
 		console.time('Finished fetch-default-form-config after');
 		console.log('Starting fetch-default-form-config: ');
 		await new Promise((resolve) => {
@@ -354,7 +352,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		console.timeEnd('Finished fetch-default-form-config after');
 	};
 
-	var fetchTcpaFromSitegenie = async function() {
+	var fetchTcpaFromSitegenie = async function(templatesData) {
 		const website = templatesData.website_name;
 		const c_level = templatesData.cLevel ? templatesData.cLevel : 'default';
 		const affiliateKey = templatesData.affiliateKey ? templatesData.affiliateKey : 0;
@@ -391,7 +389,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		console.timeEnd('Finished fetch-tcpa-from-sitegenie after');
 	};
 
-	var getConsentCaptureLanguage = async function() {
+	var getConsentCaptureLanguage = async function(templatesData) {
 		const requestPromise = (url) => {
 			return new Promise((resolve, reject) => {
 				request(url, (error, xhr, response) => {
@@ -456,21 +454,31 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	};
 
 	return async function() {
+		var templatesData = Object.assign(commonData(), qsFooterData(siteData), quoteFooterData(siteData), siteData, { isLocal, nodeEnv, assetsPath, buildPath });
+
+		// Ensure B2B data is explicitly included in templatesData
+		if (siteData.leadForm) {
+			templatesData.leadForm = siteData.leadForm;
+		}
+		if (siteData.trades) {
+			templatesData.trades = siteData.trades;
+		}
+
 		if (Object.keys(siteData).length > 0) {
 			if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
 				if (templatesData.siteData && templatesData.siteData.useAccessibleConfig) {
-					await getDefaultFormFieldConfig('accessible-components');
+					await getDefaultFormFieldConfig('accessible-components', templatesData);
 				} else {
-					await getDefaultFormFieldConfig('shared-components');
+					await getDefaultFormFieldConfig('shared-components', templatesData);
 				}
 			}
 
 			if (!templatesData.tcpaText && templatesData.primary_trade) {
-				await fetchTcpaFromSitegenie();
+				await fetchTcpaFromSitegenie(templatesData);
 			}
 
 			if (!templatesData.consentCapture) {
-				await getConsentCaptureLanguage();
+				await getConsentCaptureLanguage(templatesData);
 			}
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mod-build",
-	"version": "3.7.35-beta.1",
+	"version": "3.7.35",
 	"description": "Share components for S3 sites.",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1",

package/src/scripts/update-media-specific-gtm.js

@@ -1,27 +0,0 @@
-const trafficChannels = window.updateMediaSpecificGtm;
-// trafficChannels is an array of media channels to enable this feature, e.g. ['sem', 'avm'] - we are going to remove this param after testing
- const gtmContainers = {
-    'sem': 'GTM-5WM2R5WC',
-    'avm': 'GTM-TBJV3H',
-    'pub': 'GTM-TBJV3H'
-};
-const urlParams = new URLSearchParams(window.location.search);
-const queryParams = Object.fromEntries(urlParams.entries());
-const url = window.location.href.replace(window.location.hash, '');
-const hasSemIdentifiers = url.includes('gclid') || url.includes('msclkid') || url.includes('=SEM') || url.includes('=sem');
-// const hasQuadlink = 'quadlink' in queryParams; - keeping it for future use
-const hasCCIDorCLK = 'ccid' in queryParams || 'clk' in queryParams;
-const hasAVMParam = queryParams.channel && queryParams.channel.toLowerCase() === 'avm';
-let mediaChannel = 'pub';
-
-if (hasAVMParam) {
-    mediaChannel = 'avm';
-}
-
-if (hasSemIdentifiers && !hasCCIDorCLK && !hasAVMParam) {
-    mediaChannel = 'sem';
-}
-
-if (trafficChannels.includes(mediaChannel) && gtmContainers[mediaChannel]) {
-    window.gtm_container_ID = gtmContainers[mediaChannel];
-}