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

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/cache-bust.js

@@ -3,7 +3,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings) {
 	return function() {
 		return gulp.src(siteSettings.distFolder + '/**')
 			.pipe(gulpPlugins.revAll.revision({
-				dontSearchFile: [/(resources)\/.*/],
+				dontSearchFile: [/(resources)\/.*/, /(scripts\/components)\/.*/],
 				dontRenameFile: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g, /(resources)\/.*/],
 				dontUpdateReference: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g, /(resources)\/.*/],
 				transformFilename: function (file, hash) {

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.4",
   "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) {