mod-build 3.6.52 → 3.6.54

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.6.54
+
+- swapping out `modUtils.getHeapCookieData()` in the old (but still used) mod-form-contractor.js
+
+## 3.6.53
+
+- Since we moved our footer modal templates to live in /quote/resources/shared-resources/, we needed to update `grab-cdn` gulp task to copy them from the updated path
+
 ## 3.6.52
 
 - Added `templatesData.primary_trade` conditional to the  `fetchTcpaFromSitegenie()` function so it won't try to run on quote/home-remodel

package/gulp-tasks/grab-cdn.js

@@ -3,7 +3,7 @@ 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) {
-	var url = `https://${siteSettings.nodeEnv}/quote/resources/mod-site${inputPath}`;
+	var url = `https://${siteSettings.nodeEnv}${inputPath}`;
 
 	return new Promise(resolve => { // eslint-disable-line no-undef
 		request(url)
@@ -30,30 +30,27 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		// key: inputPath, value: destPath
 
 		externalResources = {
-			'/templates/scripts/trusted-form.html': ['/templates/scripts/', 'trusted-form.html']
+			'/quote/resources/mod-site/templates/scripts/trusted-form.html': ['/templates/scripts/', 'trusted-form.html']
 		};
 
 		// grab footer modals and place under the resources
 		Object.assign(externalResources, {
-			'/templates/modals/about/': ['/resources/templates/modals/about/', 'index.html'],
-			'/templates/modals/privacy/': ['/resources/templates/modals/privacy/', 'index.html'],
-			'/templates/modals/terms/': ['/resources/templates/modals/terms/', 'index.html'],
-			'/templates/modals/contact-us/': ['/resources/templates/modals/contact-us/', 'index.html'],
-			'/templates/modals/faq/': ['/resources/templates/modals/faq/', 'index.html']
+			'/quote/resources/shared-resources/templates/modals/about/': ['/resources/templates/modals/about/', 'index.html'],
+			'/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']
 		})
 
-		Object.assign(externalResources, {'/templates/scripts/jornaya.html': ['/templates/scripts/', 'jornaya.html']});
+		Object.assign(externalResources, {'/quote/resources/mod-site/templates/scripts/jornaya.html': ['/templates/scripts/', 'jornaya.html']});
 
 		if (isModWhiteLabel || domainHasModernize) {
-			Object.assign(externalResources, {'/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
 		const remoteFilesForLocalDev = {
-			'/scripts/mod-form.js': ['/temp/scripts/', 'mod-form.js'],
-			'/scripts/mod-utils.js': ['/temp/scripts/', 'mod-utils.js'],
-			'/scripts/qs-form.js': ['/temp/scripts/', 'qs-form.js'],
-			'/scripts/vendor/maxmind-geoip2.js': ['/temp/scripts/', 'maxmind-geoip2.js']
+			'/quote/resources/mod-site/scripts/vendor/maxmind-geoip2.js': ['/temp/scripts/', 'maxmind-geoip2.js']
 		};
 
 		if (!nodeEnv) {

package/package.json

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

package/src/scripts/mod-form-contractor.js

@@ -137,17 +137,21 @@ modForm.mapProjectValue = function(trade) {
  */
 modForm.preprocessContractorFormData = function(formData, currentStep) {
 	if (currentStep === 0) {
-		var heapCookieData = modUtils.getHeapCookieData(),
+		var heapCookie = window.heap && window.heap.appid ? window.modUtils.getCookie('_hp2_id.' + window.heap.appid) : null,
 			attributionKeys = modUtils.getSupportedTrackingParams();
 
 		formData.primaryProjectClass = this.mapProjectValue(formData.primaryProjectClass);
 
-		// Check heap cookie for tracking params and append to form
-		$.each(heapCookieData, function(name, value) {
-			if (attributionKeys.indexOf(name) > -1) {
-				formData[name] = value;
-			}
-		});
+		if (heapCookie) {
+			var heapCookieData = JSON.parse(decodeURIComponent(heapCookie));
+
+			// Check heap cookie for tracking params and append to form
+			$.each(heapCookieData, function(name, value) {
+				if (attributionKeys.indexOf(name) > -1) {
+					formData[name] = value;
+				}
+			});
+		}
 
 		// Check Eloqua GUID cookie value and add it to formData
 		var elqGUID = this.elqGetGuidCookieValue();