diff --git a/.changeset/kubernetes-badges-click-ui.md b/.changeset/kubernetes-badges-click-ui.md new file mode 100644 index 0000000000..af4e3a1d9c --- /dev/null +++ b/.changeset/kubernetes-badges-click-ui.md @@ -0,0 +1,6 @@ +--- +'@hyperdx/app': patch +--- + +feat: use the click-ui `Badge` for all status badges on the Kubernetes dashboard +and its node, namespace, and pod drawers. diff --git a/packages/app/src/KubernetesDashboardPage.tsx b/packages/app/src/KubernetesDashboardPage.tsx index d4c64baca9..03d89effea 100644 --- a/packages/app/src/KubernetesDashboardPage.tsx +++ b/packages/app/src/KubernetesDashboardPage.tsx @@ -7,6 +7,7 @@ import cx from 'classnames'; import sub from 'date-fns/sub'; import { useQueryState } from 'nuqs'; import { useForm, useWatch } from 'react-hook-form'; +import { Badge } from '@clickhouse/click-ui'; import { convertDateRangeToGranularityString } from '@hyperdx/common-utils/dist/core/utils'; import { isLogSource, @@ -20,7 +21,6 @@ import { ActionIcon, Alert, Anchor, - Badge, Breadcrumbs, Card, Flex, @@ -688,25 +688,9 @@ const NodesTable = ({ {node.name || 'N/A'} {node.ready === 1 ? ( - - Ready - + ) : ( - - Not Ready - + )} @@ -886,25 +870,9 @@ const NamespacesTable = ({ {namespace.name || 'N/A'} {namespace.phase === 1 ? ( - - Ready - + ) : ( - - Terminating - + )} diff --git a/packages/app/src/NamespaceDetailsSidePanel.tsx b/packages/app/src/NamespaceDetailsSidePanel.tsx index 946bdd8abd..5dbb278bd6 100644 --- a/packages/app/src/NamespaceDetailsSidePanel.tsx +++ b/packages/app/src/NamespaceDetailsSidePanel.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { parseAsString, useQueryState } from 'nuqs'; +import { Badge } from '@clickhouse/click-ui'; import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata'; import { convertDateRangeToGranularityString } from '@hyperdx/common-utils/dist/core/utils'; import { TLogSource, TMetricSource } from '@hyperdx/common-utils/dist/types'; import { - Badge, Card, Drawer, Flex, @@ -103,25 +103,9 @@ const NamespaceDetails = ({ label="Status" value={ properties.ready === 1 ? ( - - Ready - + ) : ( - - Not Ready - + ) } /> diff --git a/packages/app/src/NodeDetailsSidePanel.tsx b/packages/app/src/NodeDetailsSidePanel.tsx index c5a6d4ca81..20ab1ff272 100644 --- a/packages/app/src/NodeDetailsSidePanel.tsx +++ b/packages/app/src/NodeDetailsSidePanel.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { parseAsString, useQueryState } from 'nuqs'; +import { Badge } from '@clickhouse/click-ui'; import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata'; import { convertDateRangeToGranularityString } from '@hyperdx/common-utils/dist/core/utils'; import { TLogSource, TMetricSource } from '@hyperdx/common-utils/dist/types'; import { - Badge, Card, Drawer, Flex, @@ -110,25 +110,9 @@ const NodeDetails = ({ label="Status" value={ properties.ready === 1 ? ( - - Ready - + ) : ( - - Not Ready - + ) } /> diff --git a/packages/app/src/components/KubeComponents.tsx b/packages/app/src/components/KubeComponents.tsx index c039941fad..0919763c5d 100644 --- a/packages/app/src/components/KubeComponents.tsx +++ b/packages/app/src/components/KubeComponents.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; import Link from 'next/link'; import { sub } from 'date-fns'; +import { Badge } from '@clickhouse/click-ui'; import type { ResponseJSON } from '@hyperdx/common-utils/dist/clickhouse'; import { renderChartConfig } from '@hyperdx/common-utils/dist/core/renderChartConfig'; import { @@ -10,7 +11,7 @@ import { SearchConditionLanguage, TLogSource, } from '@hyperdx/common-utils/dist/types'; -import { Badge, Group, Text, Timeline } from '@mantine/core'; +import { Group, Text, Timeline } from '@mantine/core'; import { useQuery, UseQueryOptions } from '@tanstack/react-query'; import { useClickhouseClient } from '@/clickhouse'; @@ -152,13 +153,10 @@ const renderKubeEvent = (source: TLogSource) => (event: KubeEvent) => { {event['object.type'] && ( - {event['object.type']} - + size="sm" + text={event['object.type']} + state={event['object.type'] === 'Normal' ? 'success' : 'warning'} + /> )} {event['object.note'] || event['object.message']} @@ -322,40 +320,16 @@ export const KubeTimeline = ({ export const FormatPodStatus = ({ status }: { status?: number }) => { switch (status) { case KubePhase.Pending: - return ( - - Pending - - ); + return ; case KubePhase.Running: - return ( - - Running - - ); + return ; case KubePhase.Succeeded: - return ( - - Succeeded - - ); + return ; case KubePhase.Failed: - return ( - - Failed - - ); + return ; case KubePhase.Unknown: - return ( - - Unknown - - ); + return ; default: - return ( - - Unknown - - ); + return ; } }; diff --git a/packages/app/src/components/__tests__/FormatPodStatus.test.tsx b/packages/app/src/components/__tests__/FormatPodStatus.test.tsx new file mode 100644 index 0000000000..34f1277e67 --- /dev/null +++ b/packages/app/src/components/__tests__/FormatPodStatus.test.tsx @@ -0,0 +1,32 @@ +import { screen } from '@testing-library/react'; + +import { FormatPodStatus } from '@/components/KubeComponents'; +import { KubePhase } from '@/types'; + +// click-ui encodes state only in hashed CSS module class names, so the mock +// exposes the prop as an attribute to assert on. +jest.mock('@clickhouse/click-ui', () => ({ + ...jest.requireActual('@clickhouse/click-ui'), + Badge: ({ text, state }: { text: React.ReactNode; state?: string }) => ( + + {text} + + ), +})); + +describe('FormatPodStatus', () => { + it.each([ + [KubePhase.Pending, 'Pending', 'warning'], + [KubePhase.Running, 'Running', 'success'], + [KubePhase.Succeeded, 'Succeeded', 'info'], + [KubePhase.Failed, 'Failed', 'danger'], + [KubePhase.Unknown, 'Unknown', 'neutral'], + [undefined, 'Unknown', 'neutral'], + ])('renders phase %s with the %s label', (status, label, badgeState) => { + renderWithMantine(); + + const badge = screen.getByTestId('badge'); + expect(badge).toHaveTextContent(label); + expect(badge).toHaveAttribute('data-state', badgeState); + }); +});