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.

Sign up for GitHub

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

Dismiss the cookie consent confirmation banner #7074

Merged
merged 1 commit into from
Aug 19, 2024
Merged

Dismiss the cookie consent confirmation banner #7074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions src/client/components/StatusMessage/Dismissable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import styled from 'styled-components'

import StatusMessage from '.'
import TextLikeButton from '../TextLikeButton'
import { WHITE } from '../../utils/colours'

const StyledStatusMessage = styled(StatusMessage)({
display: 'flex',
alignItems: 'baseline',
justifyContent: 'space-between',
background: WHITE,
})

const DismissableStatusMessage = React.forwardRef(
Expand Down
162 changes: 85 additions & 77 deletions src/client/modules/ExportWins/Review/Layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react'
import React, { useState } from 'react'
import styled from 'styled-components'
import { Button, H1, H2, Link } from 'govuk-react'
import { FONT_SIZE, FONT_WEIGHTS, SPACING } from '@govuk-react/constants'

import RecentTaskResult from '../../../components/Task/RecentResult'
import { StyledStatusMessage } from './ThankYou'
import { FormActions } from '../../../components'
import DismissableStatusMessage from '../../../components/StatusMessage/Dismissable'
import Footer from '../../../components/Footer'
import Task from '../../../components/Task'
import Resource from '../../../components/Resource/Resource'
Expand Down Expand Up @@ -79,89 +79,97 @@ const CookieBanner = styled.div({
paddingTop: SPACING.SCALE_3,
})

const CookieConsentConfirmation = () => (
const CookieConsentConfirmation = ({ dismiss, onDismiss }) => (
<RecentTaskResult name="save cookie preference" id="cookieConsent">
{(consent) =>
consent && (
<StyledStatusMessage colour={GREEN}>
consent &&
!dismiss && (
<DismissableStatusMessage colour={GREEN} onDismiss={onDismiss}>
You've {consent === 'granted' ? 'accepted' : 'rejected'} additional
cookies. You can change your cookie settings at any time.
</StyledStatusMessage>
</DismissableStatusMessage>
)
}
</RecentTaskResult>
)

const Layout = ({ children, title, supertitle, headingContent }) => (
<Grid>
<CookieBannerBackground />
<Resource name="load cookie preference" id="cookieConsent">
{(persistedConsent) => (
<RecentTaskResult name="save cookie preference" id="cookieConsent">
{(updatedConsent) =>
!persistedConsent &&
!updatedConsent && (
<CookieBanner>
<H2>Cookies</H2>
<p>
We’d like to use analytics cookies so we can understand how
you use Export Wins and make improvements.
</p>
<p>
We also use essential cookies to remember if you’ve accepted
analytics cookies.
</p>
<FormActions>
<Task>
{(getTask) => {
const setPreference = (value) =>
getTask(
'save cookie preference',
'cookieConsent'
).start({
payload: value,
onSuccessDispatch: 'FORM__RESOLVED',
})
return (
<>
<Button onClick={() => setPreference('granted')}>
Accept analytics cookies
</Button>
<Button onClick={() => setPreference('denied')}>
Reject analytics cookies
</Button>
</>
)
}}
</Task>
<Link href="/exportwins/review/cookies">View cookies</Link>
</FormActions>
</CookieBanner>
)
}
</RecentTaskResult>
)}
</Resource>
<MainBarBackground />
<MainBar>Department for Business and Trade</MainBar>
<HeaderBackground />
<Header>
<p>{supertitle}</p>
<Title>{title}</Title>
<CookieConsentConfirmation />
{headingContent}
</Header>
<Main>{children}</Main>
<GridCellFooter
links={{
'Privacy Policy':
'https://www.great.gov.uk/privacy-and-cookies/full-privacy-notice/',
'Accessibility Statement': '/exportwins/review/accesibility-statement',
'Privacy Notice': '/exportwins/review/privacy-notice',
Cookies: '/exportwins/review/cookies',
}}
/>
</Grid>
)
const Layout = ({ children, title, supertitle, headingContent }) => {
const [dismiss, setDismiss] = useState(false)
return (
<Grid>
<CookieBannerBackground />
<Resource name="load cookie preference" id="cookieConsent">
{(persistedConsent) => (
<RecentTaskResult name="save cookie preference" id="cookieConsent">
{(updatedConsent) =>
!persistedConsent &&
!updatedConsent && (
<CookieBanner>
<H2>Cookies</H2>
<p>
We’d like to use analytics cookies so we can understand how
you use Export Wins and make improvements.
</p>
<p>
We also use essential cookies to remember if you’ve accepted
analytics cookies.
</p>
<FormActions>
<Task>
{(getTask) => {
const setPreference = (value) =>
getTask(
'save cookie preference',
'cookieConsent'
).start({
payload: value,
onSuccessDispatch: 'FORM__RESOLVED',
})
return (
<>
<Button onClick={() => setPreference('granted')}>
Accept analytics cookies
</Button>
<Button onClick={() => setPreference('denied')}>
Reject analytics cookies
</Button>
</>
)
}}
</Task>
<Link href="/exportwins/review/cookies">View cookies</Link>
</FormActions>
</CookieBanner>
)
}
</RecentTaskResult>
)}
</Resource>
<MainBarBackground />
<MainBar>Department for Business and Trade</MainBar>
<HeaderBackground />
<Header>
<p>{supertitle}</p>
<Title>{title}</Title>
<CookieConsentConfirmation
dismiss={dismiss}
onDismiss={() => setDismiss(true)}
/>
{headingContent}
</Header>
<Main>{children}</Main>
<GridCellFooter
links={{
'Privacy Policy':
'https://www.great.gov.uk/privacy-and-cookies/full-privacy-notice/',
'Accessibility Statement':
'/exportwins/review/accesibility-statement',
'Privacy Notice': '/exportwins/review/privacy-notice',
Cookies: '/exportwins/review/cookies',
}}
/>
</Grid>
)
}

export default Layout
5 changes: 5 additions & 0 deletions test/functional/cypress/specs/export-win/review-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ const assertFlashMessage = (verb) => {
}
}

const dismissFlashMessage = () =>
cy.get('[data-test="status-message"]').find('button').click()

const assertCookieBanner = (shouldExist) => {
const asertion = shouldExist ? 'exist' : 'not.exist'
cy.contains('h2', 'Cookies').should(asertion)
Expand Down Expand Up @@ -84,6 +87,8 @@ describe('Export wins review', () => {
getBannerButton(accept ? 'Accept' : 'Reject').click()
assertCookieBanner(false)
assertFlashMessage(accept ? 'accepted' : 'rejected')
dismissFlashMessage()
assertFlashMessage(false)
})
)
})
Expand Down
Loading