Skip to content

add tableLoading to the main loading for DMARC Report Page #2794

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

Merged
EveningStarlight merged 2 commits into from
Aug 6, 2021
Merged

add tableLoading to the main loading for DMARC Report Page #2794

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b9d32b
add tableLoading to the main loading for DMARC Report Page
Aug 6, 2021
ff17ea2
remove statement that always resolves to true
Aug 6, 2021
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
16 changes: 8 additions & 8 deletions frontend/src/DmarcReportPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,16 @@ export default function DmarcReportPage() {
)
}

// DMARC bar graph setup
let graphDisplay

// Set DMARC bar graph Loading
if (graphLoading) {
graphDisplay = (
if (graphLoading || tableLoading) {
return (
<LoadingMessage>
<Trans>Yearly DMARC Graph</Trans>
<Trans>DMARC Report</Trans>
</LoadingMessage>
)
}

if (!graphLoading && !graphData?.findDomainByDomain?.hasDMARCReport) {
if (!graphData?.findDomainByDomain?.hasDMARCReport) {
return (
<Box align="center" w="100%" px={4}>
<Text textAlign="center" fontSize="3xl" fontWeight="bold">
Expand All @@ -158,8 +155,11 @@ export default function DmarcReportPage() {
)
}

// DMARC bar graph setup
let graphDisplay

// Display graph query error if found
else if (graphError) {
if (graphError) {
graphDisplay = <ErrorFallbackMessage error={graphError} />
}
// Set graph display using data if data exists
Expand Down