mod-build 3.6.40-beta.3 → 3.6.40-beta.5

package/CHANGELOG.md

@@ -1,8 +1,7 @@
 # Changelog
 
 ## 3.6.40
-
-- added functionality to fetch & merge default form filed config in templateData
+- Adding tree services to valid list of trade parameter values
 
 ## 3.6.39
 

package/gulp-tasks/grab-shared-scripts.js

@@ -27,7 +27,8 @@ function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
     .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/head'));
 }
 function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
-  const resourcePath = isQuotePageOrUseRelativePath ? '{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts' : '/resources/scripts';
+  console.log('>> STARTING Replacing Foot Asset Scripts');
+	const resourcePath = isQuotePageOrUseRelativePath ? '{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts' : '/resources/scripts';
   return gulp.src(siteSettings.srcFolder + '/shared-components/foot-assets/foot-assets.html')
   .pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"|"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/mod-form.*?)js"|"(?:(?!"|")[\s\S])+(qs-form.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/form.*?)js"/g, function(match) {
       if (match.includes('mod-form')) {
@@ -42,9 +43,12 @@ function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
         return `"${resourcePath}/mod-utils/${fileNames.modUtilsFileName}"`;
       } else if (match.includes('footer-component')) {
         return `"${resourcePath}/footer/${fileNames.footerComponentJsFileName}"`;
-      } 
+      }
     }))
-    .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'));
+    .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'))
+    .on('end', function() {
+			console.log('>> FINISHED Replacing Foot Asset Scripts');
+		});
 }
 function replaceAbandonmentJsCssSrc(gulp, gulpPlugins, siteSettings, siteData) {
   const jsResourcePath = isQuotePageOrUseRelativePath ? 'resources/scripts/abandonment/' : '/resources/scripts/abandonment/';
@@ -107,36 +111,39 @@ function getResource(url, config = {}, fn, fnArray) {
         fileNames[config.fileName] = path.basename(file.path);
       }))
       .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
-      .on('finish', resolve);
+      .on('finish', function(){
+				console.log(fileNames[config.fileName]);
+				resolve();
+			});
   })
-    .then(() => {
-      if (!config.mapUrl) { return false };
-      const file = getFileFromURL(config.mapUrl);
-      return new Promise((resolve) => {
-        request(`${resourceURL}/${config.mapUrl}`)
-          .on('response', (resp) => {
-            if (resp.statusCode !== 200) {
-              throw new Error(`${resp.statusCode} Error while fetching ${file}`);
-            } else {
-              if (typeof fn === 'function') {
-                fn.call(null, config.gulp, config.gulpSettings, config.siteSettings, config.siteData);
-              }
+  .then(() => {
+    if (!config.mapUrl) { return false };
+    const file = getFileFromURL(config.mapUrl);
+    return new Promise((resolve) => {
+      request(`${resourceURL}/${config.mapUrl}`)
+        .on('response', (resp) => {
+          if (resp.statusCode !== 200) {
+            throw new Error(`${resp.statusCode} Error while fetching ${file}`);
+          } else {
+            if (typeof fn === 'function') {
+              fn.call(null, config.gulp, config.gulpSettings, config.siteSettings, config.siteData);
             }
-          })
-          .pipe(source(file))
-          .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
-          .on('finish', resolve);
-      });
-    })
-    .then(() => {
-      if (fnArray && fnArray.length) {
-        fnArray.map(function(fn) {
-          if (typeof fn === 'function') {
-            fn.call(null, config.gulp, config.gulpSettings, config.siteSettings, config.siteData)
           }
-        });
-      }
+        })
+        .pipe(source(file))
+        .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
+        .on('finish', resolve);
     });
+  })
+  .then(() => {
+    if (fnArray && fnArray.length) {
+      fnArray.map(function(fn) {
+        if (typeof fn === 'function') {
+          fn.call(null, config.gulp, config.gulpSettings, config.siteSettings, config.siteData)
+        }
+      });
+    }
+  });
 }
 const TASKS = {
   copyModalytics: {
@@ -206,7 +213,7 @@ const TASKS = {
       dest: 'scripts/mod-form',
       mapUrl: 'mod-form/qs-form.min.js.map',
     },
-    srcReplaceFn: replaceFootAssetScripts,
+    srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
   copyHomeownerForm: {
@@ -216,7 +223,7 @@ const TASKS = {
       dest: 'scripts/mod-form/form',
       mapUrl: 'mod-form/form/homeowner.min.js.map',
     },
-    srcReplaceFn: null,
+    srcReplaceFn: replaceFootAssetScripts,
     additionalSrcReplaceFns: []
   },
   copyModFooterComponentStyles: {

package/gulp-tasks/templates.js

@@ -1,5 +1,4 @@
 var merge = require('lodash.merge');
-var request = require('request');
 
 module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	// Merge site's data with shared data
@@ -145,7 +144,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			fn: function(obj) {
 				var output = '';
 				var ignoreKeys = Array.prototype.slice.call(arguments, 1, -1);
-
+				
 				for (var key in obj.attributes) {
 					if (ignoreKeys.indexOf(key) === -1) {
 						if (typeof obj.attributes[key] !== 'object') {
@@ -166,36 +165,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		}
 	];
 
-	var getDefaultFormFieldConfig = async function() {
-		const siteData = templatesData;
-		await new Promise((resolve) => {
-			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/shared-components/steps/defaultFormFieldConfig.json`, async function(err, xhr, response) {
-				if (xhr.statusCode !== 200) {
-					throw new Error(`${xhr.statusCode}: Error while fetching shared-components/defaultFormFieldConfig.json`);
-				}
-				if (!siteData.steps) {
-					throw new Error('steps not found!');
-				}
-				response = await JSON.parse(response);
-				siteData.steps.items.forEach(item => {
-					item.fields = item.fields.map(field => {
-						if (field.name && response[field.name]) {
-							field = Object.assign(response[field.name], field);
-						}
-						return field;
-					});
-				});
-				resolve();
-			})
-		});
-		return siteData;
-	};
-
-	return async function() {
-		if (!templatesData.doNotUseDefaultFieldConfig) {
-			await getDefaultFormFieldConfig();
-		}
-
+	return function() {
 		return gulp.src([
 			siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/**/*.html',
 			'!' + siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/_partials/**/*.html'

package/package.json

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

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

@@ -17,7 +17,7 @@
  */
 
 modForm.getTradeFromUrl = function() {
-	var trades = ['solar', 'roofing', 'windows', 'hvac', 'siding', 'gutters', 'bathrooms', 'kitchen-remodeling', 'cabinets', 'home-security', 'home-warranty', 'medical-alerts', 'stair-lifts', 'walk-in-tubs', 'hot-tubs', 'flooring'],
+	var trades = ['solar', 'roofing', 'windows', 'hvac', 'siding', 'gutters', 'bathrooms', 'kitchen-remodeling', 'cabinets', 'home-security', 'home-warranty', 'medical-alerts', 'stair-lifts', 'walk-in-tubs', 'hot-tubs', 'flooring', 'tree-services'],
 		queryParamString = (location.search.slice(1) !== '') ? location.search.slice(1) : '',
 		params = queryParamString.toLowerCase(),
 		filteredTrades = trades.filter(function(trade) {