Skip to content
This repository has been archived by the owner on Nov 13, 2023. It is now read-only.

Template v2 release fixes #926

Merged
merged 4 commits into from
Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion express/blocks/template-list/breadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions express/scripts/all-templates-metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ 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);
allTemplatesMetadata = resp?.data;

// 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
Expand Down
13 changes: 13 additions & 0 deletions express/scripts/content-replace.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();
}
Expand Down
6 changes: 3 additions & 3 deletions express/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down