mod-build 3.6.80-beta.2 → 3.6.80-beta.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.80
+
+- Making sure the abandonment.min.js gets copied to the right folder path (needs to copy to /abandonment/accessible/ if the site is indeed using the accessible version). This will ensure our shared-resource deployments trigger the files correctly.
+
 ## 3.6.79
 
 - Adding a handlebars helper to see if the value is an array or not

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

@@ -17,6 +17,7 @@ const fileNames = {
   callrailFileName: ''
 };
 var isQuotePageOrUseRelativePath = false;
+var useAccessibleComponents = false;
 var resourceURL = '';
 var pathSubdirectory = '';
 var componentFolderPath = '';
@@ -48,10 +49,12 @@ function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
     });
 }
 function replaceAbandonmentJsCssSrc(gulp, gulpPlugins, siteSettings, siteData) {
+	const includeAccessibleFolder = useAccessibleComponents ? 'accessible/' : '';
+	const abandonmentJsRegex = useAccessibleComponents ? /"(?:(?!"|")[\s\S])+(abandonment\/accessible\/abandonment.*?)js"/ : /"(?:(?!"|")[\s\S])+(abandonment\/abandonment.*?)js"/;
   const jsResourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}resources/scripts/abandonment/` : '/resources/scripts/abandonment/';
   const cssResourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}resources/styles/components/abandonment/` : '/resources/styles/components/abandonment/';
   return gulp.src(siteSettings.srcFolder + '/templates/abandonment/*.html')
-    .pipe(replace(/"(?:(?!"|")[\s\S])+(abandonment\/abandonment.*?)js"/, `"${jsResourcePath}${fileNames.abandonmentJsFileName}"`))
+    .pipe(replace(abandonmentJsRegex, `"${jsResourcePath}${includeAccessibleFolder}${fileNames.abandonmentJsFileName}"`))
     .pipe(replace(/"(?:(?!"|")[\s\S])+(components\/abandonment\/abandonment.*?)css"/, `"${cssResourcePath}${fileNames.abandonmentStylesFileName}"`))
     .pipe(gulp.dest(siteSettings.srcFolder + '/templates/abandonment'));
 }
@@ -238,9 +241,9 @@ const TASKS = {
 module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
   const { isLocal } = siteSettings
   const isQuotePage = siteData.siteData && siteData.siteData.isQuotePage || siteData && siteData.isQuotePage;
-  const useAccessibleComponents = siteData.siteData && siteData.siteData.useAccessibleConfig || siteData && siteData.useAccessibleConfig;
   const useRelativePathForResources = siteData.siteData && siteData.siteData.useRelativePathForResources || siteData && siteData.useRelativePathForResources;
-  componentFolderPath = useAccessibleComponents === true ? 'accessible-components' : 'shared-components';
+	useAccessibleComponents = siteData.siteData && siteData.siteData.useAccessibleConfig || siteData && siteData.useAccessibleConfig;
+	componentFolderPath = useAccessibleComponents === true ? 'accessible-components' : 'shared-components';
   isQuotePageOrUseRelativePath = isQuotePage === true || useRelativePathForResources === true;
   resourceURL = `https://${siteSettings.nodeEnv}/quote/resources`;
   const isPathSubdirectory = siteData.siteData && siteData.siteData.pathSubdirectory || siteData && siteData.pathSubdirectory;
@@ -259,6 +262,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
           if (useAccessibleComponents === true) {
             if (task.url.includes('abandonment.min.js')) {
               task.url = 'shared-resources/scripts/abandonment/accessible/abandonment.min.js';
+							task.config.dest = 'scripts/abandonment/accessible';
               task.config.mapUrl = 'shared-resources/scripts/abandonment/accessible/abandonment.min.js.map';
             }
           }

package/package.json

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

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

@@ -430,10 +430,11 @@ modForm.isFreeEmail = function(email) {
  * @returns {Boolean} - true if meets CXP criteria
  */
 modForm.isSupportedByCxp = function(formData) {
-	const cxpUnsupportedTrades = ['Solar', 'Water Filtration'];
+	if (formData.primaryProjectClass === 'Solar') {
+	  return false;
+	}
 
-	const isUnsupportedTrade = cxpUnsupportedTrades.indexOf(formData.primaryProjectClass) > -1;
-	return !isUnsupportedTrade;
+	return true;
 };
 
 /**