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

Update dmarc outage banner #6073

Merged
merged 4 commits into from
Jan 22, 2025
Merged

Update dmarc outage banner #6073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7678830
update DMARC summaries outage message
lcampbell2 Jan 22, 2025
20c4603
add french
lcampbell2 Jan 22, 2025
5d98309
extract outage banner into separate component
lcampbell2 Jan 22, 2025
b38a359
remove hideable prop
lcampbell2 Jan 22, 2025
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
18 changes: 2 additions & 16 deletions frontend/src/dmarc/DmarcByDomainPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { useCallback, useMemo, useState } from 'react'
import { PAGINATED_DMARC_REPORT_SUMMARY_TABLE as FORWARD } from '../graphql/queries'
import {
AlertDescription,
AlertTitle,
Box,
Divider,
Flex,
Expand Down Expand Up @@ -35,7 +33,7 @@ import { AffiliationFilterSwitch } from '../components/AffiliationFilterSwitch'
import { ExportRuaListButton } from './ExportRuaListButton'
import { useUserVar } from '../utilities/userState'
import { TourComponent } from '../userOnboarding/components/TourComponent'
import { NotificationBanner } from '../app/NotificationBanner'
import { DmarcReportOutageBanner } from './DmarcReportOutageBanner'

export default function DmarcByDomainPage() {
const { i18n } = useLingui()
Expand Down Expand Up @@ -280,19 +278,7 @@ export default function DmarcByDomainPage() {
</Flex>
)}

<NotificationBanner status="warning" bannerId="dmarc-report-outage" hideable>
<Box>
<AlertTitle>
<Trans>Important Notice:</Trans>
</AlertTitle>
<AlertDescription>
<Trans>
The DMARC Summaries data has not been updated since December 2024. We are working to refresh this
information. Please note that any displayed data may not reflect current email security status.
</Trans>
</AlertDescription>
</Box>
</NotificationBanner>
<DmarcReportOutageBanner />

<ErrorBoundary FallbackComponent={ErrorFallbackMessage}>
{tableDisplay}
Expand Down
23 changes: 23 additions & 0 deletions frontend/src/dmarc/DmarcReportOutageBanner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React from 'react'
import { NotificationBanner } from '../app/NotificationBanner'
import { AlertDescription, AlertTitle, Box } from '@chakra-ui/react'
import { Trans } from '@lingui/macro'

export function DmarcReportOutageBanner() {
return (
<NotificationBanner status="warning" bannerId="dmarc-report-outage-2">
<Box>
<AlertTitle>
<Trans>Note:</Trans>
</AlertTitle>
<AlertDescription>
<Trans>
There is a gap in historical DMARC data between December 20, 2024 and January 21, 2025 due to a service
disruption. This does not affect current DMARC reporting, and all data before and after this period remains
complete and accurate.
</Trans>
</AlertDescription>
</Box>
</NotificationBanner>
)
}
15 changes: 2 additions & 13 deletions frontend/src/dmarc/DmarcReportPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { useDocumentTitle } from '../utilities/useDocumentTitle'
import { DMARC_REPORT_GRAPH, PAGINATED_DMARC_REPORT } from '../graphql/queries'
import { MonthSelect } from '../components/MonthSelect'
import { NotificationBanner } from '../app/NotificationBanner'
import { DmarcReportOutageBanner } from './DmarcReportOutageBanner'

export default function DmarcReportPage() {
const { domainSlug, period, year } = useParams()
Expand Down Expand Up @@ -663,19 +664,7 @@ export default function DmarcReportPage() {
</Flex>
</Box>

<NotificationBanner status="warning" bannerId="dmarc-report-outage" hideable>
<Box>
<AlertTitle>
<Trans>Important Notice:</Trans>
</AlertTitle>
<AlertDescription>
<Trans>
The DMARC Summaries data has not been updated since December 2024. We are working to refresh this
information. Please note that any displayed data may not reflect current email security status.
</Trans>
</AlertDescription>
</Box>
</NotificationBanner>
<DmarcReportOutageBanner />

{graphDisplay}

Expand Down
Loading
Loading