@tuturuuu/ui 0.9.0 → 0.10.0

package/src/components/ui/tu-do/shared/__tests__/task-cache-patches.test.ts

@@ -0,0 +1,147 @@
+import { QueryClient } from '@tanstack/react-query';
+import type { Task } from '@tuturuuu/types/primitives/Task';
+import { describe, expect, it } from 'vitest';
+import {
+  patchTaskInVisibleCaches,
+  restoreTasksFromVisibleCacheSnapshot,
+  snapshotVisibleTaskCaches,
+} from '../task-cache-patches';
+
+function createQueryClient() {
+  return new QueryClient({
+    defaultOptions: {
+      queries: { retry: false },
+      mutations: { retry: false },
+    },
+  });
+}
+
+function createTask(id: string, name = id): Task {
+  return {
+    id,
+    name,
+    list_id: 'list-1',
+    display_number: 1,
+    created_at: '2026-01-01T00:00:00.000Z',
+    labels: [],
+    projects: [],
+    assignees: [],
+  };
+}
+
+describe('task-cache-patches', () => {
+  it('patches every visible cache that can render a task card or detail view', () => {
+    const queryClient = createQueryClient();
+    const task = createTask('task-1');
+
+    queryClient.setQueryData(['tasks', 'board-1'], [task]);
+    queryClient.setQueryData(['tasks-full', 'board-1', 'all'], [task]);
+    queryClient.setQueryData(['task', 'task-1'], task);
+    queryClient.setQueryData(['workspaceTask', 'ws-1', 'task-1'], { task });
+    queryClient.setQueryData(['my-tasks', 'ws-1'], {
+      overdue: [],
+      today: [task],
+      upcoming: [],
+      completed: [],
+    });
+    queryClient.setQueryData(['my-completed-tasks', 'ws-1'], {
+      pages: [{ completed: [task] }],
+    });
+    const patchedLabel = {
+      id: 'label-1',
+      name: 'Bug',
+      color: '#ef4444',
+      created_at: '2026-01-01T00:00:00.000Z',
+    };
+
+    patchTaskInVisibleCaches({
+      queryClient,
+      boardId: 'board-1',
+      taskId: 'task-1',
+      updater: (cachedTask) => ({
+        ...cachedTask,
+        labels: [patchedLabel],
+      }),
+    });
+
+    expect(
+      queryClient.getQueryData<Task[]>(['tasks', 'board-1'])?.[0]?.labels
+    ).toEqual([patchedLabel]);
+    expect(
+      queryClient.getQueryData<Task[]>(['tasks-full', 'board-1', 'all'])?.[0]
+        ?.labels
+    ).toEqual([patchedLabel]);
+    expect(queryClient.getQueryData<Task>(['task', 'task-1'])?.labels).toEqual([
+      patchedLabel,
+    ]);
+    expect(
+      queryClient.getQueryData<{ task?: Task }>([
+        'workspaceTask',
+        'ws-1',
+        'task-1',
+      ])?.task?.labels
+    ).toEqual([patchedLabel]);
+    expect(
+      queryClient.getQueryData<{ today?: Task[] }>(['my-tasks', 'ws-1'])
+        ?.today?.[0]?.labels
+    ).toEqual([patchedLabel]);
+    expect(
+      queryClient.getQueryData<{ pages?: Array<{ completed?: Task[] }> }>([
+        'my-completed-tasks',
+        'ws-1',
+      ])?.pages?.[0]?.completed?.[0]?.labels
+    ).toEqual([patchedLabel]);
+  });
+
+  it('restores only failed task ids from a snapshot', () => {
+    const queryClient = createQueryClient();
+    const taskOne = createTask('task-1', 'One');
+    const taskTwo = createTask('task-2', 'Two');
+
+    queryClient.setQueryData(['tasks', 'board-1'], [taskOne, taskTwo]);
+    queryClient.setQueryData(
+      ['tasks-full', 'board-1', 'all'],
+      [taskOne, taskTwo]
+    );
+    const snapshot = snapshotVisibleTaskCaches(queryClient, 'board-1', [
+      'task-1',
+      'task-2',
+    ]);
+
+    for (const taskId of ['task-1', 'task-2']) {
+      patchTaskInVisibleCaches({
+        queryClient,
+        boardId: 'board-1',
+        taskId,
+        updater: (cachedTask) => ({
+          ...cachedTask,
+          projects: [{ id: 'project-1', name: 'Roadmap', status: 'active' }],
+        }),
+      });
+    }
+
+    restoreTasksFromVisibleCacheSnapshot({
+      queryClient,
+      snapshot,
+      taskIds: ['task-2'],
+    });
+
+    const tasks = queryClient.getQueryData<Task[]>(['tasks', 'board-1']);
+    const fullTasks = queryClient.getQueryData<Task[]>([
+      'tasks-full',
+      'board-1',
+      'all',
+    ]);
+
+    expect(tasks?.find((task) => task.id === 'task-1')?.projects).toEqual([
+      { id: 'project-1', name: 'Roadmap', status: 'active' },
+    ]);
+    expect(tasks?.find((task) => task.id === 'task-2')?.projects).toEqual([]);
+    expect(fullTasks?.find((task) => task.id === 'task-1')?.projects).toEqual([
+      { id: 'project-1', name: 'Roadmap', status: 'active' },
+    ]);
+    expect(fullTasks?.find((task) => task.id === 'task-2')?.projects).toEqual(
+      []
+    );
+  });
+});

