Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-12 04:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: display user on selection

Browse Source
This commit is contained in:
Alex Yang
2023-09-06 11:48:21 -07:00
parent 97c201836f
commit 90013780e0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/core/src/pages/workspace/detail-page.tsx
View File

@@ -15,6 +15,7 @@ import {
getCurrentStore, getCurrentStore,
} from '@toeverything/infra/atom'; } from '@toeverything/infra/atom';
import { useAtomValue, useSetAtom } from 'jotai'; import { useAtomValue, useSetAtom } from 'jotai';
import { getSession } from 'next-auth/react';
import { type ReactElement, useCallback } from 'react'; import { type ReactElement, useCallback } from 'react';
import type { LoaderFunction } from 'react-router-dom'; import type { LoaderFunction } from 'react-router-dom';
import { redirect } from 'react-router-dom'; import { redirect } from 'react-router-dom';
@@ -102,10 +103,10 @@ export const loader: LoaderFunction = async args => {
localStorage.setItem('last_workspace_id', args.params.workspaceId); localStorage.setItem('last_workspace_id', args.params.workspaceId);
rootStore.set(currentWorkspaceIdAtom, args.params.workspaceId); rootStore.set(currentWorkspaceIdAtom, args.params.workspaceId);
} }
const currentWorkspace = await rootStore.get(currentWorkspaceAtom);
if (args.params.pageId) { if (args.params.pageId) {
const pageId = args.params.pageId; const pageId = args.params.pageId;
localStorage.setItem('last_page_id', pageId); localStorage.setItem('last_page_id', pageId);
const currentWorkspace = await rootStore.get(currentWorkspaceAtom);
const page = currentWorkspace.getPage(pageId); const page = currentWorkspace.getPage(pageId);
if (!page) { if (!page) {
return redirect('/404'); return redirect('/404');
@@ -119,6 +120,11 @@ export const loader: LoaderFunction = async args => {
} else { } else {
return redirect('/404'); return redirect('/404');
} }
const session = await getSession();
const name = session?.user.name;
currentWorkspace.awarenessStore.awareness.setLocalStateField('user', {
name: name ?? 'Anonymous User',
});
return null; return null;
}; };