admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor(ui): simplify workspace dropdown component structure (#11040)

Browse Source 
Reorganized the workspace dropdown rendering logic for improved
readability and maintainability. Ensured consistent handling of
separators and dropdown items, while preserving the existing
functionality.

Fix #11034
This commit is contained in:
Antoine Moreaux
2025-03-20 12:38:10 +01:00
committed by GitHub
parent 8b7188e85b
commit 548597bfd0
1 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx
View File

@ -127,6 +127,8 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {
> >
{currentWorkspace?.displayName} {currentWorkspace?.displayName}
</DropdownMenuHeader> </DropdownMenuHeader>
{workspaces.length > 1 && (
<>
<StyledDropdownMenuItemsContainer> <StyledDropdownMenuItemsContainer>
{workspaces {workspaces
.filter(({ id }) => id !== currentWorkspace?.id) .filter(({ id }) => id !== currentWorkspace?.id)
@ -134,7 +136,9 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {
.map((workspace) => ( .map((workspace) => (
<UndecoratedLink <UndecoratedLink
key={workspace.id} key={workspace.id}
to={buildWorkspaceUrl(getWorkspaceUrl(workspace.workspaceUrls))} to={buildWorkspaceUrl(
getWorkspaceUrl(workspace.workspaceUrls),
)}
onClick={(event) => { onClick={(event) => {
event?.preventDefault(); event?.preventDefault();
handleChange(workspace); handleChange(workspace);
@ -156,12 +160,16 @@ export const MultiWorkspaceDropdownDefaultComponents = () => {
<MenuItem <MenuItem
LeftIcon={IconSwitchHorizontal} LeftIcon={IconSwitchHorizontal}
text={t`Other workspaces`} text={t`Other workspaces`}
onClick={() => setMultiWorkspaceDropdownState('workspaces-list')} onClick={() =>
setMultiWorkspaceDropdownState('workspaces-list')
}
hasSubMenu={true} hasSubMenu={true}
/> />
)} )}
</StyledDropdownMenuItemsContainer> </StyledDropdownMenuItemsContainer>
{workspaces.length > 1 && <DropdownMenuSeparator />} <DropdownMenuSeparator />
</>
)}
<StyledDropdownMenuItemsContainer> <StyledDropdownMenuItemsContainer>
<MenuItem <MenuItem
LeftIcon={colorSchemeList.find(({ id }) => id === colorScheme)?.icon} LeftIcon={colorSchemeList.find(({ id }) => id === colorScheme)?.icon}