diff --git a/.changeset/tags-settings-badges-click-ui.md b/.changeset/tags-settings-badges-click-ui.md new file mode 100644 index 0000000000..62c374df26 --- /dev/null +++ b/.changeset/tags-settings-badges-click-ui.md @@ -0,0 +1,7 @@ +--- +'@hyperdx/app': patch +--- + +feat: use the click-ui `Badge` for dashboard and alert tags, and for the +"Experimental", "Beta", "Disabled", "Dev only", team member, and pending +invite badges in settings. diff --git a/packages/app/src/UserPreferencesModal.tsx b/packages/app/src/UserPreferencesModal.tsx index e65df5d2f0..5683706dd7 100644 --- a/packages/app/src/UserPreferencesModal.tsx +++ b/packages/app/src/UserPreferencesModal.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; +import { Badge } from '@clickhouse/click-ui'; import { Autocomplete, - Badge, Divider, Group, Modal, @@ -11,7 +11,6 @@ import { Text, Tooltip, } from '@mantine/core'; -import { IconFlask } from '@tabler/icons-react'; import { isContentFontSize, @@ -149,9 +148,7 @@ export const UserPreferencesModal = ({ label={ Appearance - - Experimental - + } labelPosition="left" @@ -211,14 +208,12 @@ export const UserPreferencesModal = ({ w={220} > } - > - Dev Only - + size="sm" + text="Dev only" + state="neutral" + icon="flask" + iconDir="start" + /> } diff --git a/packages/app/src/components/Iac/TerraformHelperPanel.tsx b/packages/app/src/components/Iac/TerraformHelperPanel.tsx index 23a9878432..fb6bb67087 100644 --- a/packages/app/src/components/Iac/TerraformHelperPanel.tsx +++ b/packages/app/src/components/Iac/TerraformHelperPanel.tsx @@ -1,7 +1,7 @@ import { useState } from 'react'; +import { Badge } from '@clickhouse/click-ui'; import { Anchor, - Badge, Collapse, Group, ScrollArea, @@ -67,9 +67,7 @@ export function TerraformHelperPanel({ Terraform - - Experimental - + ClickStack resources in the ClickHouse Terraform provider are in alpha — diff --git a/packages/app/src/components/ListingCard.tsx b/packages/app/src/components/ListingCard.tsx index 9392b5f3bf..f2840a7667 100644 --- a/packages/app/src/components/ListingCard.tsx +++ b/packages/app/src/components/ListingCard.tsx @@ -1,14 +1,7 @@ import Link from 'next/link'; import { formatDistanceToNow } from 'date-fns'; -import { - ActionIcon, - Badge, - Card, - Group, - Menu, - Text, - Tooltip, -} from '@mantine/core'; +import { Badge } from '@clickhouse/click-ui'; +import { ActionIcon, Card, Group, Menu, Text, Tooltip } from '@mantine/core'; import { IconDots, IconTrash } from '@tabler/icons-react'; import { FavoriteButton } from '@/components/FavoriteButton'; @@ -118,9 +111,7 @@ export function ListingCard({ {tags && tags.length > 0 && ( {tags.map(tag => ( - - {tag} - + ))} )} diff --git a/packages/app/src/components/ListingListRow.tsx b/packages/app/src/components/ListingListRow.tsx index cd393897ed..1df8241ed2 100644 --- a/packages/app/src/components/ListingListRow.tsx +++ b/packages/app/src/components/ListingListRow.tsx @@ -1,14 +1,7 @@ import Router from 'next/router'; import { formatDistanceToNow } from 'date-fns'; -import { - ActionIcon, - Badge, - Group, - Menu, - Table, - Text, - Tooltip, -} from '@mantine/core'; +import { Badge } from '@clickhouse/click-ui'; +import { ActionIcon, Group, Menu, Table, Text, Tooltip } from '@mantine/core'; import { IconDots, IconTrash } from '@tabler/icons-react'; import { FormatTime } from '@/useFormatTime'; @@ -61,9 +54,7 @@ export function ListingRow({ {tags?.map(tag => ( - - {tag} - + ))} diff --git a/packages/app/src/components/ServiceMap/ServiceMapSidePanel.tsx b/packages/app/src/components/ServiceMap/ServiceMapSidePanel.tsx index d964e25d31..8bb3040305 100644 --- a/packages/app/src/components/ServiceMap/ServiceMapSidePanel.tsx +++ b/packages/app/src/components/ServiceMap/ServiceMapSidePanel.tsx @@ -1,5 +1,6 @@ +import { Badge } from '@clickhouse/click-ui'; import { SourceKind } from '@hyperdx/common-utils/dist/types'; -import { Badge, Group, Stack, Text } from '@mantine/core'; +import { Group, Stack, Text } from '@mantine/core'; import { useSource } from '@/source'; @@ -24,9 +25,12 @@ export default function ServiceMapSidePanel({ Service Map - - Beta - + {traceTableSource && traceTableSource.kind === SourceKind.Trace ? ( {s.disabled && ( - - Disabled - + )} diff --git a/packages/app/src/components/TeamSettings/IacMigrationSection.tsx b/packages/app/src/components/TeamSettings/IacMigrationSection.tsx index 6129dab1a6..9b10138bc8 100644 --- a/packages/app/src/components/TeamSettings/IacMigrationSection.tsx +++ b/packages/app/src/components/TeamSettings/IacMigrationSection.tsx @@ -1,4 +1,5 @@ import { useMemo, useState } from 'react'; +import { Badge } from '@clickhouse/click-ui'; import { buildImportFile, collectImportableResources, @@ -9,7 +10,6 @@ import { } from '@hyperdx/common-utils/dist/iac'; import { Alert, - Badge, Box, Button, Card, @@ -231,9 +231,7 @@ export default function IacMigrationSection({ Export to Terraform - - Experimental - + diff --git a/packages/app/src/components/TeamSettings/TeamMembersSection.tsx b/packages/app/src/components/TeamSettings/TeamMembersSection.tsx index 291dc336a2..a681151bbb 100644 --- a/packages/app/src/components/TeamSettings/TeamMembersSection.tsx +++ b/packages/app/src/components/TeamSettings/TeamMembersSection.tsx @@ -1,8 +1,8 @@ import { useState } from 'react'; import { HTTPError } from 'ky'; import CopyToClipboard from 'react-copy-to-clipboard'; +import { Badge } from '@clickhouse/click-ui'; import { - Badge, Box, Button, Card, @@ -243,9 +243,14 @@ export default function TeamMembersSection() {
{member.isCurrentUser && ( - - You - + )} {member.name} @@ -263,13 +268,10 @@ export default function TeamMembersSection() { {member.groupName && ( - {member.groupName} - + size="sm" + text={member.groupName} + state="success" + /> )} @@ -303,9 +305,13 @@ export default function TeamMembersSection() { - - Pending Invite - +