Skip to content
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

Jump to bottom

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

Merged
merged 10 commits into from
Jun 9, 2020
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b3284c9
added relatinve
shahzad31 May 28, 2020
6dab983
Merge branch 'master' into display-date-in-status-col
elasticmachine May 28, 2020
539b6b6
Merge branch 'master' into display-date-in-status-col
elasticmachine May 29, 2020
d66603a
Merge branch 'master' into display-date-in-status-col
elasticmachine Jun 2, 2020
14ab31e
Merge branch 'master' into display-date-in-status-col
shahzad31 Jun 3, 2020
df670ce
update
shahzad31 Jun 3, 2020
e1e72ae
Merge branch 'display-date-in-status-col' of https://github.com/shahz…
shahzad31 Jun 4, 2020
dfcf31c
Merge branch 'master' into display-date-in-status-col
shahzad31 Jun 4, 2020
2fa26b1
update
shahzad31 Jun 4, 2020
750425d
Merge branch 'master' into display-date-in-status-col
elasticmachine Jun 8, 2020
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: 15 additions & 1 deletion ...s/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 34 additions & 4 deletions x-pack/plugins/uptime/public/components/certificates/cert_status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
*/

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 { Cert } from '../../../common/runtime_types';
import { useCertStatus } from '../../hooks';
import * as labels from './translations';
Expand All @@ -15,20 +17,39 @@ 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 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>
);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was it a deliberate choice to omit the relative date from CERT_STATUS.TOO_OLD case?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Example:
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i took care of it.

Expand All @@ -41,9 +62,18 @@ export const CertStatus: React.FC<Props> = ({ cert }) => {
);
}

const okRelativeDate = moment(cert?.not_after).fromNow(true);

return (
<EuiHealth color="success">
<span>{labels.OK}</span>
<span>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be translated, something like:

Suggested change
<span>
<span>
{labels.OK}
<DateText color="subdued" size="xs">
<FormattedMessage
id="xpack.uptime.certs.status.ok"
defaultMessage=" for {okRelativeDate}"
description={
'Denotes an amount of time for which a cert is valid. Example: "OK for 2 days"'
}
values={{
okRelativeDate,
}}
/>
</DateText>
</span>

Alternatively you could extract the string to a label, but seems strange to do it for only one word.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

{labels.OK}
{' '}
<DateText color="subdued" size="xs">
{'for '}
{okRelativeDate}
</DateText>
</span>
</EuiHealth>
);
};