add second to Date for Alerts, improve sorting for Pods tabs by forma…

…tting directly in Cell
scality · Apr 9, 2024 · 460e699 · 460e699
1 parent ced71e6
commit 460e699
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/ui/src/components/AlertsTab.tsx b/ui/src/components/AlertsTab.tsx
@@ -73,7 +73,12 @@ const AlertsTab = ({
  width: '7rem',
  },
  Cell: ({ value }) => {
- return <FormattedDateTime value={new Date(value)} format="date-time" />;
+ return (
+ <FormattedDateTime
+ value={new Date(value)}
+ format="date-time-second"
+ />
+ );
  },
  },
  ];

diff --git a/ui/src/components/NodePagePodsTab.tsx b/ui/src/components/NodePagePodsTab.tsx
@@ -7,6 +7,7 @@ import { Table } from '@scality/core-ui/dist/next';
 import { padding, spacing } from '@scality/core-ui/dist/style/theme';
 import { NodeTab } from './style/CommonLayoutStyle';
 import { TooltipContent } from './TableRow';
+import { fromMilliSectoAge } from '../services/utils';
 import {
  STATUS_RUNNING,
  STATUS_PENDING,
@@ -45,7 +46,7 @@ const StatusText = styled.div`
  } else if (status === STATUS_FAILED || status === STATUS_UNKNOWN) {
  return props.theme.statusCritical;
  }
- }}};
+ }};
 `;
 const ExternalLink = styled.a`
  color: ${(props) => props.theme.textSecondary};
@@ -112,6 +113,9 @@ const NodePagePodsTab = React.memo((props) => {
  maxWidth: '5rem',
  marginRight: spacing.sp8,
  },
+ Cell: ({ value }) => {
+ return fromMilliSectoAge(Date.now() - value);
+ },
  },
  {
  Header: 'Namespace',

diff --git a/ui/src/containers/AlertPage.tsx b/ui/src/containers/AlertPage.tsx
@@ -286,7 +286,10 @@ export default function AlertPage() {
  marginRight: spacing.sp12,
  },
  Cell: (cell) => (
- <FormattedDateTime value={new Date(cell.value)} format="date-time" />
+ <FormattedDateTime
+ value={new Date(cell.value)}
+ format="date-time-second"
+ />
  ),
  },
  ],

diff --git a/ui/src/services/PodUtils.ts b/ui/src/services/PodUtils.ts
@@ -4,8 +4,7 @@ export const getPodsListData = (nodeName, pods) => {
  const podsList = pods?.filter((pod) => pod.nodeName === nodeName);
  return (
  podsList?.map((pod) => {
- // @ts-expect-error - FIXME when you are working on it
- const age = fromMilliSectoAge(new Date() - pod.startTime);
+ const age = new Date(pod.startTime).getTime();
  const numContainer = pod?.containerStatuses?.length ?? 0;
  const numContainerRunning =
  pod?.containerStatuses?.filter((container) => container.ready === true)