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

5161 - fix workspace icon is missing on multi-workspace (#5165)

Browse Source 
Fixes #5161

<img width="179" alt="image"
src="https://github.com/twentyhq/twenty/assets/68029599/5a7a5b11-c6ec-4f1f-b94d-37be470a7f79">

detail: before this PR, the icon would display as normal for the default
data:// icons, but not for uploaded files
(`workspace-logo/original/{}.png` for example). This PR fixes this by
calling the getImageAbsoluteURIOrBase64 function to resolve the missing
path.
This commit is contained in:
Hinson Chan
2024-04-25 01:01:44 -07:00
committed by GitHub
parent 2b8116f57f
commit a283a3deed
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx
View File

@ -14,6 +14,7 @@ import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/consta
import { MULTI_WORKSPACE_DROPDOWN_ID } from '@/ui/navigation/navigation-drawer/constants/MulitWorkspaceDropdownId'; import { MULTI_WORKSPACE_DROPDOWN_ID } from '@/ui/navigation/navigation-drawer/constants/MulitWorkspaceDropdownId';
import { useWorkspaceSwitching } from '@/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching'; import { useWorkspaceSwitching } from '@/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching';
import { NavigationDrawerHotKeyScope } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerHotKeyScope'; import { NavigationDrawerHotKeyScope } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerHotKeyScope';
import { getImageAbsoluteURIOrBase64 } from '~/utils/image/getImageAbsoluteURIOrBase64';
const StyledLogo = styled.div<{ logo: string }>` const StyledLogo = styled.div<{ logo: string }>`
background: url(${({ logo }) => logo}); background: url(${({ logo }) => logo});
@ -86,9 +87,11 @@ export const MultiWorkspaceDropdownButton = ({
<StyledContainer> <StyledContainer>
<StyledLogo <StyledLogo
logo={ logo={
currentWorkspace?.logo === null getImageAbsoluteURIOrBase64(
? DEFAULT_WORKSPACE_LOGO currentWorkspace?.logo === null
: currentWorkspace?.logo ?? '' ? DEFAULT_WORKSPACE_LOGO
: currentWorkspace?.logo,
) ?? ''
} }
/> />
<StyledLabel>{currentWorkspace?.displayName ?? ''}</StyledLabel> <StyledLabel>{currentWorkspace?.displayName ?? ''}</StyledLabel>
@ -107,9 +110,11 @@ export const MultiWorkspaceDropdownButton = ({
avatar={ avatar={
<StyledLogo <StyledLogo
logo={ logo={
workspace.logo === null getImageAbsoluteURIOrBase64(
? DEFAULT_WORKSPACE_LOGO workspace.logo === null
: workspace.logo ?? '' ? DEFAULT_WORKSPACE_LOGO
: workspace.logo,
) ?? ''
} }
/> />
} }