diff --git a/src/app/networkDiscovery/views/DiscoveriesList/DiscoveriesList.tsx b/src/app/networkDiscovery/views/DiscoveriesList/DiscoveriesList.tsx index 3da80adfd54..9c4f3693524 100644 --- a/src/app/networkDiscovery/views/DiscoveriesList/DiscoveriesList.tsx +++ b/src/app/networkDiscovery/views/DiscoveriesList/DiscoveriesList.tsx @@ -25,6 +25,7 @@ import type { Discovery } from "@/app/store/discovery/types"; import { DiscoveryMeta } from "@/app/store/discovery/types"; import type { RootState } from "@/app/store/root/types"; import { generateEmptyStateMsg, getTableStatus } from "@/app/utils"; +import { formatUtcTimestamp } from "@/app/utils/time"; export enum Labels { DiscoveriesList = "Discoveries list", @@ -78,7 +79,11 @@ const generateRows = ( content: discovery.observer_hostname, }, { - content:
{discovery.last_seen}
, + content: ( +
+ {formatUtcTimestamp(discovery.last_seen)} +
+ ), }, { content: ( diff --git a/src/app/store/discovery/types/base.ts b/src/app/store/discovery/types/base.ts index b4ed8ba6450..da03cd8c6e8 100644 --- a/src/app/store/discovery/types/base.ts +++ b/src/app/store/discovery/types/base.ts @@ -1,5 +1,5 @@ import type { APIError } from "@/app/base/types"; -import type { Model } from "@/app/store/types/model"; +import type { Model, UtcTimestamp } from "@/app/store/types/model"; import type { GenericState } from "@/app/store/types/state"; export type Discovery = Model & { @@ -10,7 +10,7 @@ export type Discovery = Model & { hostname: string | null; ip: string | null; is_external_dhcp: boolean | null; - last_seen: string; + last_seen: UtcTimestamp; mac_address: string | null; mac_organization: string; mdns: number | null; diff --git a/src/testing/factories/discovery.ts b/src/testing/factories/discovery.ts index 82dba7bd46f..6023943c724 100644 --- a/src/testing/factories/discovery.ts +++ b/src/testing/factories/discovery.ts @@ -4,6 +4,7 @@ import { model } from "./model"; import type { Discovery } from "@/app/store/discovery/types"; import type { Model } from "@/app/store/types/model"; +import { timestamp } from "./general"; export const discovery = extend(model, { discovery_id: () => `discovery-${random()}`, @@ -13,7 +14,7 @@ export const discovery = extend(model, { hostname: "discovery-hostname", ip: "192.168.1.1", is_external_dhcp: false, - last_seen: "Wed, 08 Jul. 2020 05:35:4", + last_seen: () => timestamp("Wed, 08 Jul. 2020 05:35:4"), mac_address: "00:00:00:00:00:00", mac_organization: "Business Corp, Inc.", mdns: 2,