Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/metrics-charts-mv-badges-click-ui.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@hyperdx/app': patch
---

feat: use the click-ui `Badge` in the metric explorer, the chart series and
formula editors, the tile alert editor, the materialized view indicator and
modal, and the span kind in the row side panel.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import {
UseFormSetValue,
useWatch,
} from 'react-hook-form';
import { Badge } from '@clickhouse/click-ui';
import { validateFormula } from '@hyperdx/common-utils/dist/core/formula';
import { Badge, TextInput } from '@mantine/core';
import { TextInput } from '@mantine/core';
import { useDisclosure } from '@mantine/hooks';

import { ChartSeriesControls } from '@/components/ChartEditor/ChartSeriesControls';
Expand Down Expand Up @@ -81,11 +82,7 @@ export function ChartFormulaEditor({
onSubmit={onSubmit}
onRemove={onRemoveFormula}
onOpenNumberFormat={openNumberFormat}
leadingSection={
<Badge size="sm" radius="sm" variant="light" color="teal">
Formula
</Badge>
}
leadingSection={<Badge size="sm" text="Formula" state="success" />}
/>
<Controller
control={control}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
UseFormSetValue,
useWatch,
} from 'react-hook-form';
import { Badge } from '@clickhouse/click-ui';
import { indexToSeriesRef } from '@hyperdx/common-utils/dist/core/formula';
import {
DateRange,
Expand All @@ -14,7 +15,7 @@ import {
SourceKind,
TSource,
} from '@hyperdx/common-utils/dist/types';
import { ActionIcon, Badge, Flex, Group, Text, Tooltip } from '@mantine/core';
import { ActionIcon, Flex, Group, Text, Tooltip } from '@mantine/core';
import { useDisclosure } from '@mantine/hooks';
import { IconListSearch, IconPalette } from '@tabler/icons-react';

Expand Down Expand Up @@ -310,13 +311,10 @@ export function ChartSeriesEditor({
<Tooltip label="Reference this series in a formula by this letter">
<Badge
size="sm"
radius="sm"
variant="light"
color="gray"
text={indexToSeriesRef(index) ?? index + 1}
state="neutral"
data-testid="series-ref-badge"
>
{indexToSeriesRef(index) ?? index + 1}
</Badge>
/>
</Tooltip>
) : undefined
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
UseFormSetValue,
useWatch,
} from 'react-hook-form';
import { Badge } from '@clickhouse/click-ui';
import { formatTileAlertDisplayName } from '@hyperdx/common-utils/dist/alerts';
import {
AlertThresholdType,
Expand All @@ -12,7 +13,6 @@ import {
import {
ActionIcon,
Alert,
Badge,
Box,
Group,
NativeSelect,
Expand Down Expand Up @@ -134,20 +134,21 @@ export function TileAlertEditor({
{error && (
<Tooltip label={error} withArrow>
<Badge
color="var(--color-text-danger)"
size="xs"
variant="light"
ml="xs"
>
Invalid Query
</Badge>
size="sm"
text="Invalid query"
state="danger"
style={{ marginLeft: 'var(--mantine-spacing-xs)' }}
/>
</Tooltip>
)}
{warning && (
<Tooltip label={warning} withArrow>
<Badge color="yellow" size="xs" variant="light" ml="xs">
Warning
</Badge>
<Badge
size="sm"
text="Warning"
state="warning"
style={{ marginLeft: 'var(--mantine-spacing-xs)' }}
/>
</Tooltip>
)}
</Group>
Expand Down
6 changes: 2 additions & 4 deletions packages/app/src/components/DBRowSidePanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { isString } from 'lodash';
import { ErrorBoundary, FallbackProps } from 'react-error-boundary';
import { useHotkeys } from 'react-hotkeys-hook';
import SqlString from 'sqlstring';
import { Badge } from '@clickhouse/click-ui';
import {
isLogSource,
isTraceSource,
Expand All @@ -23,7 +24,6 @@ import {
import { BuilderChartConfigWithDateRange } from '@hyperdx/common-utils/dist/types';
import {
ActionIcon,
Badge,
Box,
Button,
CopyButton,
Expand Down Expand Up @@ -978,9 +978,7 @@ export const DBRowSidePanelInner = ({
</>
)}
{sourceIsTrace && spanKindLabel && (
<Badge size="sm" variant="light" radius="sm">
{spanKindLabel}
</Badge>
<Badge size="sm" text={spanKindLabel} state="info" />
)}
{(sourceIsTrace ? traceId : showLogTraceActions) && (
<>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { useState } from 'react';
import { Badge } from '@clickhouse/click-ui';
import {
BuilderChartConfigWithOptDateRange,
SourceKind,
TSource,
} from '@hyperdx/common-utils/dist/types';
import { ActionIcon, Badge, Tooltip } from '@mantine/core';
import { ActionIcon, Tooltip } from '@mantine/core';
import { IconBolt, IconBoltOff } from '@tabler/icons-react';

import { useMVOptimizationExplanation } from '@/hooks/useMVOptimizationExplanation';
Expand All @@ -22,10 +23,10 @@ function MVOptimizationIcon({
onClick: () => void;
}) {
return isInWarningState ? (
<Tooltip label="Not Accelerated">
<Tooltip label="Not accelerated">
<ActionIcon
onClick={onClick}
aria-label="Not Accelerated"
aria-label="Not accelerated"
data-testid="mv-optimization-indicator"
data-mv-accelerated="false"
>
Expand Down Expand Up @@ -55,14 +56,13 @@ function MVOptimizationBadge({
}) {
return (
<Badge
color={isInWarningState ? WARNING_COLOR : SUCCESS_COLOR}
text={isInWarningState ? 'Not accelerated' : 'Accelerated'}
state={isInWarningState ? 'warning' : 'success'}
onClick={onClick}
className="cursor-pointer"
data-testid="mv-optimization-indicator"
data-mv-accelerated={isInWarningState ? 'false' : 'true'}
>
{isInWarningState ? 'Not Accelerated' : 'Accelerated'}
</Badge>
/>
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
import { useMemo } from 'react';
import { Badge } from '@clickhouse/click-ui';
import { MVOptimizationExplanation } from '@hyperdx/common-utils/dist/core/materializedViews';
import { MaterializedViewConfiguration } from '@hyperdx/common-utils/dist/types';
import {
Accordion,
Alert,
Badge,
Group,
Modal,
Text,
Tooltip,
} from '@mantine/core';
import { Accordion, Alert, Group, Modal, Text, Tooltip } from '@mantine/core';

import MVConfigSummary from './MVConfigSummary';

const WARNING_COLOR = 'var(--color-bg-warning)';
const SUCCESS_COLOR = 'var(--color-bg-success)';

function mvConfigToKey(config: MaterializedViewConfiguration) {
return `mv-${config.databaseName}-${config.tableName}`;
}
Expand Down Expand Up @@ -75,35 +65,38 @@ export default function MVOptimizationModal({
{isBeingUsedByOptimizedConfig ? (
<Tooltip label={`Estimated rows scanned: ${rowEstimate}`}>
<Badge
me="md"
color={SUCCESS_COLOR}
text="Active"
state="success"
style={{
marginInlineEnd: 'var(--mantine-spacing-md)',
}}
data-testid="mv-optimization-modal-status"
data-mv-status="active"
>
Active
</Badge>
/>
</Tooltip>
) : hasErrors ? (
<Tooltip label="This materialized view is not compatible with the selected query.">
<Badge
me="md"
color={WARNING_COLOR}
text="Incompatible"
state="warning"
style={{
marginInlineEnd: 'var(--mantine-spacing-md)',
}}
data-testid="mv-optimization-modal-status"
data-mv-status="incompatible"
>
Incompatible
</Badge>
/>
</Tooltip>
) : explanation ? (
<Tooltip label={`Estimated rows scanned: ${rowEstimate}`}>
<Badge
me="md"
color="gray"
text="Skipped"
state="neutral"
style={{
marginInlineEnd: 'var(--mantine-spacing-md)',
}}
data-testid="mv-optimization-modal-status"
data-mv-status="skipped"
>
Skipped
</Badge>
/>
</Tooltip>
) : null}
</Group>
Expand Down
38 changes: 22 additions & 16 deletions packages/app/src/components/MetricAttributeHelperPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useCallback, useMemo, useState } from 'react';
import { Badge } from '@clickhouse/click-ui';
import { TMetricSource } from '@hyperdx/common-utils/dist/types';
import {
Badge,
Box,
Button,
Collapse,
Expand Down Expand Up @@ -237,9 +237,11 @@ export function AttributeValueList({
<Text size="sm" fw={500}>
{attribute.name}
</Text>
<Badge size="xs" variant="default">
{CATEGORY_LABELS[attribute.category]}
</Badge>
<Badge
size="sm"
text={CATEGORY_LABELS[attribute.category]}
state="neutral"
/>
</Group>
</UnstyledButton>
{onAddToGroupBy && (
Expand Down Expand Up @@ -366,9 +368,7 @@ export function AttributeList({
<Text size="xs" fw={600} c="dimmed">
{CATEGORY_LABELS[category]}
</Text>
<Badge size="xs" variant="default">
{attrs.length}
</Badge>
<Badge size="sm" text={attrs.length} state="neutral" />
</Group>
<Flex gap={6} wrap="wrap">
{attrs.map(attr => (
Expand Down Expand Up @@ -447,22 +447,28 @@ export function MetricAttributeHelperPanel({
<Text size="xs" c="dimmed">
Unit:
</Text>
<Badge size="xs" variant="light">
{formatUnitDisplay(metricMetadata.unit)}
</Badge>
<Badge
size="sm"
text={formatUnitDisplay(metricMetadata.unit)}
state="info"
/>
</Group>
)}
</Box>
<Group gap="xs" wrap="nowrap">
{!!metricType && (
<Badge size="xs" variant="light">
{metricKindLabel(metricType)}
</Badge>
<Badge
size="sm"
text={metricKindLabel(metricType)}
state="info"
/>
)}
{attributeKeys.length > 0 && (
<Badge size="xs" variant="light">
{attributeKeys.length} attributes
</Badge>
<Badge
size="sm"
text={`${attributeKeys.length} attributes`}
state="neutral"
/>
)}
<IconChevronDown
size={16}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useCallback, useMemo, useState } from 'react';
import { Badge } from '@clickhouse/click-ui';
import { TMetricSource } from '@hyperdx/common-utils/dist/types';
import {
Badge,
Box,
Divider,
Group,
Expand Down Expand Up @@ -116,9 +116,12 @@ function MetricDetail({
<Text size="sm" fw={600} style={{ wordBreak: 'break-all' }}>
{metricName}
</Text>
<Badge size="xs" variant="light" style={{ flexShrink: 0 }}>
{METRIC_KIND_LABELS[metricType]}
</Badge>
<Badge
size="sm"
text={METRIC_KIND_LABELS[metricType]}
state="info"
style={{ flexShrink: 0 }}
/>
</Group>

<Stack gap={4} mt={4}>
Expand Down Expand Up @@ -159,9 +162,7 @@ function MetricDetail({
Tags
</Text>
{attributeKeys.length > 0 && (
<Badge size="xs" variant="default" fw="normal">
{attributeKeys.length}
</Badge>
<Badge size="sm" text={attributeKeys.length} state="neutral" />
)}
</Group>

Expand Down
Loading