From 0258417c47c0c7289f4319ec4daeea5aba765ba2 Mon Sep 17 00:00:00 2001
From: Lakshay Manchanda <45519620+lakshayman@users.noreply.github.com>
Date: Tue, 31 Mar 2026 22:32:22 +0530
Subject: [PATCH] Resolve conflict in cherry-pick of
 f4a9387947b4c9d5b1dd783bfbbcea4cdf604b91 and change the commit message

---
 ui/src/views/Sidebar/Sidebar.tsx               |  4 ++++
 .../Sidebar/Workspace/CreateWorkspace.tsx      |  5 ++++-
 .../Sidebar/Workspace/ManageWorkspaceModal.tsx |  1 +
 ui/src/views/Sidebar/Workspace/Workspace.tsx   | 15 +++++++++++++++
 .../views/Sidebar/Workspace/WorkspaceList.tsx  | 18 +++++++++++++++++-
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/Sidebar/Sidebar.tsx b/ui/src/views/Sidebar/Sidebar.tsx
index 3daec4317..a76f263bd 100644
--- a/ui/src/views/Sidebar/Sidebar.tsx
+++ b/ui/src/views/Sidebar/Sidebar.tsx
@@ -99,8 +99,12 @@ const SideBarFooter = () => (
 const Sidebar = (): JSX.Element => {
   return (
     <Flex
+<<<<<<< HEAD
       position='relative'
       as='section'
+=======
+      data-testid='app-sidebar'
+>>>>>>> f4a938794 (chore(CE): data-testid attributes to the main sidebar and workspace UI  (#1781))
       minH='100vh'
       bg='bg.canvas'
       borderRightWidth='1px'
diff --git a/ui/src/views/Sidebar/Workspace/CreateWorkspace.tsx b/ui/src/views/Sidebar/Workspace/CreateWorkspace.tsx
index 932e0b422..2c163849c 100644
--- a/ui/src/views/Sidebar/Workspace/CreateWorkspace.tsx
+++ b/ui/src/views/Sidebar/Workspace/CreateWorkspace.tsx
@@ -82,7 +82,7 @@ const CreateWorkspace = ({
 
   return (
     <form onSubmit={formik.handleSubmit}>
-      <ModalContent>
+      <ModalContent data-testid='create-workspace-modal'>
         <ModalHeader paddingX='24px' paddingY='20px'>
           <Text fontWeight={700} size='xl' color='black.500' letterSpacing='-0.2px'>
             Create a new workspace
@@ -97,6 +97,7 @@ const CreateWorkspace = ({
                 Workspace Name
               </Text>
               <Input
+                data-testid='create-workspace-name-input'
                 backgroundColor='gray.100'
                 onChange={formik.handleChange}
                 value={formik.values.name}
@@ -123,6 +124,7 @@ const CreateWorkspace = ({
               </Box>
 
               <Textarea
+                data-testid='create-workspace-description-input'
                 name='description'
                 value={formik.values.description}
                 placeholder='Enter a description'
@@ -191,6 +193,7 @@ const CreateWorkspace = ({
                 Cancel
               </Button>
               <Button
+                data-testid='create-workspace-submit'
                 variant='solid'
                 color='white'
                 rounded='lg'
diff --git a/ui/src/views/Sidebar/Workspace/ManageWorkspaceModal.tsx b/ui/src/views/Sidebar/Workspace/ManageWorkspaceModal.tsx
index d3f135f09..d5b817f3c 100644
--- a/ui/src/views/Sidebar/Workspace/ManageWorkspaceModal.tsx
+++ b/ui/src/views/Sidebar/Workspace/ManageWorkspaceModal.tsx
@@ -27,6 +27,7 @@ const ManageWorkspaceModal = ({
   return (
     <>
       <Box
+        data-testid='manage-workspaces'
         _hover={{ bgColor: 'gray.300' }}
         w='100%'
         py='8px'
diff --git a/ui/src/views/Sidebar/Workspace/Workspace.tsx b/ui/src/views/Sidebar/Workspace/Workspace.tsx
index 1f4429bf3..322a819de 100644
--- a/ui/src/views/Sidebar/Workspace/Workspace.tsx
+++ b/ui/src/views/Sidebar/Workspace/Workspace.tsx
@@ -52,7 +52,22 @@ const Workspace = () => {
     <>
       <Popover closeOnEsc isOpen={isPopOverOpen} onClose={() => setIsPopOverOpen(false)}>
         <PopoverTrigger>
+<<<<<<< HEAD
           <Box cursor='pointer'>
+=======
+          <Box
+            data-testid='workspace-selector-trigger'
+            bgColor='gray.200'
+            px={2}
+            py={2}
+            rounded='lg'
+            _hover={{ bgColor: 'gray.300' }}
+            borderWidth='1px'
+            borderColor='gray.400'
+            borderStyle='solid'
+            cursor='pointer'
+          >
+>>>>>>> f4a938794 (chore(CE): data-testid attributes to the main sidebar and workspace UI  (#1781))
             <Box
               bgColor='gray.300'
               px={2}
diff --git a/ui/src/views/Sidebar/Workspace/WorkspaceList.tsx b/ui/src/views/Sidebar/Workspace/WorkspaceList.tsx
index c62f862a9..2ba1fa640 100644
--- a/ui/src/views/Sidebar/Workspace/WorkspaceList.tsx
+++ b/ui/src/views/Sidebar/Workspace/WorkspaceList.tsx
@@ -27,7 +27,7 @@ const WorkspaceList = ({
   organizationName,
 }: WorkspacListProps) => {
   return (
-    <ModalContent>
+    <ModalContent data-testid='workspace-select-modal'>
       <ModalHeader paddingX='24px' paddingY='20px'>
         <Text fontWeight={700} size='xl' color='black.500' letterSpacing='-0.2px'>
           Select a workspace
@@ -102,6 +102,7 @@ const WorkspaceList = ({
             >
               Cancel
             </Button>
+<<<<<<< HEAD
             <Button
               variant='solid'
               color='white'
@@ -112,6 +113,21 @@ const WorkspaceList = ({
             >
               Create New Workspace
             </Button>
+=======
+            <RoleAccess location='workspace' type='item' action={UserActions.Create}>
+              <Button
+                data-testid='create-new-workspace'
+                variant='solid'
+                color='white'
+                rounded='lg'
+                onClick={handleCreateNewWorkspace}
+                minWidth={0}
+                width='auto'
+              >
+                Create New Workspace
+              </Button>
+            </RoleAccess>
+>>>>>>> f4a938794 (chore(CE): data-testid attributes to the main sidebar and workspace UI  (#1781))
           </Flex>
         </Box>
       </ModalFooter>