Skip to content

Commit b6b1f20

Browse files
committed
center align status badge
1 parent 539b280 commit b6b1f20

4 files changed

Lines changed: 19 additions & 25 deletions

File tree

x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugins/uptime/public/components/overview/monitor_list/columns/__tests__/__snapshots__/monitor_status_column.test.tsx.snap

Lines changed: 5 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugins/uptime/public/components/overview/monitor_list/columns/cert_status_column.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,13 @@ import { EuiIcon, EuiText, EuiToolTip } from '@elastic/eui';
1111
import { X509Expiry } from '../../../../../common/runtime_types';
1212
import { useCertStatus } from '../../../../hooks';
1313
import { EXPIRED, EXPIRES, EXPIRES_SOON } from '../../../certificates/translations';
14-
import { CERT_STATUS } from '../../../../../common/constants';
14+
import {
15+
CERT_STATUS,
16+
SHORT_TIMESPAN_LOCALE,
17+
SHORT_TS_LOCALE,
18+
} from '../../../../../common/constants';
19+
import { parseTimestamp } from '../parse_timestamp';
20+
import { getShortTimeStamp } from './monitor_status_column';
1521

1622
interface Props {
1723
expiry: X509Expiry;
@@ -35,7 +41,7 @@ export const CertStatusColumn: React.FC<Props> = ({ expiry, boldStyle = false })
3541
const notAfter = expiry?.not_after;
3642
const certStatus = useCertStatus(notAfter);
3743

38-
const relativeDate = moment(notAfter).fromNow();
44+
const relativeDate = getShortTimeStamp(moment(notAfter), true);
3945

4046
const CertStatus = ({ color, text }: { color: string; text: string }) => {
4147
return (

x-pack/plugins/uptime/public/components/overview/monitor_list/columns/monitor_status_column.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const getHealthMessage = (status: string): string | null => {
4444
}
4545
};
4646

47-
const getShortTimeStamp = (timeStamp: moment.Moment, relative = false) => {
47+
export const getShortTimeStamp = (timeStamp: moment.Moment, relative = false) => {
4848
if (relative) {
4949
const prevLocale: string = moment.locale() ?? 'en';
5050

@@ -153,8 +153,8 @@ export const MonitorListStatusColumn = ({
153153
<StatusColumnFlexG alignItems="center" gutterSize="none" wrap={false} responsive={false}>
154154
<EuiFlexItem grow={false} style={{ flexBasis: 40 }}>
155155
<EuiBadge
156+
className="eui-textCenter"
156157
color={status === STATUS.UP ? 'secondary' : dangerBehindText}
157-
style={{ display: 'block' }}
158158
>
159159
{getHealthMessage(status)}
160160
</EuiBadge>

0 commit comments

Comments
 (0)