Skip to content

Allow for organization summaries to be null on org summary page #2322

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
FestiveKyle merged 1 commit into from
May 31, 2021
Merged

Allow for organization summaries to be null on org summary page #2322

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: 1 addition & 1 deletion frontend/src/OrganizationDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export default function OrganizationDetails() {
<TabPanel>
<ErrorBoundary FallbackComponent={ErrorFallbackMessage}>
<OrganizationSummary
summaries={data.organization.summaries}
summaries={data?.organization?.summaries}
domainCount={data.organization.domainCount}
userCount={data.organization.affiliations.totalCount}
city={data.organization.city}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/OrganizationSummary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function OrganizationSummary({
</Text>
</Stack>
</Stack>
<SummaryGroup web={summaries.web} mail={summaries.mail} />
<SummaryGroup web={summaries?.web} mail={summaries?.mail} />
</Layout>
)
}
Expand Down
79 changes: 47 additions & 32 deletions frontend/src/SummaryGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,56 @@
import React from 'react'
import { t } from '@lingui/macro'
import { SimpleGrid } from '@chakra-ui/core'
import { t, Trans } from '@lingui/macro'
import { SimpleGrid, Text } from '@chakra-ui/core'
import SummaryCard from './SummaryCard'
import { object } from 'prop-types'
import theme from './theme/canada'

const { colors } = theme

export function SummaryGroup({ web, mail }) {
const webCard = web ? (
<SummaryCard
title={t`Web Configuration`}
description={t`Web encryption settings summary`}
categoryDisplay={{
fail: {
name: t`Non-compliant TLS`,
color: colors.weak,
},
pass: {
name: t`Compliant TLS`,
color: colors.strong,
},
}}
data={web}
/>
) : (
<Text fontWeight="bold" textAlign="center">
<Trans>No web configuration information available for this org.</Trans>
</Text>
)

const mailCard = mail ? (
<SummaryCard
title={t`Email Configuration`}
description={t`Email security settings summary`}
categoryDisplay={{
pass: {
name: t`DMARC pass`,
color: colors.strong,
},
fail: {
name: t`DMARC fail`,
color: colors.weak,
},
}}
data={mail}
/>
) : (
<Text fontWeight="bold" textAlign="center">
<Trans>No mail configuration information available for this org.</Trans>
</Text>
)
return (
<SimpleGrid
columns={[1, 1, 1, 2]}
Expand All @@ -17,36 +60,8 @@ export function SummaryGroup({ web, mail }) {
mx="auto"
p={['2', '8']}
>
<SummaryCard
title={t`Web Configuration`}
description={t`Web encryption settings summary`}
categoryDisplay={{
fail: {
name: t`Non-compliant TLS`,
color: colors.weak,
},
pass: {
name: t`Compliant TLS`,
color: colors.strong,
},
}}
data={web}
/>
<SummaryCard
title={t`Email Configuration`}
description={t`Email security settings summary`}
categoryDisplay={{
pass: {
name: t`DMARC pass`,
color: colors.strong,
},
fail: {
name: t`DMARC fail`,
color: colors.weak,
},
}}
data={mail}
/>
{webCard}
{mailCard}
</SimpleGrid>
)
}
Expand Down
Loading