package/src/components/ui/tu-do/shared/__tests__/use-progressive-board-loader.test.tsx

@@ -71,6 +71,7 @@ describe('useProgressiveBoardLoader', () => {
       limit: 50,
       offset: 0,
       includeCount: true,
+      includeRelationshipSummary: false,
     });
     expect(queryClient.getQueryData<Task[]>(['tasks', 'board-1'])).toEqual([
       {
@@ -160,6 +161,7 @@ describe('useProgressiveBoardLoader', () => {
       externalIncludeDocuments: true,
       externalIncludeDoneClosed: true,
       externalSortBy: 'due-asc',
+      includeRelationshipSummary: false,
     });
 
     vi.mocked(listWorkspaceTasks).mockResolvedValueOnce({
@@ -179,6 +181,7 @@ describe('useProgressiveBoardLoader', () => {
       externalIncludeDocuments: true,
       externalIncludeDoneClosed: true,
       externalSortBy: 'due-asc',
+      includeRelationshipSummary: false,
     });
   });
 

package/src/components/ui/tu-do/shared/assignee-select.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import {
   Search,
   UserCircle,
@@ -9,7 +9,10 @@ import {
   UserX,
   X,
 } from '@tuturuuu/icons';
-import { updateWorkspaceTask } from '@tuturuuu/internal-api/tasks';
+import {
+  listWorkspaceTaskBoardViewableMembers,
+  updateWorkspaceTask,
+} from '@tuturuuu/internal-api/tasks';
 import { Avatar, AvatarFallback, AvatarImage } from '@tuturuuu/ui/avatar';
 import { Button } from '@tuturuuu/ui/button';
 import { useWorkspaceMembers } from '@tuturuuu/ui/hooks/use-workspace-members';
@@ -26,7 +29,15 @@ import {
   useMemo,
   useState,
 } from 'react';
-import { useBoardBroadcast } from './board-broadcast-context';
+import {
+  getActiveBoardRefresh,
+  useBoardBroadcast,
+} from './board-broadcast-context';
+import {
+  patchTaskInVisibleCaches,
+  restoreVisibleTaskCaches,
+  snapshotVisibleTaskCaches,
+} from './task-cache-patches';
 
 interface Member {
   id: string;
@@ -36,7 +47,7 @@ interface Member {
   avatar_url?: string;
 }
 
-interface Task {
+interface TaskWithAssignees {
   id: string;
   assignees?: Member[];
 }
@@ -66,7 +77,8 @@ export const AssigneeSelect = forwardRef<AssigneeSelectHandle, Props>(
     const params = useParams();
     const rawWsId = params.wsId;
     const wsId = Array.isArray(rawWsId) ? rawWsId[0] : rawWsId;
-    const boardId = params.boardId as string;
+    const rawBoardId = params.boardId;
+    const boardId = Array.isArray(rawBoardId) ? rawBoardId[0] : rawBoardId;
     const queryClient = useQueryClient();
     const broadcast = useBoardBroadcast();
 
@@ -104,11 +116,41 @@ export const AssigneeSelect = forwardRef<AssigneeSelectHandle, Props>(
     }, [uniqueAssignees]);
 
     // Fetch workspace members with React Query
-    const {
-      data: fetchedMembers = [],
-      isLoading: isFetchingMembers,
-      error: membersError,
-    } = useWorkspaceMembers(wsId);
+    const shouldFetchBoardMembers = Boolean(wsId && boardId);
+    const workspaceMembersQuery = useWorkspaceMembers(wsId, {
+      enabled: Boolean(wsId) && !shouldFetchBoardMembers,
+    });
+    const boardMembersQuery = useQuery({
+      queryKey: ['task-board-viewable-members', wsId, boardId],
+      queryFn: async (): Promise<Member[]> => {
+        if (!wsId || !boardId) return [];
+
+        const payload = await listWorkspaceTaskBoardViewableMembers(
+          wsId,
+          boardId
+        );
+        const members = Array.isArray(payload?.members) ? payload.members : [];
+
+        return members.map((member) => ({
+          id: member.user_id,
+          user_id: member.user_id,
+          display_name: member.display_name || member.email || member.user_id,
+          email: member.email ?? undefined,
+          avatar_url: member.avatar_url ?? undefined,
+        }));
+      },
+      enabled: shouldFetchBoardMembers,
+      staleTime: 5 * 60 * 1000,
+    });
+    const fetchedMembers = shouldFetchBoardMembers
+      ? (boardMembersQuery.data ?? [])
+      : (workspaceMembersQuery.data ?? []);
+    const isFetchingMembers = shouldFetchBoardMembers
+      ? boardMembersQuery.isLoading
+      : workspaceMembersQuery.isLoading;
+    const membersError = shouldFetchBoardMembers
+      ? boardMembersQuery.error
+      : workspaceMembersQuery.error;
 
     // Deduplicate members by ID using O(n) Map approach
     // Also ensure user_id is set for consistency with task creation flow
@@ -148,7 +190,10 @@ export const AssigneeSelect = forwardRef<AssigneeSelectHandle, Props>(
           throw new Error(t('please_try_again_later'));
         }
 
-        const boardTasks = queryClient.getQueryData<Task[]>(['tasks', boardId]);
+        const boardTasks = queryClient.getQueryData<TaskWithAssignees[]>([
+          'tasks',
+          boardId,
+        ]);
         const currentTask = boardTasks?.find((task) => task.id === taskId);
         const existingIds =
           currentTask?.assignees
@@ -171,19 +216,24 @@ export const AssigneeSelect = forwardRef<AssigneeSelectHandle, Props>(
       onMutate: async ({ memberId, action }) => {
         // Cancel any outgoing refetches
         await queryClient.cancelQueries({ queryKey: ['tasks', boardId] });
+        if (boardId) {
+          await queryClient.cancelQueries({
+            queryKey: ['tasks-full', boardId],
+          });
+        }
 
         // Snapshot the previous value
-        const previousTasks = queryClient.getQueryData(['tasks', boardId]);
+        const cacheSnapshot = boardId
+          ? snapshotVisibleTaskCaches(queryClient, boardId, [taskId])
+          : undefined;
 
         // Optimistically update the cache
-        queryClient.setQueryData(
-          ['tasks', boardId],
-          (old: Task[] | undefined) => {
-            if (!old) return old;
-
-            return old.map((task: Task) => {
-              if (task.id !== taskId) return task;
-
+        if (boardId) {
+          patchTaskInVisibleCaches({
+            queryClient,
+            boardId,
+            taskId,
+            updater: (task) => {
               const currentAssignees = task.assignees || [];
               let newAssignees: Member[];
 
@@ -204,9 +254,9 @@ export const AssigneeSelect = forwardRef<AssigneeSelectHandle, Props>(
               }
 
               return { ...task, assignees: newAssignees };
-            });
-          }
-        );
+            },
+          });
+        }
 
         const previousLocalAssignees = localAssigneesState;
 
@@ -223,12 +273,12 @@ export const AssigneeSelect = forwardRef<AssigneeSelectHandle, Props>(
           return old.filter((assignee) => assignee.id !== memberId);
         });
 
-        return { previousTasks, previousLocalAssignees };
+        return { cacheSnapshot, previousLocalAssignees };
       },
       onError: (err, _, context) => {
         // Rollback optimistic update on error
-        if (context?.previousTasks) {
-          queryClient.setQueryData(['tasks', boardId], context.previousTasks);
+        if (context?.cacheSnapshot) {
+          restoreVisibleTaskCaches(queryClient, context.cacheSnapshot);
         }
 
         if (context?.previousLocalAssignees) {
@@ -242,6 +292,7 @@ export const AssigneeSelect = forwardRef<AssigneeSelectHandle, Props>(
       },
       onSuccess: () => {
         broadcast?.('task:relations-changed', { taskId });
+        getActiveBoardRefresh()?.({ invalidateTasks: false });
       },
       // Note: Removed onSettled invalidation to prevent flicker
       // Optimistic updates handle immediate UI feedback

package/src/components/ui/tu-do/shared/board-client.tsx

@@ -21,7 +21,7 @@ import {
   setActiveBoardRefresh,
   setActiveBroadcast,
 } from './board-broadcast-context';
-import { BoardViews } from './board-views';
+import { BoardViews, type ViewType } from './board-views';
 import { ProgressiveLoaderProvider } from './progressive-loader-context';
 import { dispatchRecentSidebarVisit } from './recent-sidebar-events';
 import { TaskBoardLoadingState } from './task-board-loading-state';
@@ -35,16 +35,20 @@ interface Props {
   workspaceTier?: WorkspaceProductTier | null;
   currentUserId?: string;
   routePrefix?: string;
+  defaultView?: ViewType;
   idleBottomIsland?: ReactNode;
+  rootLoading?: boolean;
 }
 
 export function BoardClient({
   boardId,
+  defaultView,
   idleBottomIsland,
   workspace,
   workspaceTier,
   currentUserId,
   routePrefix = '/tasks',
+  rootLoading = false,
 }: Props) {
   const router = useRouter();
   const queryClient = useQueryClient();
@@ -81,6 +85,7 @@ export function BoardClient({
     queryFn: async () => {
       const result = await listWorkspaceTasks(boardWorkspaceId, {
         boardId,
+        includeRelationshipSummary: false,
       });
       return result.tasks;
     },
@@ -143,8 +148,6 @@ export function BoardClient({
   // Fetch workspace labels once at the board level
   const { data: workspaceLabels = [] } = useWorkspaceLabels(boardWorkspaceId);
 
-  const { broadcast } = useBoardRealtime(boardId);
-
   const refreshActiveBoard = useCallback(
     (options?: BoardRefreshOptions) => {
       const invalidateTasks = options?.invalidateTasks ?? true;
@@ -181,6 +184,12 @@ export function BoardClient({
     ]
   );
 
+  const { broadcast } = useBoardRealtime(boardId, {
+    onTaskRelationsChange: () => {
+      refreshActiveBoard({ invalidateTasks: false });
+    },
+  });
+
   // Register broadcast at module level so components outside the
   // BoardBroadcastProvider tree (e.g. task dialog) can access it.
   useEffect(() => {
@@ -238,7 +247,7 @@ export function BoardClient({
   ]);
 
   if (boardLoading && !board) {
-    return <TaskBoardLoadingState />;
+    return <TaskBoardLoadingState root={rootLoading} />;
   }
 
   if (!board?.id) {
@@ -262,6 +271,7 @@ export function BoardClient({
           lists={lists}
           workspaceLabels={workspaceLabels}
           currentUserId={currentUserId}
+          defaultView={defaultView}
           canManageBoard={canManageBoard}
           idleBottomIsland={idleBottomIsland}
         />

package/src/components/ui/tu-do/shared/board-header.tsx

@@ -53,9 +53,11 @@ interface Props {
     WorkspaceTaskBoard,
     'id' | 'name' | 'ticket_prefix' | 'archived_at'
   > & {
+    access_type?: 'member' | 'guest';
     ws_id?: WorkspaceTaskBoard['ws_id'] | null;
     icon?: WorkspaceTaskBoard['icon'];
     default_list_id?: WorkspaceTaskBoard['default_list_id'] | null;
+    has_guest_access?: boolean;
   };
   currentUserId?: string;
   currentView: ViewType;
@@ -155,6 +157,11 @@ export function BoardHeader({
     !publicView &&
     isPersonalWorkspace &&
     currentView === 'kanban';
+  const hasSharedBoardGuests =
+    board.access_type === 'guest' || board.has_guest_access === true;
+  const presenceVisible =
+    interactiveControlsVisible &&
+    (!isPersonalWorkspace || hasSharedBoardGuests);
 
   // Stable refs for callbacks and values to avoid effect re-runs
   const onFiltersChangeRef = useRef(onFiltersChange);
@@ -552,7 +559,7 @@ export function BoardHeader({
         {/* Controls - Compact Row */}
         <div className="flex shrink-0 items-center gap-1.5 sm:gap-2">
           {/* Online Users */}
-          {interactiveControlsVisible && !isPersonalWorkspace && (
+          {presenceVisible && (
             <BoardUserPresenceAvatarsComponent
               boardId={board.id}
               currentMetadata={presenceMetadata}

package/src/components/ui/tu-do/shared/board-switcher.tsx

@@ -1,8 +1,9 @@
 import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { Archive, CheckCircle2, LayoutGrid, Trash2 } from '@tuturuuu/icons';
+import { Archive, LayoutGrid, Trash2 } from '@tuturuuu/icons';
 import {
+  type AccessibleWorkspaceTaskBoard,
   createWorkspaceTaskBoard,
-  listWorkspaceTaskBoards,
+  listCurrentUserTaskBoards,
 } from '@tuturuuu/internal-api/tasks';
 import {
   isTaskRememberLastBoardEnabled,
@@ -50,12 +51,15 @@ interface BoardSwitcherProps {
 }
 
 type BoardWithStatus = {
+  access_type?: 'member' | 'guest';
   id: string;
   name: string | null;
   icon: string | null;
   archived_at: string | null;
   deleted_at: string | null;
   created_at: string | null;
+  workspace?: AccessibleWorkspaceTaskBoard['workspace'];
+  ws_id: string;
 };
 
 function getDaysRemaining(deletedAt: string) {
@@ -107,22 +111,27 @@ export function BoardSwitcher({ board, translations }: BoardSwitcherProps) {
   );
 
   const { data: boards = [], isLoading: isFetchingBoards } = useQuery({
-    queryKey: ['other-boards', board.ws_id, board.id],
+    queryKey: ['accessible-task-boards'],
     queryFn: async () => {
-      const payload = await listWorkspaceTaskBoards(board.ws_id);
+      const payload = await listCurrentUserTaskBoards();
       return (payload.boards || []) as BoardWithStatus[];
     },
-    enabled: !!board.ws_id,
   });
   const rememberLastBoard =
     isTaskRememberLastBoardEnabled(rememberLastBoardRaw);
+  const boardsById = useMemo(() => {
+    return new Map(boards.map((item) => [item.id, item] as const));
+  }, [boards]);
 
   const selectBoard = useCallback(
     (value: string | string[]) => {
       const boardId = Array.isArray(value) ? value[0] : value;
       if (!boardId || boardId === board.id) return;
 
-      if (rememberLastBoard) {
+      const selectedBoard = boardsById.get(boardId);
+      const targetWorkspaceId = selectedBoard?.ws_id ?? board.ws_id;
+
+      if (rememberLastBoard && targetWorkspaceId === board.ws_id) {
         updateUserWorkspaceConfig.mutate({
           configId: TASK_DEFAULT_BOARD_ID_CONFIG_ID,
           value: boardId,
@@ -130,11 +139,12 @@ export function BoardSwitcher({ board, translations }: BoardSwitcherProps) {
         });
       }
 
-      router.push(`/${board.ws_id}${tasksHref(`/boards/${boardId}`)}`);
+      router.push(`/${targetWorkspaceId}${tasksHref(`/boards/${boardId}`)}`);
     },
     [
       board.id,
       board.ws_id,
+      boardsById,
       rememberLastBoard,
       router,
       tasksHref,
@@ -150,7 +160,7 @@ export function BoardSwitcher({ board, translations }: BoardSwitcherProps) {
       try {
         const payload = await createWorkspaceTaskBoard(board.ws_id, { name });
         await queryClient.invalidateQueries({
-          queryKey: ['other-boards', board.ws_id],
+          queryKey: ['accessible-task-boards'],
         });
 
         return {
@@ -165,6 +175,9 @@ export function BoardSwitcher({ board, translations }: BoardSwitcherProps) {
     [board.ws_id, queryClient, t.createBoardError, translateBoardName]
   );
 
+  const currentBoardFromAccessible = boardsById.get(board.id);
+  const canCreateBoard = currentBoardFromAccessible?.access_type !== 'guest';
+
   const boardOptions = useMemo(() => {
     const byId = new Map<string, BoardWithStatus>();
     for (const item of boards) byId.set(item.id, item);
@@ -176,10 +189,24 @@ export function BoardSwitcher({ board, translations }: BoardSwitcherProps) {
         archived_at: null,
         deleted_at: null,
         created_at: null,
+        ws_id: board.ws_id,
       });
     }
 
     const orderedBoards = [...byId.values()].sort((a, b) => {
+      const workspaceDelta =
+        (a.ws_id === board.ws_id ? 0 : 1) - (b.ws_id === board.ws_id ? 0 : 1);
+      if (workspaceDelta !== 0) return workspaceDelta;
+
+      const currentBoardDelta =
+        (a.id === board.id ? 0 : 1) - (b.id === board.id ? 0 : 1);
+      if (currentBoardDelta !== 0) return currentBoardDelta;
+
+      const workspaceNameDelta = (a.workspace?.name ?? a.ws_id).localeCompare(
+        b.workspace?.name ?? b.ws_id
+      );
+      if (workspaceNameDelta !== 0) return workspaceNameDelta;
+
       const statusWeight = (item: BoardWithStatus) =>
         item.deleted_at ? 2 : item.archived_at ? 1 : 0;
       const statusDelta = statusWeight(a) - statusWeight(b);
@@ -200,6 +227,7 @@ export function BoardSwitcher({ board, translations }: BoardSwitcherProps) {
         : isArchived
           ? t.archived
           : t.active;
+      const workspaceLabel = item.workspace?.name ?? item.ws_id;
       const groupLabel = isDeleted
         ? t.deletedBoards
         : isArchived
@@ -207,12 +235,39 @@ export function BoardSwitcher({ board, translations }: BoardSwitcherProps) {
           : t.activeBoards;
       const daysRemaining =
         item.deleted_at && getDaysRemaining(item.deleted_at);
+      const description = daysRemaining
+        ? `${groupLabel} · ${t.daysLeft.replace(
+            '{count}',
+            String(daysRemaining)
+          )}`
+        : isArchived || isDeleted
+          ? groupLabel
+          : undefined;
+      const badge =
+        isArchived || isDeleted ? (
+          <Badge
+            key={`${item.id}-status`}
+            className={cn(
+              'shrink-0 gap-1 px-2 py-0.5 text-[10px]',
+              isDeleted && 'bg-dynamic-red/10 text-dynamic-red',
+              isArchived && 'bg-muted text-foreground'
+            )}
+          >
+            {isDeleted ? (
+              <Trash2 className="h-3 w-3 text-dynamic-red/50" />
+            ) : (
+              <Archive className="h-3 w-3 text-foreground/50" />
+            )}
+            {statusLabel}
+          </Badge>
+        ) : undefined;
 
       return {
         value: item.id,
         label: translateBoardName(item.name),
         searchValue: [
           translateBoardName(item.name),
+          workspaceLabel,
           statusLabel,
           groupLabel,
           daysRemaining
@@ -221,41 +276,18 @@ export function BoardSwitcher({ board, translations }: BoardSwitcherProps) {
         ]
           .filter(Boolean)
           .join(' '),
-        description: daysRemaining
-          ? `${groupLabel} · ${t.daysLeft.replace(
-              '{count}',
-              String(daysRemaining)
-            )}`
-          : groupLabel,
+        description,
+        group: workspaceLabel,
         icon: <BoardIcon className="h-4 w-4" />,
         muted: isArchived || isDeleted,
-        badge: (
-          <Badge
-            className={cn(
-              'shrink-0 gap-1 px-2 py-0.5 text-[10px]',
-              isDeleted && 'bg-dynamic-red/10 text-dynamic-red',
-              isArchived && 'bg-muted text-foreground',
-              !isDeleted &&
-                !isArchived &&
-                'bg-dynamic-green/10 text-dynamic-green'
-            )}
-          >
-            {isDeleted ? (
-              <Trash2 className="h-3 w-3 text-dynamic-red/50" />
-            ) : isArchived ? (
-              <Archive className="h-3 w-3 text-foreground/50" />
-            ) : (
-              <CheckCircle2 className="h-3 w-3 text-dynamic-green/50" />
-            )}
-            {statusLabel}
-          </Badge>
-        ),
+        badge,
       };
     });
   }, [
     board.icon,
     board.id,
     board.name,
+    board.ws_id,
     boards,
     t.active,
     t.activeBoards,
@@ -270,8 +302,8 @@ export function BoardSwitcher({ board, translations }: BoardSwitcherProps) {
   return (
     <Combobox
       className="w-[min(22rem,70vw)] [&_button]:h-7 [&_button]:min-h-7 [&_button]:px-2 sm:[&_button]:h-8 sm:[&_button]:min-h-8"
-      createText={t.createBoard}
-      creatingText={t.creatingBoard}
+      createText={canCreateBoard ? t.createBoard : undefined}
+      creatingText={canCreateBoard ? t.creatingBoard : undefined}
       disabled={isFetchingBoards}
       emptyText={isFetchingBoards ? t.loadingBoards : t.noOtherBoards}
       label={
@@ -280,7 +312,7 @@ export function BoardSwitcher({ board, translations }: BoardSwitcherProps) {
         </span>
       }
       onChange={selectBoard}
-      onCreate={createBoard}
+      onCreate={canCreateBoard ? createBoard : undefined}
       options={boardOptions}
       placeholder={translateBoardName(board.name)}
       searchPlaceholder={t.searchBoards}