From 7e4c3715cd988a812c22bf6369c0e1e52e1e0a1a Mon Sep 17 00:00:00 2001 From: Petra Date: Thu, 13 Nov 2025 14:40:45 +0100 Subject: [PATCH 1/9] 3496 - replace badge usages in ProjectListItem.tsx --- .../projects/components/project-list/ProjectListItem.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx b/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx index 72ec3f82748..32e9bbbc808 100644 --- a/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx +++ b/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx @@ -1,4 +1,5 @@ import '@/shared/styles/dropdownMenu.css'; +import Badge from '@/components/Badge/Badge'; import Button from '@/components/Button/Button'; import { AlertDialog, @@ -10,7 +11,6 @@ import { AlertDialogHeader, AlertDialogTitle, } from '@/components/ui/alert-dialog'; -import {Badge} from '@/components/ui/badge'; import {ButtonGroup} from '@/components/ui/button-group'; import {CollapsibleTrigger} from '@/components/ui/collapsible'; import { @@ -342,7 +342,7 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj
{project.lastPublishedDate && project.lastProjectVersion ? ( <> - + V{project.lastProjectVersion - 1} PUBLISHED @@ -365,7 +365,7 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj {/*/>*/} ) : ( - + V{project.lastProjectVersion} {project.lastStatus} From 75491aab7d7ef04ab13912d32a10e09ad16fad54 Mon Sep 17 00:00:00 2001 From: Petra Date: Thu, 13 Nov 2025 14:41:41 +0100 Subject: [PATCH 2/9] 3496 - replace badge usages in ProjectsFilterTitle.tsx --- .../automation/projects/components/ProjectsFilterTitle.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/pages/automation/projects/components/ProjectsFilterTitle.tsx b/client/src/pages/automation/projects/components/ProjectsFilterTitle.tsx index 3ffc793ed58..74ef8722e8d 100644 --- a/client/src/pages/automation/projects/components/ProjectsFilterTitle.tsx +++ b/client/src/pages/automation/projects/components/ProjectsFilterTitle.tsx @@ -1,4 +1,4 @@ -import {Badge} from '@/components/ui/badge'; +import Badge from '@/components/Badge/Badge'; import {Type} from '@/pages/automation/projects/Projects'; import {Category, Tag} from '@/shared/middleware/automation/configuration'; import {ReactNode} from 'react'; @@ -27,7 +27,7 @@ const ProjectsFilterTitle = ({
{`Filter by ${searchParams.get('tagId') ? 'tag' : 'category'}:`} - + {pageTitle ?? 'All Categories'}
From 749bcd5491a42d60fcdb3f1d6453e0f774e54590 Mon Sep 17 00:00:00 2001 From: Petra Date: Thu, 13 Nov 2025 14:42:20 +0100 Subject: [PATCH 3/9] 3496 - replace badge usages in ProjectVersionHistorySheet.tsx --- .../components/ProjectVersionHistorySheet.tsx | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/client/src/pages/automation/project/components/ProjectVersionHistorySheet.tsx b/client/src/pages/automation/project/components/ProjectVersionHistorySheet.tsx index f776878a10c..a81ab97183f 100644 --- a/client/src/pages/automation/project/components/ProjectVersionHistorySheet.tsx +++ b/client/src/pages/automation/project/components/ProjectVersionHistorySheet.tsx @@ -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 {ProjectStatus, ProjectVersion} from '@/shared/middleware/automation/configuration'; @@ -51,16 +51,18 @@ const ProjectVersionHistorySheet = ({ )} - {projectVersion.status === ProjectStatus.Published - ? `Published` - : 'Draft'} - + styleType={ + projectVersion.status === ProjectStatus.Published + ? 'success-outline' + : 'secondary-filled' + } + weight="semibold" + />
From 8497390455c6c8a4314fbf96067d783e61ae23e3 Mon Sep 17 00:00:00 2001 From: Petra Date: Thu, 13 Nov 2025 14:43:04 +0100 Subject: [PATCH 4/9] 3496 - replace badge usages in ProjectWorkflowsList.tsx --- .../projects-sidebar/components/ProjectWorkflowsList.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/src/pages/automation/project/components/projects-sidebar/components/ProjectWorkflowsList.tsx b/client/src/pages/automation/project/components/projects-sidebar/components/ProjectWorkflowsList.tsx index d15a2b4040a..19aedb461ba 100644 --- a/client/src/pages/automation/project/components/projects-sidebar/components/ProjectWorkflowsList.tsx +++ b/client/src/pages/automation/project/components/projects-sidebar/components/ProjectWorkflowsList.tsx @@ -1,4 +1,4 @@ -import {Badge} from '@/components/ui/badge'; +import Badge from '@/components/Badge/Badge'; import {Separator} from '@/components/ui/separator'; import {Tooltip, TooltipContent, TooltipTrigger} from '@/components/ui/tooltip'; import WorkflowsListItem from '@/pages/automation/project/components/projects-sidebar/components/WorkflowsListItem'; @@ -53,7 +53,7 @@ const ProjectWorkflowsList = ({ {project.lastPublishedDate && project.lastProjectVersion ? ( - + V{project.lastProjectVersion - 1} PUBLISHED @@ -61,7 +61,8 @@ const ProjectWorkflowsList = ({ ) : ( V{project.lastProjectVersion} From 28943bdea56dd94c1eac9fefeeeb93aba08e8ac0 Mon Sep 17 00:00:00 2001 From: Petra Date: Thu, 13 Nov 2025 14:44:56 +0100 Subject: [PATCH 5/9] 3496 - replace badge usages in ProjectTitle.tsx and reset bg color (to deactivate hover changes) --- .../project-header/components/ProjectTitle.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/src/pages/automation/project/components/project-header/components/ProjectTitle.tsx b/client/src/pages/automation/project/components/project-header/components/ProjectTitle.tsx index d7822850376..455a5e3fd70 100644 --- a/client/src/pages/automation/project/components/project-header/components/ProjectTitle.tsx +++ b/client/src/pages/automation/project/components/project-header/components/ProjectTitle.tsx @@ -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 {Project, ProjectStatus} from '@/shared/middleware/automation/configuration'; @@ -13,8 +13,11 @@ const ProjectTitle = ({project}: {project: Project}) => { {project && ( V{project.lastProjectVersion} From 2cb090831570517bc328fb3bf225bbf1dc7c3701 Mon Sep 17 00:00:00 2001 From: Petra Date: Thu, 13 Nov 2025 14:45:36 +0100 Subject: [PATCH 6/9] 3496 - replace badge usages in ProjectDeploymentFilterTitle.tsx --- .../components/ProjectDeploymentFilterTitle.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/pages/automation/project-deployments/components/ProjectDeploymentFilterTitle.tsx b/client/src/pages/automation/project-deployments/components/ProjectDeploymentFilterTitle.tsx index a7929d87a33..e1a25cae6e9 100644 --- a/client/src/pages/automation/project-deployments/components/ProjectDeploymentFilterTitle.tsx +++ b/client/src/pages/automation/project-deployments/components/ProjectDeploymentFilterTitle.tsx @@ -1,4 +1,4 @@ -import {Badge} from '@/components/ui/badge'; +import Badge from '@/components/Badge/Badge'; import {Type} from '@/pages/automation/project-deployments/ProjectDeployments'; import {Project, Tag} from '@/shared/middleware/automation/configuration'; import {ReactNode} from 'react'; @@ -32,7 +32,7 @@ const ProjectDeploymentFilterTitle = ({ {searchParams.get('tagId') ? 'tag' : 'project'}: - + {pageTitle ?? 'All Projects'} From a41e1af11a1b5c9f0180785e2af603c4be53eb56 Mon Sep 17 00:00:00 2001 From: Petra Date: Thu, 13 Nov 2025 14:46:36 +0100 Subject: [PATCH 7/9] 3496 - replace badge usages in ProjectDeploymentListItem.tsx --- .../project-deployment-list/ProjectDeploymentListItem.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/pages/automation/project-deployments/components/project-deployment-list/ProjectDeploymentListItem.tsx b/client/src/pages/automation/project-deployments/components/project-deployment-list/ProjectDeploymentListItem.tsx index c6ff710d7d5..0ade0519d66 100644 --- a/client/src/pages/automation/project-deployments/components/project-deployment-list/ProjectDeploymentListItem.tsx +++ b/client/src/pages/automation/project-deployments/components/project-deployment-list/ProjectDeploymentListItem.tsx @@ -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'; @@ -143,7 +143,7 @@ const ProjectDeploymentListItem = ({projectDeployment, remainingTags}: ProjectDe
- V{projectDeployment.projectVersion} + The project version From 7401690434137be94e516233ef3c9af7d717c4d8 Mon Sep 17 00:00:00 2001 From: Petra Date: Thu, 13 Nov 2025 15:14:27 +0100 Subject: [PATCH 8/9] 3496 - sf --- .../project-deployment-list/ProjectDeploymentListItem.tsx | 6 +++++- .../components/project-header/components/ProjectTitle.tsx | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/client/src/pages/automation/project-deployments/components/project-deployment-list/ProjectDeploymentListItem.tsx b/client/src/pages/automation/project-deployments/components/project-deployment-list/ProjectDeploymentListItem.tsx index 0ade0519d66..54c391e492a 100644 --- a/client/src/pages/automation/project-deployments/components/project-deployment-list/ProjectDeploymentListItem.tsx +++ b/client/src/pages/automation/project-deployments/components/project-deployment-list/ProjectDeploymentListItem.tsx @@ -143,7 +143,11 @@ const ProjectDeploymentListItem = ({projectDeployment, remainingTags}: ProjectDe
- + The project version diff --git a/client/src/pages/automation/project/components/project-header/components/ProjectTitle.tsx b/client/src/pages/automation/project/components/project-header/components/ProjectTitle.tsx index 455a5e3fd70..c0c8df34e0f 100644 --- a/client/src/pages/automation/project/components/project-header/components/ProjectTitle.tsx +++ b/client/src/pages/automation/project/components/project-header/components/ProjectTitle.tsx @@ -13,7 +13,7 @@ const ProjectTitle = ({project}: {project: Project}) => { {project && ( Date: Thu, 20 Nov 2025 14:43:56 +0100 Subject: [PATCH 9/9] 3496 - fix: add label and weight --- .../components/ProjectDeploymentFilterTitle.tsx | 4 +--- .../automation/projects/components/ProjectsFilterTitle.tsx | 4 +--- .../projects/components/project-list/ProjectListItem.tsx | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/client/src/pages/automation/project-deployments/components/ProjectDeploymentFilterTitle.tsx b/client/src/pages/automation/project-deployments/components/ProjectDeploymentFilterTitle.tsx index e1a25cae6e9..e8d4f3f1feb 100644 --- a/client/src/pages/automation/project-deployments/components/ProjectDeploymentFilterTitle.tsx +++ b/client/src/pages/automation/project-deployments/components/ProjectDeploymentFilterTitle.tsx @@ -32,9 +32,7 @@ const ProjectDeploymentFilterTitle = ({ {searchParams.get('tagId') ? 'tag' : 'project'}: - - {pageTitle ?? 'All Projects'} - +
); }; diff --git a/client/src/pages/automation/projects/components/ProjectsFilterTitle.tsx b/client/src/pages/automation/projects/components/ProjectsFilterTitle.tsx index 74ef8722e8d..392020a2466 100644 --- a/client/src/pages/automation/projects/components/ProjectsFilterTitle.tsx +++ b/client/src/pages/automation/projects/components/ProjectsFilterTitle.tsx @@ -27,9 +27,7 @@ const ProjectsFilterTitle = ({
{`Filter by ${searchParams.get('tagId') ? 'tag' : 'category'}:`} - - {pageTitle ?? 'All Categories'} - +
); }; diff --git a/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx b/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx index 32e9bbbc808..bbf5b67c2e9 100644 --- a/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx +++ b/client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx @@ -342,7 +342,7 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj
{project.lastPublishedDate && project.lastProjectVersion ? ( <> - + V{project.lastProjectVersion - 1} PUBLISHED @@ -365,7 +365,7 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj {/*/>*/} ) : ( - + V{project.lastProjectVersion} {project.lastStatus}