diff --git a/ui/components/FluxObjectsTable.tsx b/ui/components/FluxObjectsTable.tsx index b39461223e..8911c4fcc7 100644 --- a/ui/components/FluxObjectsTable.tsx +++ b/ui/components/FluxObjectsTable.tsx @@ -5,19 +5,14 @@ import { useLinkResolver } from "../contexts/LinkResolverContext"; import { Kind } from "../lib/api/core/types.pb"; import { formatURL, objectTypeToRoute } from "../lib/nav"; import { FluxObject } from "../lib/objects"; -import { makeImageString, statusSortHelper } from "../lib/utils"; +import { makeImageString } from "../lib/utils"; import DataTable from "./DataTable"; import { DetailViewProps } from "./DetailModal"; import HealthCheckStatusIndicator, { HealthStatusType, } from "./HealthCheckStatusIndicator"; import ImageLink from "./ImageLink"; -import KubeStatusIndicator, { - ReadyStatusValue, - SpecialObject, - computeMessage, - createSyntheticCondition, -} from "./KubeStatusIndicator"; +import { computeMessage } from "./KubeStatusIndicator"; import Link from "./Link"; import Text from "./Text"; @@ -93,7 +88,7 @@ function FluxObjectsTable({ sortValue: ({ namespace }) => namespace, }, { - label: "Health Check", + label: "Status", value: ({ health }) => { return health.status !== HealthStatusType.Unknown ? ( @@ -101,40 +96,6 @@ function FluxObjectsTable({ }, sortValue: ({ health }: FluxObject) => health.status, }, - { - label: "Status", - value: (u: FluxObject) => { - const status = u.obj.status; - - if (!status || !status.conditions) { - const cond = createSyntheticCondition( - u.type as SpecialObject, - status - ); - - if (cond.status === ReadyStatusValue.Unknown) { - return null; - } - - return ( - - ); - } - - return u.conditions.length > 0 ? ( - - ) : null; - }, - sortValue: statusSortHelper, - }, { label: "Message", value: (u: FluxObject) => _.first(u.conditions)?.message,