Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add support for displaying an alternate popup announcement base… #428

Merged
merged 1 commit into from
Sep 19, 2024
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
4 changes: 4 additions & 0 deletions src/components/Contentful/ContentfulLayoutHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ const ContentfulLayoutHeader = props => {
downloadButton,
previewMode = false,
popupAnnouncement,
popupAnnouncementTreatment,
launchDarklyFlag,
isSticky,
contentful_id,
translation,
Expand All @@ -29,7 +31,9 @@ const ContentfulLayoutHeader = props => {
downloadButton={downloadButton}
hideDownloadBtn={hideDownloadBtn}
popupAnnouncement={popupAnnouncement}
popupAnnouncementTreatment={popupAnnouncementTreatment}
isSticky={isSticky}
launchDarklyFlag={launchDarklyFlag}
previewMode={previewMode}
contentfulId={contentful_id}
translation={translation}
Expand Down
27 changes: 26 additions & 1 deletion src/components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import HeaderDisclaimer from './HeaderDisclaimer'
import { removeLanguageCode } from '../lib/utils/removeLanguageCode'
import { useIsUKBlocked } from '../hooks/useIsUKBlocked'
import { useCountry } from '../hooks/useCountry'
import { useLaunchDarklyFlag } from '../Context/LaunchDarklyFlagContext'

const StyledHeader = props => {
const {
Expand All @@ -32,8 +33,10 @@ const StyledHeader = props => {
menus,
downloadButton,
popupAnnouncement,
popupAnnouncementTreatment,
hideDownloadBtn,
isSticky,
launchDarklyFlag,
previewMode = false,
translation,
} = props
Expand All @@ -59,17 +62,37 @@ const StyledHeader = props => {
const [topMenuMobile, setTopMenuMobile] = useState('88px')
const [isBrowser, setIsBrowser] = useState(false)
const [showDisclaimer, setShowDisclaimer] = useState(false)
const [
usePopupAnnouncementTreatment,
setUsePopupAnnouncementTreatment,
] = useState(false)

const ldClient = useLDClient()
const country = useCountry()
const isUKBlocked = useIsUKBlocked()
const { getLaunchDarklyFlag } = useLaunchDarklyFlag()

const shouldShowLanguageSelector = previewMode || translation

useEffect(() => {
setIsBrowser(true)
}, [])

useEffect(() => {
const init = async () => {
if (launchDarklyFlag !== 'use-treatment-for-non-uk-and-us-announcement') {
return
}

const value = await getLaunchDarklyFlag(launchDarklyFlag)
if (value === true && !['GB', 'US'].includes(country)) {
setUsePopupAnnouncementTreatment(true)
}
}

init()
}, [getLaunchDarklyFlag, launchDarklyFlag, country])

useEffect(() => {
if (!menus && isDarkMode) {
toggleTheme()
Expand Down Expand Up @@ -171,7 +194,9 @@ const StyledHeader = props => {
<HeaderElement ref={headerRef} className={classnames({ sticky: isSticky })}>
<Announcement>
{contentfulModuleToComponent({
...popupAnnouncement,
...(usePopupAnnouncementTreatment
? popupAnnouncementTreatment
: popupAnnouncement),
previewMode,
})}
</Announcement>
Expand Down
4 changes: 4 additions & 0 deletions src/fragments/ContentfulContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ export const ContentfulLayoutHeaderFields = graphql`
popupAnnouncement {
...ContentfulPopupAnnouncementFields
}
popupAnnouncementTreatment {
...ContentfulPopupAnnouncementFields
}
isSticky
launchDarklyFlag
}
`

Expand Down
4 changes: 4 additions & 0 deletions src/fragments/previewFragment.js
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,9 @@ export const ContentfulLayoutHeaderFields = gql`
popupAnnouncement(preview: true) {
...ContentfulPopupAnnouncementFields
}
popupAnnouncementTreatment(preview: true) {
...ContentfulPopupAnnouncementFields
}
logo(preview: true) {
...ContentfulLogoFields
}
Expand All @@ -594,6 +597,7 @@ export const ContentfulLayoutHeaderFields = gql`
...ContentfulCtaFields
}
isSticky
launchDarklyFlag
}
`

Expand Down