mod-build 3.4.12-beta.3 → 3.4.13-beta.3

package/package.json

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

package/src/scripts/qs-form.js

@@ -422,6 +422,7 @@ modForm.initQSForm = function() {
 	this.opts.websiteName = window.location.host;
 	this.opts.resultsPage = (this.opts.resultsPage ? this.opts.resultsPage : '/my/results/');
 	this.opts.errorRedirectPath = (this.opts.errorRedirectPath ? this.opts.errorRedirectPath : '/my/results/');
+	this.opts.landingPage = window.location.hostname + window.location.pathname;
 	this.opts.quadLinkParams = {};
 
 	// We check if there's a quad link on the query string
@@ -672,13 +673,14 @@ modForm.submitFormDataToQSApi = function(formData, successCallback, errorCallbac
  */
 modForm.processQSFormSubmitSuccess = function(response, xhr) {
 	var cookieData,
-		responseData = response.RESPONSE;
+		responseData = response.RESPONSE,
+		dataCaptureKey = responseData.DCK;
+
+	window.projectId = responseData.HASHEDDCK;
 
 	// If submission was succesful
-	if (responseData.DCK != null && xhr.status === 200) {
-		var dataCaptureKey = responseData.DCK,
-			clickKeyUUID = this.opts.formData.CLK,
-			landingPage = window.location.hostname + window.location.pathname;
+	if (dataCaptureKey != null && xhr.status === 200) {
+		var clickKeyUUID = this.opts.formData.CLK;
 
 		// Setting GA User ID and several custom dimensions after a successful form submit request
 		if (typeof dataLayer !== 'undefined') {
@@ -704,7 +706,7 @@ modForm.processQSFormSubmitSuccess = function(response, xhr) {
 			// eslint-disable-next-line camelcase
 			project_id: dataCaptureKey,
 			// eslint-disable-next-line camelcase
-			form_path: landingPage,
+			form_path: this.opts.landingPage,
 			qsclickkey: clickKeyUUID
 		});
 
@@ -756,16 +758,16 @@ modForm.processQSFormSubmitSuccess = function(response, xhr) {
 			}
 		}
 
-		// Set results page to HRC if the site is eligible
-		if (this.isQsSiteEligibleForHrc() && response.RESPONSE.HASHEDDCK) {
-			window.projectId = response.RESPONSE.HASHEDDCK;
+		// Set results page to HRC if the site is eligible, there's a DCK
+		// and the results page opt is not defined yet (emerging trades have results page defined and should not redirect to the HRC)
+		if (this.isQsSiteEligibleForHrc() && window.projectId && !this.opts.resultsPage) {
 			this.opts.resultsPage = this.getProjExUrl();
-			this.opts.resultsPage += (this.opts.resultsPage.indexOf('?') < 0 ? '?' : '&') + 'DCK=' + response.RESPONSE.DCK;
+			this.opts.resultsPage += (this.opts.resultsPage.indexOf('?') < 0 ? '?' : '&') + 'DCK=' + dataCaptureKey;
+		}
 
-			// Append TY to HRC URL for QS tracking purpose
-			if (typeof this.opts.appendTyToHrcUrl !== 'undefined' && this.opts.appendTyToHrcUrl === true) {
-				this.opts.resultsPage += '&' + (responseData.MATCHES.length > 0 ? 'ThankYou' : 'Sorry');
-			}
+		// Append TY to HRC URL for QS tracking purpose
+		if (typeof this.opts.appendTyToHrcUrl !== 'undefined' && this.opts.appendTyToHrcUrl === true) {
+			this.opts.resultsPage += '&' + (responseData.MATCHES.length > 0 ? 'ThankYou' : 'Sorry');
 		}
 
 		// Renamed thankyou page to results page to be more explicit that TYP is dying
@@ -793,11 +795,24 @@ modForm.processQSFormSubmitSuccess = function(response, xhr) {
  * @returns {Boolean}
  */
 modForm.isQsSiteEligibleForHrc = function() {
-	var eligibleDomains = [
-		'modernize.local',
-		'qa.modernize.com',
-		'modernize.com'
-	];
-
-	return eligibleDomains.indexOf(this.getDefaultSiteByDomain()) > -1;
+	var landingPage = this.opts.landingPage,
+		eligibleDomains = [
+			'modernize.local',
+			'qa.modernize.com',
+			'modernize.com'
+		],
+		nonEligiblePaths = [
+			'gutter-guards',
+			'home-warranty',
+			'home-security',
+			'medicalalerts',
+			'bathandshowerremodel'
+		];
+
+	var isEligible = (eligibleDomains.indexOf(this.getDefaultSiteByDomain()) > -1 &&
+		!nonEligiblePaths.some(function(path) {
+			return landingPage.indexOf(path) > -1;
+		}));
+
+	return isEligible;
 };