From e915e11331c7c306dd62caaff7784a9d2c51c416 Mon Sep 17 00:00:00 2001
From: lcampbell2 <l.campbell144768@gmail.com>
Date: Tue, 23 Feb 2021 10:08:06 -0400
Subject: [PATCH] Move dmarcPhase in GET_GUIDANCE_TAGS_OF_DOMAIN query

---
 frontend/src/DmarcGuidancePage.js             |  5 ++---
 frontend/src/ScanCard.js                      | 22 +++++++++----------
 .../src/fixtures/dmarcGuidancePageData.js     |  2 +-
 frontend/src/graphql/queries.js               |  2 +-
 frontend/src/locales/en.po                    |  4 ++--
 frontend/src/locales/fr.po                    |  4 ++--
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/frontend/src/DmarcGuidancePage.js b/frontend/src/DmarcGuidancePage.js
index c7503150ea..bf1ec4fb8a 100644
--- a/frontend/src/DmarcGuidancePage.js
+++ b/frontend/src/DmarcGuidancePage.js
@@ -39,8 +39,7 @@ export default function DmarcGuidancePage() {
   const webScan = data.findDomainByDomain.web
   const emailScan = data.findDomainByDomain.email
   const webStatus = data.findDomainByDomain.status
-  const dmarcPhase =
-    data.findDomainByDomain.email?.dmarc.edges[0]?.node.dmarcPhase
+  const dmarcPhase = data.findDomainByDomain.dmarcPhase
 
   return (
     <Stack spacing="25px" mb="6" px="4" mx="auto" overflow="hidden">
@@ -52,10 +51,10 @@ export default function DmarcGuidancePage() {
           color="teal.500"
           whiteSpace="noWrap"
           my="auto"
+          ml="auto"
           to={`/domains/${domainSlug}/dmarc-report/LAST30DAYS/${new Date().getFullYear()}`}
           as={RouteLink}
           d="block"
-          width="100%"
           textAlign={{ base: 'center', md: 'right' }}
         >
           <Trans>DMARC Report</Trans>
diff --git a/frontend/src/ScanCard.js b/frontend/src/ScanCard.js
index f8b7e87d5c..ec729a4ad6 100644
--- a/frontend/src/ScanCard.js
+++ b/frontend/src/ScanCard.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Box, Heading, Icon, Stack, Text } from '@chakra-ui/core'
-import { object, string } from 'prop-types'
+import { any, object, string } from 'prop-types'
 import ScanCategoryDetails from './ScanCategoryDetails'
 import WithPseudoBox from './withPseudoBox'
 import { t, Trans } from '@lingui/macro'
@@ -43,22 +43,22 @@ function ScanCard({ scanType, scanData, status }) {
     } else if (scanType === 'email') {
       return (
         <Box pb="1">
-          {status ? (
+          {status === 'not implemented' ? (
             <Stack isInline align="center" px="2">
-              <Icon
-                name={status > 2 ? 'warning-2' : 'check-circle'}
-                color={status > 2 ? 'moderate' : 'strong'}
-                size="icons.md"
-              />
+              <Icon name="warning" color="weak" size="icons.md" />
               <Text fontWeight="bold" fontSize="2xl">
-                <Trans>DMARC Implementation Phase: {status}</Trans>
+                <Trans>DMARC Not Implemented</Trans>
               </Text>
             </Stack>
           ) : (
             <Stack isInline align="center" px="2">
-              <Icon name="question" color="gray.500" size="icons.md" />
+              <Icon
+                name={parseInt(status, 10) > 2 ? 'warning-2' : 'check-circle'}
+                color={parseInt(status, 10) > 2 ? 'moderate' : 'strong'}
+                size="icons.md"
+              />
               <Text fontWeight="bold" fontSize="2xl">
-                <Trans>DMARC Phase Unavailable</Trans>
+                <Trans>DMARC Implementation Phase: {status}</Trans>
               </Text>
             </Stack>
           )}
@@ -110,5 +110,5 @@ export default WithPseudoBox(ScanCard)
 ScanCard.propTypes = {
   scanType: string,
   scanData: object,
-  status: object,
+  status: any,
 }
diff --git a/frontend/src/fixtures/dmarcGuidancePageData.js b/frontend/src/fixtures/dmarcGuidancePageData.js
index 389e25ecfa..6901d4d225 100644
--- a/frontend/src/fixtures/dmarcGuidancePageData.js
+++ b/frontend/src/fixtures/dmarcGuidancePageData.js
@@ -2,6 +2,7 @@ export const rawDmarcGuidancePageData = {
   findDomainByDomain: {
     domain: 'cra-arc.gc.ca',
     lastRan: '1612170063153',
+    dmarcPhase: 2,
     status: {
       https: 'INFO',
       ssl: 'PASS',
@@ -246,7 +247,6 @@ export const rawDmarcGuidancePageData = {
             node: {
               id: 'NTE1MDUwMjM2OA==',
               timestamp: '1604648562144',
-              dmarcPhase: 2,
               record: 'v=DMARC1; p=none; sp=none; rua=mailto:dmarc@cyber.gc.ca',
               pPolicy: 'quarantine',
               spPolicy: 'missing',
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 6c93bd317f..7cf6bd8992 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -179,6 +179,7 @@ export const GET_GUIDANCE_TAGS_OF_DOMAIN = gql`
     findDomainByDomain(domain: $domain) {
       domain
       lastRan
+      dmarcPhase
       status {
         https
         ssl
@@ -286,7 +287,6 @@ export const GET_GUIDANCE_TAGS_OF_DOMAIN = gql`
             node {
               id
               timestamp
-              dmarcPhase
               record
               pPolicy
               spPolicy
diff --git a/frontend/src/locales/en.po b/frontend/src/locales/en.po
index 8f13204167..f00cc75bf9 100644
--- a/frontend/src/locales/en.po
+++ b/frontend/src/locales/en.po
@@ -2049,5 +2049,5 @@ msgid "DMARC Implementation Phase: {status}"
 msgstr "DMARC Implementation Phase: {status}"
 
 #: src/ScanCard.js:54
-msgid "DMARC Phase Unavailable"
-msgstr "DMARC Phase Unavailable"
+msgid "DMARC Not Implemented"
+msgstr "DMARC Not Implemented"
diff --git a/frontend/src/locales/fr.po b/frontend/src/locales/fr.po
index 85eb5c4e0d..6ccac7a06c 100644
--- a/frontend/src/locales/fr.po
+++ b/frontend/src/locales/fr.po
@@ -2041,5 +2041,5 @@ msgid "DMARC Implementation Phase: {status}"
 msgstr "Phase de mise en œuvre de la DMARC: {status}"
 
 #: src/ScanCard.js:54
-msgid "DMARC Phase Unavailable"
-msgstr "La phase DMARC n'est pas disponible"
+msgid "DMARC Not Implemented"
+msgstr "La DMARC n'est pas mise en œuvre"