From 3e6958c9b0695d9d528bd46da39a9cd4fdcf36c0 Mon Sep 17 00:00:00 2001 From: Sarah Schneider Date: Fri, 13 May 2022 12:46:52 -0400 Subject: [PATCH 1/3] new FM prop to suppress Early Access banner --- lib/frontmatter.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/frontmatter.js b/lib/frontmatter.js index a4e9fe1df2..42a7f55363 100644 --- a/lib/frontmatter.js +++ b/lib/frontmatter.js @@ -64,6 +64,10 @@ export const schema = { hidden: { type: 'boolean', }, + // specify whether an Early Access article should not have a header notice + hiddenNoBanner: { + type: 'boolean', + }, layout: { type: ['string', 'boolean'], enum: layoutNames, From 2962666b5562fa7e225c24046ec6a7f79d711ccb Mon Sep 17 00:00:00 2001 From: Sarah Schneider Date: Fri, 13 May 2022 12:47:11 -0400 Subject: [PATCH 2/3] update banner component --- components/context/MainContext.tsx | 2 ++ components/page-header/HeaderNotifications.tsx | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/context/MainContext.tsx b/components/context/MainContext.tsx index 3783e1e094..08974680f8 100644 --- a/components/context/MainContext.tsx +++ b/components/context/MainContext.tsx @@ -107,6 +107,7 @@ export type MainContextT = { fullTitle?: string introPlainText?: string hidden: boolean + hiddenNoBanner: boolean permalinks?: Array<{ languageCode: string relativePath: string @@ -171,6 +172,7 @@ export const getMainContext = (req: any, res: any): MainContextT => { ]) ), hidden: req.context.page.hidden || false, + hiddenNoBanner: req.context.page.hiddenNoBanner || false, }, enterpriseServerReleases: pick(req.context.enterpriseServerReleases, [ 'isOldestReleaseDeprecated', diff --git a/components/page-header/HeaderNotifications.tsx b/components/page-header/HeaderNotifications.tsx index b677cff4be..f27e53fbc7 100644 --- a/components/page-header/HeaderNotifications.tsx +++ b/components/page-header/HeaderNotifications.tsx @@ -21,7 +21,7 @@ type Notif = { export const HeaderNotifications = () => { const router = useRouter() const { currentVersion } = useVersion() - const { relativePath, allVersions, data, userLanguage, currentPathWithoutLanguage } = + const { relativePath, allVersions, data, userLanguage, currentPathWithoutLanguage, page } = useMainContext() const { languages } = useLanguages() const { t } = useTranslation('header') @@ -69,7 +69,7 @@ export const HeaderNotifications = () => { ...translationNotices, ...releaseNotices, // ONEOFF EARLY ACCESS NOTICE - (relativePath || '').includes('early-access/') + (relativePath || '').includes('early-access/') && !page.hiddenNoBanner ? { type: NotificationType.EARLY_ACCESS, content: t('notices.early_access'), From a9d3390c2fb1f71e99fa96c6a5d51f0582f24dac Mon Sep 17 00:00:00 2001 From: Sarah Schneider Date: Fri, 13 May 2022 16:35:33 -0400 Subject: [PATCH 3/3] change hiddenNoBanner to noEarlyAccessBanner --- components/context/MainContext.tsx | 4 ++-- components/page-header/HeaderNotifications.tsx | 2 +- lib/frontmatter.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/context/MainContext.tsx b/components/context/MainContext.tsx index 08974680f8..59755e4797 100644 --- a/components/context/MainContext.tsx +++ b/components/context/MainContext.tsx @@ -107,7 +107,7 @@ export type MainContextT = { fullTitle?: string introPlainText?: string hidden: boolean - hiddenNoBanner: boolean + noEarlyAccessBanner: boolean permalinks?: Array<{ languageCode: string relativePath: string @@ -172,7 +172,7 @@ export const getMainContext = (req: any, res: any): MainContextT => { ]) ), hidden: req.context.page.hidden || false, - hiddenNoBanner: req.context.page.hiddenNoBanner || false, + noEarlyAccessBanner: req.context.page.noEarlyAccessBanner || false, }, enterpriseServerReleases: pick(req.context.enterpriseServerReleases, [ 'isOldestReleaseDeprecated', diff --git a/components/page-header/HeaderNotifications.tsx b/components/page-header/HeaderNotifications.tsx index f27e53fbc7..4b696bc5f6 100644 --- a/components/page-header/HeaderNotifications.tsx +++ b/components/page-header/HeaderNotifications.tsx @@ -69,7 +69,7 @@ export const HeaderNotifications = () => { ...translationNotices, ...releaseNotices, // ONEOFF EARLY ACCESS NOTICE - (relativePath || '').includes('early-access/') && !page.hiddenNoBanner + (relativePath || '').includes('early-access/') && !page.noEarlyAccessBanner ? { type: NotificationType.EARLY_ACCESS, content: t('notices.early_access'), diff --git a/lib/frontmatter.js b/lib/frontmatter.js index 42a7f55363..97bded6467 100644 --- a/lib/frontmatter.js +++ b/lib/frontmatter.js @@ -65,7 +65,7 @@ export const schema = { type: 'boolean', }, // specify whether an Early Access article should not have a header notice - hiddenNoBanner: { + noEarlyAccessBanner: { type: 'boolean', }, layout: {