mod-build 4.0.94-beta.5 → 4.0.94

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 4.0.94
 
-- Adding default quadlink data to the window object
+- Prefer site config `brandedSiteIdentifiers.publicKey` over the remote branded-site-identifiers lookup
 
 ## 4.0.93
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mod-build",
-	"version": "4.0.94-beta.5",
+	"version": "4.0.94",
 	"description": "Share components for S3 sites.",
 	"type": "module",
 	"scripts": {

package/src/scripts/globals.js

@@ -4,7 +4,6 @@ import { showUtilityProviders } from './default/show-utility-providers.js';
 
 function globalFunctions(config) {
 	window.gtm_container_ID = config.gtm_container_ID;
-	window.defaultQuadlinkData = config.defaultQuadlinkData;
 	const { domain, pathSubdirectory } = config;
 	if (domain) {
 		if (domain.includes('/')) {

package/tasks/serve.js

@@ -5,7 +5,6 @@ import grabSharedComponents from './grab-shared-components.js';
 import grabSharedScripts from './grab-shared-scripts.js';
 import grabCdn from './grab-cdn.js';
 import grabB2BData from './grab-b2b-data.js';
-import grabDefaultQuadLinkValues from './grab-default-quad-link-values.js';
 import getDefaultTradeQuestions from './get-default-trade-questions.js';
 import grabFormHelpers from './grab-form-helpers.js';
 import grabJSDoc from './grab-jsdoc.js';
@@ -18,10 +17,8 @@ export async function startModBuild(config) {
 	createStylelintFile();
 	await grabGlobalFonts(config);
 	await grabB2BData(config);
-	await grabDefaultQuadLinkValues(config);
 	await grabCdn(config);
 	await getDefaultTradeQuestions(config);
-	console.log(config.defaultQuadlinkData);
 	await Promise.all([
 		grabSharedComponents(config),
 		grabFormHelpers(config),
@@ -31,5 +28,4 @@ export async function startModBuild(config) {
 		await grabSharedScripts(config);
 	});
 	await updateConfig(config);
-
 }

package/tasks/templates.js

@@ -202,23 +202,30 @@ const getConsentCaptureLanguage = async function(config, tempConfig) {
 				let consentCaptureObject = await resp.json(),
 					service = config.service ? config.service.toLowerCase().replace('_', ' ') : config.primary_trade.toLowerCase().replace('_', ' ');
 
-				const brandedSiteIdentifiersResp = await fetch(`https://${defaultSettings.nodeEnv}/quote/resources/mod-site/data/branded-site-identifiers.json`);
-				if (brandedSiteIdentifiersResp.status !== 200) {
-					throw new Error(`${brandedSiteIdentifiersResp.status}: Error while fetching branded-site-identifiers.json`);
-				}
+				if (config.isBranded) {
+					let brandedSiteIdentifiersData = {};
 
-				const brandedSiteIdentifiersData = await brandedSiteIdentifiersResp.json();
+					if (!config.brandedSiteIdentifiers?.publicKey) {
+						const brandedSiteIdentifiersResp = await fetch(`https://${defaultSettings.nodeEnv}/quote/resources/mod-site/data/branded-site-identifiers.json`);
+						if (brandedSiteIdentifiersResp.status !== 200) {
+							throw new Error(`${brandedSiteIdentifiersResp.status}: Error while fetching branded-site-identifiers.json`);
+						}
+
+						brandedSiteIdentifiersData = await brandedSiteIdentifiersResp.json();
+					}
 
-				if (config.isBranded) {
 					const websiteName = config.website_name.toLowerCase(),
 						companyName = config.company_name,
 						apiDomain = 'https://form-service-hs.qnst.com/';
 
 					let apiUrl = '';
+					let publicKey = config.brandedSiteIdentifiers?.publicKey || null;
 
-					if (brandedSiteIdentifiersData[websiteName] && (brandedSiteIdentifiersData[websiteName].publicKey || brandedSiteIdentifiersData[websiteName][companyName] && brandedSiteIdentifiersData[websiteName][companyName].publicKey)) {
-						const publicKey = brandedSiteIdentifiersData[websiteName][companyName] ? brandedSiteIdentifiersData[websiteName][companyName].publicKey : brandedSiteIdentifiersData[websiteName].publicKey;
+					if (!publicKey && brandedSiteIdentifiersData[websiteName] && (brandedSiteIdentifiersData[websiteName].publicKey || brandedSiteIdentifiersData[websiteName][companyName] && brandedSiteIdentifiersData[websiteName][companyName].publicKey)) {
+						publicKey = brandedSiteIdentifiersData[websiteName][companyName] ? brandedSiteIdentifiersData[websiteName][companyName].publicKey : brandedSiteIdentifiersData[websiteName].publicKey;
+					}
 
+					if (publicKey) {
 						apiUrl = `${apiDomain}utils/vendor-display-name?publicKey=${encodeURIComponent(publicKey)}`;
 						const getBrandedDisplayName = await fetch(apiUrl);
 						if (getBrandedDisplayName.status !== 200) {

package/tasks/grab-default-quad-link-values.js

@@ -1,137 +0,0 @@
-import { defaultSettings } from '../src/data/config.js';
-import { createRetryFetch } from '../src/scripts/retry-fetch.js';
-
-const fetchWithRetry = createRetryFetch();
-const QUAD_LINK_VALUES_PATH = '/quote/resources/mod-site/data/default-quad-link-values.json';
-
-const MULTI_SERVICE_DOMAINS = [
-	'quotes.improvementcenter.com',
-	'callrestorationpro.com',
-	'modernize.com',
-	'powerhomedeals.com'
-];
-
-function getDomainLookupKey(config) {
-	const domain = config.website_name || config.domain;
-	return domain ? domain.toLowerCase() : null;
-}
-
-function normalizePage(config) {
-	const name = config.website_name || config.domain || '';
-	return name.replace(/(qa\.?|staging\.?|www\.?)/gi, '').toLowerCase();
-}
-
-function getPathSubdirectory(config) {
-	return config.pathSubdirectory || config.siteData?.pathSubdirectory || '';
-}
-
-function buildLandingPageWithNoQuery(page, pathSubdirectory) {
-	const pathPart = pathSubdirectory.replace(/^\/+|\/+$/g, '');
-	return pathPart ? `${page}/${pathPart}` : page;
-}
-
-function isQuadLinkLeaf(value) {
-	return value && typeof value === 'object' && Object.prototype.hasOwnProperty.call(value, 'c');
-}
-
-function isMultiServiceDomain(page) {
-	return MULTI_SERVICE_DOMAINS.some((domain) => page.indexOf(domain) > -1);
-}
-
-function getLastPathSegment(pathSubdirectory) {
-	const segment = pathSubdirectory.replace(/^\/+|\/+$/g, '').split('/').filter(Boolean).pop();
-	return segment ? segment.replace(/-/g, '') : '';
-}
-
-function resolveDefaultQuadlinkData(quadLinkValuesByDomain, config) {
-	const page = normalizePage(config);
-	const domainData = quadLinkValuesByDomain[page];
-
-	if (!domainData) {
-		return undefined;
-	}
-
-	if (isQuadLinkLeaf(domainData)) {
-		return domainData;
-	}
-
-	const pathSubdirectory = getPathSubdirectory(config);
-	const landingPageWithNoQuery = buildLandingPageWithNoQuery(page, pathSubdirectory);
-
-	if (page.includes('bestcompany')) {
-		const pathSegments = landingPageWithNoQuery.split('/');
-		let service = pathSegments[2];
-
-		if (!service) {
-			return undefined;
-		}
-
-		service = service.replace(/-/g, '');
-		return domainData[service];
-	}
-
-	if (isMultiServiceDomain(page)) {
-		if (landingPageWithNoQuery.indexOf('cost-calculator') > -1) {
-			const pathSegments = landingPageWithNoQuery.split('/');
-			let service = pathSegments[2]?.replace(/-/g, '') || 'default';
-			const costCalculator = domainData['cost-calculator'];
-
-			if (!costCalculator) {
-				return domainData.default;
-			}
-
-			service = typeof costCalculator[service] !== 'undefined' ? service : 'default';
-			return costCalculator[service];
-		}
-
-		let service = landingPageWithNoQuery.replace(/\/$/g, '').replace(/^(?:[^/]*\/)+/g, '');
-
-		if (typeof domainData[service] === 'undefined') {
-			const pathService = getLastPathSegment(pathSubdirectory);
-			service = typeof domainData[pathService] !== 'undefined' ? pathService : 'default';
-		}
-
-		return domainData[service];
-	}
-
-	return domainData;
-}
-
-export default async function grabDefaultQuadLinkValues(config) {
-	const { nodeEnv } = defaultSettings;
-
-	if (!nodeEnv) {
-		throw new Error('Missing environment variables. Did you start with gulp instead of npm run...?');
-	}
-
-	const lookupKey = getDomainLookupKey(config);
-	if (!lookupKey) {
-		console.warn('grab-default-quad-link-values: config.domain or config.website_name is required');
-		config.defaultQuadlinkData = {};
-		return;
-	}
-
-	const cachebuster = Math.round(Date.now() / 1000);
-	const url = `https://${nodeEnv}${QUAD_LINK_VALUES_PATH}?cb=${cachebuster}`;
-
-	console.log(`Fetching default quad link values from ${url}`);
-
-	const resp = await fetchWithRetry(url);
-	if (resp.status !== 200) {
-		throw new Error(`${resp.status}: Error while fetching ${url}`);
-	}
-
-	const quadLinkValuesByDomain = await resp.json();
-	const defaultQuadlinkData = resolveDefaultQuadlinkData(quadLinkValuesByDomain, config);
-
-	if (!defaultQuadlinkData) {
-		console.warn(`grab-default-quad-link-values: no quad link data resolved for "${lookupKey}" (pathSubdirectory: "${config.pathSubdirectory || ''}")`);
-		config.defaultQuadlinkData = {};
-		return;
-	}
-
-	config.defaultQuadlinkData = defaultQuadlinkData;
-	console.log(defaultQuadlinkData);
-	console.log(config.defaultQuadlinkData);
-	console.log(`grab-default-quad-link-values: resolved quad link data for "${lookupKey}" (pathSubdirectory: "${config.pathSubdirectory || ''}")`);
-}