[Uptime] Added relative date info in cert status column (#67612)

Co-authored-by: Elastic Machine <[email protected]>
elastic · Jun 9, 2020 · a3df86d · a3df86d
1 parent 14410e0
commit a3df86d
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 6 deletions.
diff --git a/...s/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap b/...s/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap
diff --git a/x-pack/plugins/uptime/public/components/certificates/cert_status.tsx b/x-pack/plugins/uptime/public/components/certificates/cert_status.tsx
@@ -5,45 +5,95 @@
  */
 
 import React from 'react';
-import { EuiHealth } from '@elastic/eui';
+import moment from 'moment';
+import styled from 'styled-components';
+import { EuiHealth, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { useSelector } from 'react-redux';
 import { Cert } from '../../../common/runtime_types';
 import { useCertStatus } from '../../hooks';
 import * as labels from './translations';
 import { CERT_STATUS } from '../../../common/constants';
+import { selectDynamicSettings } from '../../state/selectors';
 
 interface Props {
   cert: Cert;
 }
 
+const DateText = styled(EuiText)`
+  display: inline-block;
+  margin-left: 5px;
+`;
+
 export const CertStatus: React.FC<Props> = ({ cert }) => {
   const certStatus = useCertStatus(cert?.not_after, cert?.not_before);
 
+  const dss = useSelector(selectDynamicSettings);
+
+  const relativeDate = moment(cert?.not_after).fromNow();
+
   if (certStatus === CERT_STATUS.EXPIRING_SOON) {
     return (
       <EuiHealth color="warning">
-        <span>{labels.EXPIRES_SOON}</span>
+        <span>
+          {labels.EXPIRES_SOON}
+          {'  '}
+          <DateText color="subdued" size="xs">
+            {relativeDate}
+          </DateText>
+        </span>
       </EuiHealth>
     );
   }
   if (certStatus === CERT_STATUS.EXPIRED) {
     return (
       <EuiHealth color="danger">
-        <span>{labels.EXPIRED}</span>
+        <span>
+          {labels.EXPIRED}
+          {'  '}
+          <DateText color="subdued" size="xs">
+            {relativeDate}
+          </DateText>
+        </span>
       </EuiHealth>
     );
   }
 
   if (certStatus === CERT_STATUS.TOO_OLD) {
+    const ageThreshold = dss.settings?.certAgeThreshold;
+
+    const oldRelativeDate = moment(cert?.not_before).add(ageThreshold, 'days').fromNow();
+
     return (
       <EuiHealth color="danger">
-        <span>{labels.TOO_OLD}</span>
+        <span>
+          {labels.TOO_OLD}
+          <DateText color="subdued" size="xs">
+            {oldRelativeDate}
+          </DateText>
+        </span>
       </EuiHealth>
     );
   }
 
+  const okRelativeDate = moment(cert?.not_after).fromNow(true);
+
   return (
     <EuiHealth color="success">
-      <span>{labels.OK}</span>
+      <span>
+        {labels.OK}
+        {'  '}
+        <DateText color="subdued" size="xs">
+          <FormattedMessage
+            id="xpack.uptime.certs.status.ok.label"
+            defaultMessage=" for {okRelativeDate}"
+            description='Denotes an amount of time for which a cert is valid. Example: "OK for 2 days"'
+            values={{
+              okRelativeDate,
+            }}
+          />
+        </DateText>
+      </span>
     </EuiHealth>
   );
 };