From 3b8539d1b7ce1aa3c319a24c02ef0dc4e9224a0e Mon Sep 17 00:00:00 2001 From: Qiyun Dai Date: Mon, 26 Jun 2023 12:22:52 -0500 Subject: [PATCH 1/3] update fetch limit to point at different cache --- express/scripts/all-templates-metadata.js | 6 +++--- express/scripts/scripts.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/express/scripts/all-templates-metadata.js b/express/scripts/all-templates-metadata.js index 4f94f1ac7..dc5186f24 100644 --- a/express/scripts/all-templates-metadata.js +++ b/express/scripts/all-templates-metadata.js @@ -31,9 +31,9 @@ export default async function fetchAllTemplatesMetadata() { let sheet; if (['yes', 'true', 'on'].includes(dev) && env?.name === 'stage') { - sheet = '/templates-dev.json?sheet=seo-templates&limit=10000'; + sheet = '/templates-dev.json?sheet=seo-templates&limit=100000'; } else { - sheet = `${urlPrefix}/express/templates/default/metadata.json?limit=10000`; + sheet = `${urlPrefix}/express/templates/default/metadata.json?limit=100000`; } let resp = await memoizedFetchUrl(sheet); @@ -41,7 +41,7 @@ export default async function fetchAllTemplatesMetadata() { // TODO: remove the > 1 logic after publishing of the split metadata sheet if (!(allTemplatesMetadata && allTemplatesMetadata.length > 1)) { - resp = await memoizedFetchUrl('/express/templates/content.json?sheet=seo-templates&limit=10000'); + resp = await memoizedFetchUrl('/express/templates/content.json?sheet=seo-templates&limit=100000'); allTemplatesMetadata = resp?.data?.map((p) => ({ ...p, // TODO: backward compatibility. Remove when we move away from helix-seo-templates diff --git a/express/scripts/scripts.js b/express/scripts/scripts.js index 6c38125fc..9a60e6174 100644 --- a/express/scripts/scripts.js +++ b/express/scripts/scripts.js @@ -1773,13 +1773,13 @@ export async function fetchFloatingCta(path) { } if (['yes', 'true', 'on'].includes(dev) && env && env.name === 'stage') { - spreadsheet = '/express/floating-cta-dev.json?limit=10000'; + spreadsheet = '/express/floating-cta-dev.json?limit=100000'; } else { - spreadsheet = '/express/floating-cta.json?limit=10000'; + spreadsheet = '/express/floating-cta.json?limit=100000'; } if (experimentStatus === 'active') { - const expSheet = '/express/experiments/floating-cta-experiments.json?limit=10000'; + const expSheet = '/express/experiments/floating-cta-experiments.json?limit=100000'; floatingBtnData = await fetchFloatingBtnData(expSheet); } From d2b89b6c5a9cd0a387cb0b3d7a0e0ed5be93621e Mon Sep 17 00:00:00 2001 From: Qiyun Dai Date: Mon, 26 Jun 2023 12:23:08 -0500 Subject: [PATCH 2/3] adding missed default content replacement --- express/scripts/content-replace.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/express/scripts/content-replace.js b/express/scripts/content-replace.js index 4335c09dd..ec2802af9 100644 --- a/express/scripts/content-replace.js +++ b/express/scripts/content-replace.js @@ -178,6 +178,7 @@ await (async function updateMetadataForTemplates() { const templateList = document.querySelector('.template-list.fullwidth.apipowered'); const templateX = document.querySelector('.template-x'); const browseByCat = document.querySelector('.browse-by-category'); + const seoNav = document.querySelector('.seo-nav'); if (templateList) { await replaceDefaultPlaceholders(templateList); @@ -187,6 +188,18 @@ await (async function updateMetadataForTemplates() { await replaceDefaultPlaceholders(templateX); } + if (seoNav) { + if (getMetadata('top-templates-title')) { + seoNav.innerHTML = seoNav.innerHTML.replace('Default top templates title', getMetadata('top-templates-title')); + } + + if (getMetadata('top-templates-text')) { + seoNav.innerHTML = seoNav.innerHTML.replace('Default top templates text', getMetadata('top-templates-text')); + } else { + seoNav.innerHTML = seoNav.innerHTML.replace('Default top templates text', ''); + } + } + if (browseByCat && !['yes', 'true', 'on', 'Y'].includes(getMetadata('show-browse-by-category'))) { browseByCat.remove(); } From 5ef5b9fbf2b9859770eb13298baf6f689995cd36 Mon Sep 17 00:00:00 2001 From: Qiyun Dai Date: Mon, 26 Jun 2023 12:32:21 -0500 Subject: [PATCH 3/3] fixing legacy logic --- express/blocks/template-list/breadcrumbs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/express/blocks/template-list/breadcrumbs.js b/express/blocks/template-list/breadcrumbs.js index 2797e6db6..ae9da74de 100644 --- a/express/blocks/template-list/breadcrumbs.js +++ b/express/blocks/template-list/breadcrumbs.js @@ -104,7 +104,7 @@ function getCrumbsForSEOPage(templatesUrl, allTemplatesMetadata, taskCategories, export default async function getBreadcrumbs() { // for backward compatibility // TODO: remove this check after all content are updated - if (getMetadata('sheet-powered') !== 'Y') { + if (getMetadata('sheet-powered') !== 'Y' || !document.querySelector('.search-marquee')) { return null; } const { origin, pathname } = window.location;