Skip to content

3499 - Replace badges in Integrations & Instances #3511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 24, 2025
Merged

3499 - Replace badges in Integrations & Instances #3511

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b1eb7ff
3499 - replace badge usages in IntegrationsFilterTitle.tsx
petrapaz Nov 14, 2025
52eb739
3499 - replace badge usages in IntegrationListItem.tsx
petrapaz Nov 14, 2025
b6a83eb
3499 - replace badge usages in IntegrationVersionHistorySheet.tsx
petrapaz Nov 14, 2025
55112f5
3499 - replace badge usages in IntegrationsSidebar.tsx
petrapaz Nov 14, 2025
6bfacaa
3499 - replace badge usages in IntegrationHeaderTitle.tsx
petrapaz Nov 14, 2025
1757f3f
3499 - replace badge usages in IntegrationInstanceConfigurationsFilte…
petrapaz Nov 14, 2025
c8e9be9
3499 - replace badge usages in IntegrationInstanceConfigurationListIt…
petrapaz Nov 14, 2025
f27bdd6
3499 - add badge label in IntegrationsFilterTitle.tsx
petrapaz Nov 23, 2025
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
4 changes: 2 additions & 2 deletions ...ation-instance-configurations/components/IntegrationInstanceConfigurationsFilterTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Badge} from '@/components/ui/badge';
import Badge from '@/components/Badge/Badge';
import {Type} from '@/ee/pages/embedded/integration-instance-configurations/IntegrationInstanceConfigurations';
import {Integration, Tag} from '@/ee/shared/middleware/embedded/configuration';
import {ReactNode} from 'react';
Expand Down Expand Up @@ -31,7 +31,7 @@ const IntegrationInstanceConfigurationsFilterTitle = ({
{searchParams.get('tagId') ? 'tag' : 'integration'}:
</span>

<Badge variant="secondary">
<Badge styleType="secondary-filled" weight="semibold">
<span className="text-sm">{pageTitle ?? 'All Integrations'}</span>
</Badge>
</div>
Expand Down
12 changes: 6 additions & 6 deletions ...ents/integration-instance-configuration-list/IntegrationInstanceConfigurationListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Badge from '@/components/Badge/Badge';
import LoadingIcon from '@/components/LoadingIcon';
import {Badge} from '@/components/ui/badge';
import {CollapsibleTrigger} from '@/components/ui/collapsible';
import {Switch} from '@/components/ui/switch';
import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
Expand Down Expand Up @@ -162,11 +162,11 @@ const IntegrationInstanceConfigurationListItem = ({
<div className="flex items-center justify-end gap-x-6">
<Tooltip>
<TooltipTrigger asChild>
<Badge variant="secondary">
<Badge variant="secondary">
V{integrationInstanceConfiguration.integrationVersion}
</Badge>
</Badge>
<Badge
label={`V${integrationInstanceConfiguration.integrationVersion}`}
styleType="secondary-filled"
weight="semibold"
/>
</TooltipTrigger>

<TooltipContent>The integration version</TooltipContent>
Expand Down
14 changes: 7 additions & 7 deletions client/src/ee/pages/embedded/integration/components/IntegrationVersionHistorySheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Badge from '@/components/Badge/Badge';
import {Accordion, AccordionContent, AccordionItem, AccordionTrigger} from '@/components/ui/accordion';
import {Badge} from '@/components/ui/badge';
import {Sheet, SheetCloseButton, SheetContent, SheetHeader, SheetTitle} from '@/components/ui/sheet';
import {IntegrationStatus} from '@/ee/shared/middleware/embedded/configuration';
import {useGetIntegrationVersionsQuery} from '@/ee/shared/queries/embedded/integrationVersions.queries';
Expand Down Expand Up @@ -51,14 +51,14 @@ const IntegrationVersionHistorySheet = ({integrationId, onClose}: IntegrationVer
)}

<Badge
variant={
label={integrationVersion.status ?? ''}
styleType={
integrationVersion.status === IntegrationStatus.Published
? 'success'
: 'secondary'
? 'success-outline'
: 'secondary-filled'
}
>
{integrationVersion.status}
</Badge>
weight="semibold"
/>
</div>
</div>
</AccordionTrigger>
Expand Down
4 changes: 2 additions & 2 deletions ...rc/ee/pages/embedded/integration/components/integration-header/IntegrationHeaderTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Badge} from '@/components/ui/badge';
import Badge from '@/components/Badge/Badge';
import {Button} from '@/components/ui/button';
import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
import useIntegrationsLeftSidebarStore from '@/ee/pages/embedded/integration/stores/useIntegrationsLeftSidebarStore';
Expand Down Expand Up @@ -37,7 +37,7 @@ const IntegrationHeaderTitle = ({integration}: {integration: Integration}) => {
<h1>{integration?.name}</h1>

{integration && (
<Badge className="flex space-x-1" variant="secondary">
<Badge className="flex space-x-1" styleType="secondary-filled" weight="semibold">
<span>V{integration.lastIntegrationVersion}</span>

<span>{integration.lastStatus}</span>
Expand Down
6 changes: 3 additions & 3 deletions ...src/ee/pages/embedded/integration/components/integrations-sidebar/IntegrationsSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Badge} from '@/components/ui/badge';
import Badge from '@/components/Badge/Badge';
import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip';
import {useGetIntegrationsQuery} from '@/ee/shared/queries/embedded/integrations.queries';
import * as React from 'react';
Expand Down Expand Up @@ -62,13 +62,13 @@ const IntegrationsSidebar = ({integrationId}: {integrationId: number}) => {
</div>

{curIntegration.lastPublishedDate && curIntegration.lastIntegrationVersion ? (
<Badge className="flex space-x-1" variant="success">
<Badge className="flex space-x-1" styleType="success-outline" weight="semibold">
<span>V{curIntegration.lastIntegrationVersion - 1}</span>

<span>PUBLISHED</span>
</Badge>
) : (
<Badge className="flex space-x-1" variant="outline">
<Badge className="flex space-x-1" styleType="secondary-filled" weight="semibold">
<span>V{curIntegration.lastIntegrationVersion}</span>

<span>{curIntegration.lastStatus}</span>
Expand Down
4 changes: 2 additions & 2 deletions client/src/ee/pages/embedded/integrations/components/IntegrationsFilterTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Badge} from '@/components/ui/badge';
import Badge from '@/components/Badge/Badge';
import {Type} from '@/ee/pages/embedded/integrations/Integrations';
import {Category, Tag} from '@/ee/shared/middleware/embedded/configuration';
import {ReactNode} from 'react';
Expand Down Expand Up @@ -27,7 +27,7 @@ const IntegrationsFilterTitle = ({
<div className="space-x-1">
<span className="text-sm uppercase text-muted-foreground">{`Filter by ${searchParams.get('tagId') ? 'tag' : 'category'}:`}</span>

<Badge variant="secondary">
<Badge styleType="secondary-filled" weight="semibold">
<span className="text-sm">{pageTitle ?? 'All Categories'}</span>
</Badge>
</div>
Expand Down
6 changes: 3 additions & 3 deletions ...nt/src/ee/pages/embedded/integrations/components/integration-list/IntegrationListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import '@/shared/styles/dropdownMenu.css';
import Badge from '@/components/Badge/Badge';
import Button from '@/components/Button/Button';
import {
AlertDialog,
Expand All @@ -10,7 +11,6 @@ import {
AlertDialogHeader,
AlertDialogTitle,
} from '@/components/ui/alert-dialog';
import {Badge} from '@/components/ui/badge';
import {CollapsibleTrigger} from '@/components/ui/collapsible';
import {
DropdownMenu,
Expand Down Expand Up @@ -213,13 +213,13 @@ const IntegrationListItem = ({integration, remainingTags}: IntegrationItemProps)
{integration.lastIntegrationVersion && (
<div className="flex flex-col items-end gap-y-4">
{integration.lastPublishedDate && integration.lastIntegrationVersion ? (
<Badge className="flex space-x-1" variant="success">
<Badge className="flex space-x-1" styleType="success-outline" weight="semibold">
<span>V{integration.lastIntegrationVersion - 1}</span>

<span>PUBLISHED</span>
</Badge>
) : (
<Badge className="flex space-x-1" variant="secondary">
<Badge className="flex space-x-1" styleType="secondary-filled" weight="semibold">
<span>V{integration.lastIntegrationVersion}</span>

<span>{integration.lastStatus}</span>
Expand Down
Loading