marketing-shibata50/multica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(web): prevent useWorkspaceId crash in AppSidebar (re-apply after merge revert)

Browse source 
AppSidebar renders before workspace hydrates. useWorkspaceId() throws
when workspace is null. Fix: read workspace?.id directly from store,
use enabled guard on inbox query. This fix was in commit 030627c but
got reverted by subsequent merge with main.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Naiyuan Qing 2026-04-08 10:44:56 +08:00
parent eed8e36a69
commit 104bbbef41
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/web/app/(dashboard)/_components/app-sidebar.tsx
View file

@ -44,8 +44,8 @@ import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip
import { useAuthStore } from "@/features/auth"; import { useAuthStore } from "@/features/auth";
import { useWorkspaceStore } from "@/features/workspace"; import { useWorkspaceStore } from "@/features/workspace";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { useWorkspaceId } from "@core/hooks"; import { inboxKeys, deduplicateInboxItems } from "@core/inbox/queries";
import { inboxListOptions, deduplicateInboxItems } from "@core/inbox/queries"; import { api } from "@/shared/api";
import { useModalStore } from "@/features/modals"; import { useModalStore } from "@/features/modals";
const primaryNav = [ const primaryNav = [
@ -76,8 +76,12 @@ export function AppSidebar() {
const workspaces = useWorkspaceStore((s) => s.workspaces); const workspaces = useWorkspaceStore((s) => s.workspaces);
const switchWorkspace = useWorkspaceStore((s) => s.switchWorkspace); const switchWorkspace = useWorkspaceStore((s) => s.switchWorkspace);
const wsId = useWorkspaceId(); const wsId = workspace?.id;
const { data: inboxItems = [] } = useQuery(inboxListOptions(wsId)); const { data: inboxItems = [] } = useQuery({
queryKey: wsId ? inboxKeys.list(wsId) : ["inbox", "disabled"],
queryFn: () => api.listInbox(),
enabled: !!wsId,
});
const unreadCount = React.useMemo( const unreadCount = React.useMemo(
() => deduplicateInboxItems(inboxItems).filter((i) => !i.read).length, () => deduplicateInboxItems(inboxItems).filter((i) => !i.read).length,
[inboxItems], [inboxItems],