fix: avatar src

This commit is contained in:
DiamondThree
2022-12-23 18:42:23 +08:00
parent 2760f22493
commit c9bcd918d4
4 changed files with 21 additions and 7 deletions
@@ -77,9 +77,8 @@ export const GeneralPage = ({
const fileChange = async (file: File) => {
const blob = new Blob([file], { type: file.type });
const blobId = await uploadBlob({ blob });
const newAvatar = `/api/blob/${blobId}`;
currentWorkspace?.meta.setAvatar(newAvatar);
workspaces[workspace.id]?.meta.setAvatar(newAvatar);
currentWorkspace?.meta.setAvatar(blobId);
workspaces[workspace.id]?.meta.setAvatar(blobId);
debouncedRefreshWorkspacesMeta();
};
@@ -89,7 +88,11 @@ export const GeneralPage = ({
<StyledSettingAvatarContent>
<StyledSettingAvatar
alt="workspace avatar"
src={workspaces[workspace.id]?.meta.avatar || ''}
src={
workspaces[workspace.id]?.meta.avatar
? 'api/blob/' + workspaces[workspace.id]?.meta.avatar
: ''
}
>
{workspaces[workspace.id]?.meta.name[0]}
</StyledSettingAvatar>
@@ -108,7 +108,11 @@ export const SelectorPopperContent = ({
type={workspace.type}
key={workspace.id}
id={workspace.id}
icon={workspaces[workspace.id]?.meta.avatar || ''}
icon={
workspaces[workspace.id]?.meta.avatar
? 'api/blob/' + workspaces[workspace.id]?.meta.avatar
: ''
}
onClick={handleClickSettingWorkspace}
name={
workspaces[workspace.id]?.meta.name ||
@@ -66,7 +66,7 @@ export const WorkspaceCreate = ({ open, onClose }: WorkspaceCreateProps) => {
const handleCreateWorkspace = async () => {
setCanCreate(true);
const blobId = await createDefaultHeadImg(workspaceName);
createWorkspace({ name: workspaceName, avatar: `/api/blob/${blobId}` })
createWorkspace({ name: workspaceName, avatar: blobId })
.then(data => {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
@@ -21,7 +21,14 @@ export const WorkspaceSelector = () => {
onVisibleChange={setIsShow}
>
<SelectorWrapper data-testid="current-workspace">
<Avatar alt="Affine" src={currentWorkspace?.meta.avatar || ''}>
<Avatar
alt="Affine"
src={
currentWorkspace?.meta.avatar
? `api/blob/${currentWorkspace?.meta.avatar}`
: ''
}
>
<AffineIcon />
</Avatar>
<WorkspaceName>