add timestamp to scan results (#4614)

canada-ca · Jun 29, 2023 · 9bbeb47 · 9bbeb47
1 parent 48f04e5
commit 9bbeb47
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/frontend/src/guidance/EmailGuidance.js b/frontend/src/guidance/EmailGuidance.js
@@ -57,13 +57,18 @@ export function EmailGuidance({ dnsResults, dmarcPhase, status }) {
       break
   }
 
+  const formatTimestamp = (ts) => {
+    const dateTime = ts.split('T')
+    return dateTime[0] + ', ' + dateTime[1].substring(0, 5)
+  }
+
   const dmarcStepList = !dmarcSteps
     ? undefined
     : dmarcSteps.map((step, idx) => {
         return <ListItem key={idx}>{step}</ListItem>
       })
 
-  const { dkim, dmarc, spf } = dnsResults
+  const { dkim, dmarc, spf, timestamp } = dnsResults
   const emailKeys = ['spf', 'dkim', 'dmarc']
   let emailPassCount = 0
   let emailInfoCount = 0
@@ -145,6 +150,9 @@ export function EmailGuidance({ dnsResults, dmarcPhase, status }) {
   )
   return (
     <Accordion allowMultiple defaultIndex={[0, 1, 2, 3]}>
+      <Text fontsize="lg">
+        <b>Last Scanned:</b> {formatTimestamp(timestamp)}
+      </Text>
       {emailSummary}
       <Box mb={4} ml="4">
         <Text fontWeight="bold" fontSize="2xl">

diff --git a/frontend/src/guidance/GuidancePage.js b/frontend/src/guidance/GuidancePage.js
@@ -95,7 +95,7 @@ function GuidancePage() {
       </Box>
     )
   } else {
-    const { results: webResults } = webScan?.edges[0]?.node
+    const { results: webResults, timestamp } = webScan?.edges[0]?.node
     const { node: dnsResults } = dnsScan?.edges[0]
 
     const noScanData = (
@@ -121,7 +121,11 @@ function GuidancePage() {
         </TabList>
         <TabPanels>
           <TabPanel>
-            {webResults.length === 0 ? noScanData : <WebGuidance webResults={webResults} status={status} />}
+            {webResults.length === 0 ? (
+              noScanData
+            ) : (
+              <WebGuidance webResults={webResults} status={status} timestamp={timestamp} />
+            )}
           </TabPanel>
           <TabPanel>
             {dnsScan.edges.length === 0 ? (

diff --git a/frontend/src/guidance/WebGuidance.js b/frontend/src/guidance/WebGuidance.js
@@ -15,8 +15,9 @@ import { Trans } from '@lingui/macro'
 import { WebTLSResults } from './WebTLSResults'
 import { WebConnectionResults } from './WebConnectionResults'
 import { GuidanceSummaryCategories } from './GuidanceSummaryCategories'
+import { string } from 'prop-types'
 
-export function WebGuidance({ webResults }) {
+export function WebGuidance({ webResults, timestamp }) {
   const [selectedEndpoint, setSelectedEndpoint] = useState(webResults[0].ipAddress)
 
   let totalWebPass = 0
@@ -117,9 +118,17 @@ export function WebGuidance({ webResults }) {
     return ipAddress === selectedEndpoint
   }).results
 
+  const formatTimestamp = (ts) => {
+    const dateTime = ts.split('T')
+    return dateTime[0] + ', ' + dateTime[1].substring(0, 5)
+  }
+
   return (
     <>
       <Accordion allowMultiple defaultIndex={[0, 1, 2]}>
+        <Text fontsize="lg">
+          <b>Last Scanned:</b> {formatTimestamp(timestamp)}
+        </Text>
         {!isWebHosting && (
           <Flex
             fontSize="lg"
@@ -150,4 +159,5 @@ export function WebGuidance({ webResults }) {
 
 WebGuidance.propTypes = {
   webResults: array,
+  timestamp: string,
 }