@tuturuuu/ui 0.14.0 → 0.17.0

package/src/hooks/__tests__/use-task-actions.test.tsx

@@ -286,12 +286,9 @@ describe('useTaskActions', () => {
       });
     });
 
-    it('moves an external task to the personal and source done lists when checked', async () => {
+    it('moves an external task to done through terminal personal placement when checked', async () => {
       const completedAt = '2026-05-07T03:00:00.000Z';
       queryClient.setQueryData(['tasks', 'board-1'], [mockExternalTask]);
-      mockListWorkspaceTaskLists.mockResolvedValueOnce({
-        lists: mockSourceLists,
-      });
       mockUpsertCurrentUserTaskPersonalPlacement.mockResolvedValueOnce({
         task: {
           ...mockExternalTask,
@@ -299,14 +296,10 @@ describe('useTaskActions', () => {
           personal_list_id: 'completion-list',
           personal_sort_key: 1_500_000,
           sort_key: 1_500_000,
-        },
-      });
-      mockUpdateWorkspaceTask.mockResolvedValueOnce({
-        task: {
-          ...mockExternalTask,
-          list_id: 'source-done-list',
+          source_list_id: 'source-done-list',
+          source_list_status: 'done',
           completed_at: completedAt,
-          closed_at: null,
+          closed_at: completedAt,
         },
       });
 
@@ -329,10 +322,7 @@ describe('useTaskActions', () => {
         await result.current.handleArchiveToggle();
       });
 
-      expect(mockListWorkspaceTaskLists).toHaveBeenCalledWith(
-        'source-ws',
-        'source-board'
-      );
+      expect(mockListWorkspaceTaskLists).not.toHaveBeenCalled();
       expect(mockUpsertCurrentUserTaskPersonalPlacement).toHaveBeenCalledWith(
         'task-1',
         expect.objectContaining({
@@ -340,15 +330,10 @@ describe('useTaskActions', () => {
           personal_list_id: 'completion-list',
           previous_task_id: null,
           next_task_id: null,
+          terminal_status: 'done',
         })
       );
-      expect(mockUpdateWorkspaceTask).toHaveBeenCalledWith(
-        'source-ws',
-        'task-1',
-        {
-          list_id: 'source-done-list',
-        }
-      );
+      expect(mockUpdateWorkspaceTask).not.toHaveBeenCalled();
       expect(queryClient.getQueryData<Task[]>(['tasks', 'board-1'])).toEqual([
         expect.objectContaining({
           id: 'task-1',
@@ -356,6 +341,7 @@ describe('useTaskActions', () => {
           personal_list_id: 'completion-list',
           source_list_id: 'source-done-list',
           completed_at: completedAt,
+          closed_at: completedAt,
           _localMutationAt: expect.any(Number),
         }),
       ]);
@@ -733,12 +719,9 @@ describe('useTaskActions', () => {
       expect(setMenuOpen).toHaveBeenCalledWith(false);
     });
 
-    it('moves an external task to the personal and source closed lists', async () => {
+    it('moves an external task to closed through terminal personal placement', async () => {
       const closedAt = '2026-05-07T03:30:00.000Z';
       queryClient.setQueryData(['tasks', 'board-1'], [mockExternalTask]);
-      mockListWorkspaceTaskLists.mockResolvedValueOnce({
-        lists: mockSourceLists,
-      });
       mockUpsertCurrentUserTaskPersonalPlacement.mockResolvedValueOnce({
         task: {
           ...mockExternalTask,
@@ -746,12 +729,8 @@ describe('useTaskActions', () => {
           personal_list_id: 'closed-list',
           personal_sort_key: 1_700_000,
           sort_key: 1_700_000,
-        },
-      });
-      mockUpdateWorkspaceTask.mockResolvedValueOnce({
-        task: {
-          ...mockExternalTask,
-          list_id: 'source-closed-list',
+          source_list_id: 'source-closed-list',
+          source_list_status: 'closed',
           completed_at: null,
           closed_at: closedAt,
         },
@@ -781,15 +760,11 @@ describe('useTaskActions', () => {
         expect.objectContaining({
           personal_board_id: 'board-1',
           personal_list_id: 'closed-list',
+          terminal_status: 'closed',
         })
       );
-      expect(mockUpdateWorkspaceTask).toHaveBeenCalledWith(
-        'source-ws',
-        'task-1',
-        {
-          list_id: 'source-closed-list',
-        }
-      );
+      expect(mockListWorkspaceTaskLists).not.toHaveBeenCalled();
+      expect(mockUpdateWorkspaceTask).not.toHaveBeenCalled();
       expect(queryClient.getQueryData<Task[]>(['tasks', 'board-1'])).toEqual([
         expect.objectContaining({
           id: 'task-1',

package/src/hooks/task-actions-personal-external.ts

@@ -152,16 +152,21 @@ export async function moveExternalTaskToPersonalList({
   const now = new Date().toISOString();
   let sourceTargetList: TaskList | null = null;
   const desiredSourceStatus = sourceStatus ?? targetList.status;
+  const terminalStatus =
+    targetList.status === 'done' || targetList.status === 'closed'
+      ? targetList.status
+      : undefined;
   const hasKnownSourceStatusChange = Boolean(
     task.source_list_status && task.source_list_status !== desiredSourceStatus
   );
   const shouldInspectSourceList = Boolean(
-    sourceStatus ||
-      hasKnownSourceStatusChange ||
-      (!task.source_list_status &&
-        task.source_list_id &&
-        sourceWorkspaceId &&
-        sourceBoardId)
+    !terminalStatus &&
+      (sourceStatus ||
+        hasKnownSourceStatusChange ||
+        (!task.source_list_status &&
+          task.source_list_id &&
+          sourceWorkspaceId &&
+          sourceBoardId))
   );
 
   try {
@@ -235,6 +240,7 @@ export async function moveExternalTaskToPersonalList({
         personal_list_id: targetList.id,
         previous_task_id: order.previous_task_id,
         next_task_id: order.next_task_id,
+        terminal_status: terminalStatus,
       }
     );
 

package/src/hooks/use-notifications.ts

@@ -90,6 +90,8 @@ interface NotificationSubscriptionEntry {
   supabase: SupabaseClient;
 }
 
+export const UNREAD_COUNT_FALLBACK_INTERVAL_MS = 5 * 60 * 1000;
+
 const notificationSubscriptionRegistry = new Map<
   string,
   NotificationSubscriptionEntry
@@ -265,11 +267,13 @@ export function useInfiniteNotifications({
   unreadOnly = false,
   readOnly = false,
   pageSize = 20,
+  enabled = true,
 }: {
   wsId?: string;
   unreadOnly?: boolean;
   readOnly?: boolean;
   pageSize?: number;
+  enabled?: boolean;
 }) {
   return useInfiniteQuery({
     queryKey: [
@@ -299,6 +303,7 @@ export function useInfiniteNotifications({
       } satisfies NotificationsPage;
     },
     initialPageParam: 0,
+    enabled,
     getNextPageParam: (lastPage) => {
       const nextOffset = lastPage.offset + lastPage.limit;
       return nextOffset < lastPage.count ? nextOffset : undefined;
@@ -312,7 +317,7 @@ export function useInfiniteNotifications({
  * Hook to get unread notification count.
  * If wsId is provided, scopes to that workspace. Otherwise returns total unread count.
  */
-export function useUnreadCount(wsId?: string) {
+export function useUnreadCount(wsId?: string, options?: { enabled?: boolean }) {
   return useQuery({
     queryKey: ['notifications', 'unread-count', wsId || 'all'],
     queryFn: async () => {
@@ -328,7 +333,14 @@ export function useUnreadCount(wsId?: string) {
       const data = await response.json();
       return data.count as number;
     },
-    refetchInterval: 30000,
+    enabled: options?.enabled ?? true,
+    staleTime: 60_000,
+    // Realtime invalidation is the primary update path. Keep a low-frequency
+    // refresh as a safety net for disconnected or suspended browser sessions.
+    refetchInterval: UNREAD_COUNT_FALLBACK_INTERVAL_MS,
+    refetchIntervalInBackground: false,
+    refetchOnReconnect: true,
+    refetchOnWindowFocus: true,
   });
 }
 

package/vitest.config.ts

@@ -29,6 +29,10 @@ export default defineConfig({
         find: '@tuturuuu/internal-api',
         replacement: resolve(__dirname, '../internal-api/src/index.ts'),
       },
+      {
+        find: /^@tuturuuu\/types\/primitives\/(.+)$/,
+        replacement: `${resolve(__dirname, '../types/src/primitives')}/$1.ts`,
+      },
       {
         find: '@tuturuuu/supabase/next/client',
         replacement: resolve(__dirname, '../supabase/src/next/client.ts'),