Merge branch 'main' into feat-2538-refactor-builder-actions

rajesh-jonnalagadda · Dec 10, 2024 · 1f28476 · 1f28476
2 parents e6e0ba2 + bfe2179
commit 1f28476
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/keep-ui/app/(keep)/alerts/alert-table-utils.tsx b/keep-ui/app/(keep)/alerts/alert-table-utils.tsx
@@ -335,11 +335,14 @@ export const useAlertTableCols = (
       header: "Last Received",
       filterFn: isDateWithinRange,
       minSize: 100,
-      cell: (context) => (
-        <span title={context.getValue().toISOString()}>
-          <TimeAgo date={context.getValue().toISOString()} />
-        </span>
-      ),
+      // data is a Date object (converted in usePresetAlerts)
+      cell: (context) => {
+        return (
+          <span title={context.getValue().toISOString()}>
+            <TimeAgo date={context.getValue().toISOString()} />
+          </span>
+        );
+      },
     }),
     columnHelper.accessor("assignee", {
       id: "assignee",

diff --git a/keep-ui/app/(keep)/incidents/[id]/alerts/incident-alerts.tsx b/keep-ui/app/(keep)/incidents/[id]/alerts/incident-alerts.tsx
@@ -178,7 +178,8 @@ export default function IncidentAlerts({ incident }: Props) {
         id: "lastReceived",
         header: "Last Event Time",
         minSize: 100,
-        cell: (context) => <TimeAgo date={context.getValue().toISOString()} />,
+        // data is a ISO string
+        cell: (context) => <TimeAgo date={context.getValue()} />,
       }),
       columnHelper.accessor("source", {
         id: "source",