mod-build 3.6.53 → 3.6.55

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 3.6.55
+- Added conditional to check if `siteData` is empty — so our  `fetchTcpaFromSitegenie()` and `getDefaultFormFieldConfig()` functions won't try to run on modify.modernize.com
+
+## 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
@@ -8,7 +15,6 @@
 
 - Added `templatesData.primary_trade` conditional to the  `fetchTcpaFromSitegenie()` function so it won't try to run on quote/home-remodel
 
-
 ## 3.6.50
 
 - Added functionality in `templates.js` to grab the tcpa from sitegenie at build time

package/gulp-tasks/templates.js

@@ -242,12 +242,14 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	};
 
 	return async function() {
-		if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
-			await getDefaultFormFieldConfig();
-		}
-
-		if (!templatesData.tcpaText && templatesData.primary_trade) {
-			await fetchTcpaFromSitegenie();
+		if (Object.keys(siteData).length > 0) {
+			if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
+				await getDefaultFormFieldConfig();
+			}
+	
+			if (!templatesData.tcpaText && templatesData.primary_trade) {
+				await fetchTcpaFromSitegenie();
+			}
 		}
 
 		return gulp.src([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.53",
+  "version": "3.6.55",
   "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();