Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-08-09 05:05:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix private workspace name

Browse Source
This commit is contained in:
MingLiang Wang
2022-12-24 11:44:17 +08:00
parent b76b491a6e
commit 0d4e597be5
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
+6 -7
View File
@@ -109,18 +109,17 @@ export const SelectorPopperContent = ({
key={workspace.id} key={workspace.id}
id={workspace.id} id={workspace.id}
icon={ icon={
(workspaces[workspace.id]?.meta.avatar && workspace.type === WorkspaceType.Private
`/api/blob/${workspaces[workspace.id]?.meta.avatar}`) ||
(workspace.type === WorkspaceType.Private
? user.avatar_url ? user.avatar_url
: `loading...`) : (workspaces[workspace.id]?.meta.avatar &&
`/api/blob/${workspaces[workspace.id]?.meta.avatar}`) ||
`loading...`
} }
onClick={handleClickSettingWorkspace} onClick={handleClickSettingWorkspace}
name={ name={
workspaces[workspace.id]?.meta.name || workspace.type === WorkspaceType.Private
(workspace.type === WorkspaceType.Private
? user.name ? user.name
: `loading...`) : workspaces[workspace.id]?.meta.name || `loading...`
} }
memberCount={workSpaceDetails[workspace.id]?.memberCount || 1} memberCount={workSpaceDetails[workspace.id]?.memberCount || 1}
/> />
packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
+10 -8
View File
@@ -24,11 +24,12 @@ export const WorkspaceSelector = () => {
<Avatar <Avatar
alt="Affine" alt="Affine"
src={ src={
(currentWorkspace?.meta.avatar && workspaceMeta?.type === WorkspaceType.Private
`/api/blob/${currentWorkspace?.meta.avatar}`) || ? user
(workspaceMeta?.type === WorkspaceType.Private && user ? user.avatar_url
? user.avatar_url : ''
: '') : currentWorkspace?.meta.avatar &&
`/api/blob/${currentWorkspace?.meta.avatar}`
} }
> >
{workspaceMeta?.type === WorkspaceType.Private && user ? ( {workspaceMeta?.type === WorkspaceType.Private && user ? (
@@ -38,10 +39,11 @@ export const WorkspaceSelector = () => {
)} )}
</Avatar> </Avatar>
<WorkspaceName> <WorkspaceName>
{currentWorkspace?.meta.name || {workspaceMeta?.type === WorkspaceType.Private
(workspaceMeta?.type === WorkspaceType.Private && user ? user
? user.name ? user.name
: 'AFFiNE')} : 'AFFiNE'
: currentWorkspace?.meta.name}
</WorkspaceName> </WorkspaceName>
</SelectorWrapper> </SelectorWrapper>
</Popper> </Popper>