@tuturuuu/ui 0.12.0 → 0.13.0

package/src/components/ui/tu-do/shared/task-edit-dialog/components/quick-settings-popover.tsx

@@ -9,6 +9,7 @@ import { Popover, PopoverContent, PopoverTrigger } from '@tuturuuu/ui/popover';
 import { Switch } from '@tuturuuu/ui/switch';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@tuturuuu/ui/tooltip';
 import { useTranslations } from 'next-intl';
+import { getTaskApiUrl } from '../../../../../../lib/tasks-app-url';
 import { TASK_SOUND_EFFECTS_ENABLED_CONFIG_ID } from '../../task-sound-effects';
 
 interface TaskSettingsData {
@@ -54,7 +55,9 @@ export function QuickSettingsPopover({
   const { data: settings, isLoading } = useQuery({
     queryKey: ['user-task-settings'],
     queryFn: async (): Promise<TaskSettingsData> => {
-      const res = await fetch('/api/v1/users/task-settings');
+      const res = await fetch(getTaskApiUrl('/api/v1/users/task-settings'), {
+        credentials: 'include',
+      });
       if (!res.ok) {
         // Return defaults if API fails
         return { task_auto_assign_to_self: false, fade_completed_tasks: false };
@@ -68,8 +71,9 @@ export function QuickSettingsPopover({
 
   const updateSettings = useMutation({
     mutationFn: async (data: Partial<TaskSettingsData>) => {
-      const res = await fetch('/api/v1/users/task-settings', {
+      const res = await fetch(getTaskApiUrl('/api/v1/users/task-settings'), {
         method: 'PATCH',
+        credentials: 'include',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(data),
       });

package/src/components/ui/tu-do/shared/task-edit-dialog/hooks/__tests__/use-update-shared-task.test.ts

@@ -48,11 +48,15 @@ describe('useUpdateSharedTask', () => {
     // Cast to any to access mutationFn which is available in the mock return value
     const response = await (result.current as any).mutationFn(payload);
 
-    expect(global.fetch).toHaveBeenCalledWith('/api/v1/shared/tasks/SHARE123', {
-      method: 'PATCH',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(payload.updates),
-    });
+    expect(global.fetch).toHaveBeenCalledWith(
+      'http://localhost:7809/api/v1/shared/tasks/SHARE123',
+      {
+        method: 'PATCH',
+        credentials: 'include',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(payload.updates),
+      }
+    );
     expect(response).toEqual(mockResponse);
   });
 

package/src/components/ui/tu-do/shared/task-edit-dialog/hooks/task-api.ts

@@ -14,6 +14,7 @@ import {
   type WorkspaceTaskDescriptionUpdatePayload,
   type WorkspaceTaskUpdatePayload,
 } from '@tuturuuu/internal-api/tasks';
+import { getTaskApiUrl } from '../../../../../../lib/tasks-app-url';
 import type { WorkspaceTaskLabel } from '../types';
 
 const TASK_DESCRIPTION_DIRECT_BODY_LIMIT_BYTES = 192 * 1024;
@@ -261,14 +262,18 @@ export async function createWorkspaceLabel(
   wsId: string,
   payload: { name: string; color: string }
 ) {
-  const response = await fetch(`/api/v1/workspaces/${wsId}/labels`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(payload),
-    cache: 'no-store',
-  });
+  const response = await fetch(
+    getTaskApiUrl(`/api/v1/workspaces/${wsId}/labels`),
+    {
+      method: 'POST',
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(payload),
+      cache: 'no-store',
+    }
+  );
 
   if (!response.ok) {
     throw new Error(await getErrorMessage(response, 'Failed to create label'));

package/src/components/ui/tu-do/shared/task-edit-dialog/hooks/use-task-overrides.ts

@@ -3,6 +3,7 @@
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import type { TaskUserOverride } from '@tuturuuu/types';
 import { toast } from '@tuturuuu/ui/sonner';
+import { getTaskApiUrl } from '../../../../../../lib/tasks-app-url';
 
 type OverrideInput = Partial<
   Omit<TaskUserOverride, 'task_id' | 'user_id' | 'created_at' | 'updated_at'>
@@ -23,7 +24,10 @@ export function useTaskOverrides(
     queryKey,
     queryFn: async (): Promise<TaskUserOverride | null> => {
       if (!taskId) return null;
-      const res = await fetch(`/api/v1/users/me/tasks/${taskId}/overrides`);
+      const res = await fetch(
+        getTaskApiUrl(`/api/v1/users/me/tasks/${taskId}/overrides`),
+        { credentials: 'include' }
+      );
       if (!res.ok) throw new Error('Failed to fetch override');
       const json = await res.json();
       return json.data ?? null;
@@ -35,11 +39,15 @@ export function useTaskOverrides(
   const upsertMutation = useMutation({
     mutationFn: async (input: OverrideInput): Promise<TaskUserOverride> => {
       if (!taskId) throw new Error('No task ID');
-      const res = await fetch(`/api/v1/users/me/tasks/${taskId}/overrides`, {
-        method: 'PUT',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(input),
-      });
+      const res = await fetch(
+        getTaskApiUrl(`/api/v1/users/me/tasks/${taskId}/overrides`),
+        {
+          method: 'PUT',
+          credentials: 'include',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify(input),
+        }
+      );
       if (!res.ok) {
         const err = await res.json().catch(() => null);
         throw new Error(err?.error || 'Failed to save override');
@@ -85,9 +93,13 @@ export function useTaskOverrides(
   const deleteMutation = useMutation({
     mutationFn: async () => {
       if (!taskId) throw new Error('No task ID');
-      const res = await fetch(`/api/v1/users/me/tasks/${taskId}/overrides`, {
-        method: 'DELETE',
-      });
+      const res = await fetch(
+        getTaskApiUrl(`/api/v1/users/me/tasks/${taskId}/overrides`),
+        {
+          method: 'DELETE',
+          credentials: 'include',
+        }
+      );
       if (!res.ok) throw new Error('Failed to delete override');
     },
     onMutate: async () => {

package/src/components/ui/tu-do/shared/task-edit-dialog/hooks/use-update-shared-task.ts

@@ -4,6 +4,7 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 import type { Task } from '@tuturuuu/types/primitives/Task';
+import { getTaskApiUrl } from '../../../../../../lib/tasks-app-url';
 
 export interface TaskUpdatePayload {
   name?: string;
@@ -33,11 +34,15 @@ export function useUpdateSharedTask(): UseMutationResult<
       shareCode: string;
       updates: TaskUpdatePayload;
     }) => {
-      const response = await fetch(`/api/v1/shared/tasks/${shareCode}`, {
-        method: 'PATCH',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(updates),
-      });
+      const response = await fetch(
+        getTaskApiUrl(`/api/v1/shared/tasks/${shareCode}`),
+        {
+          method: 'PATCH',
+          credentials: 'include',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify(updates),
+        }
+      );
 
       if (!response.ok) {
         const error = await response.json().catch(() => null);

package/src/components/ui/tu-do/shared/task-edit-dialog.tsx

@@ -35,6 +35,7 @@ import { usePathname } from 'next/navigation';
 import { useLocale, useTranslations } from 'next-intl';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import * as Y from 'yjs';
+import { getTaskApiUrl } from '../../../../lib/tasks-app-url';
 import { BoardEstimationConfigDialog } from '../boards/boardId/task-dialogs/BoardEstimationConfigDialog';
 import { TaskNewLabelDialog } from '../boards/boardId/task-dialogs/TaskNewLabelDialog';
 import { TaskNewProjectDialog } from '../boards/boardId/task-dialogs/TaskNewProjectDialog';
@@ -391,8 +392,9 @@ export function TaskEditDialog({
   const { data: userTaskSettings } = useQuery({
     queryKey: ['user-task-settings'],
     queryFn: async () => {
-      const res = await fetch('/api/v1/users/task-settings', {
+      const res = await fetch(getTaskApiUrl('/api/v1/users/task-settings'), {
         cache: 'no-store',
+        credentials: 'include',
       });
       if (!res.ok) return { task_auto_assign_to_self: false };
       return res.json() as Promise<{ task_auto_assign_to_self: boolean }>;
@@ -793,7 +795,7 @@ export function TaskEditDialog({
     enabled: !!isOpen && !isCreateMode && !!task?.id,
     queryFn: async () => {
       const response = await fetch(
-        `/api/v1/users/me/tasks/${task!.id}/schedule`,
+        getTaskApiUrl(`/api/v1/users/me/tasks/${task!.id}/schedule`),
         { cache: 'no-store' }
       );
       if (!response.ok) return null;

package/src/components/ui/tu-do/shared/task-estimation-picker.tsx

@@ -17,6 +17,7 @@ import { Label } from '@tuturuuu/ui/label';
 import { Popover, PopoverContent, PopoverTrigger } from '@tuturuuu/ui/popover';
 import { cn } from '@tuturuuu/utils/format';
 import { useMemo, useState } from 'react';
+import { getTaskApiUrl } from '../../../../lib/tasks-app-url';
 import {
   buildEstimationIndices,
   mapEstimationPoints,
@@ -58,11 +59,13 @@ export function TaskEstimationPicker({
     queryFn: async () => {
       if (!boardId) return null;
       const response = await fetch(
-        `/api/v1/workspaces/${wsId}/boards/${boardId}/estimation`
+        getTaskApiUrl(`/api/v1/workspaces/${wsId}/boards/${boardId}/estimation`)
       );
       if (!response.ok) {
         // If the endpoint doesn't exist, we'll create a fallback
-        const boardResponse = await fetch(`/api/v1/workspaces/${wsId}/boards`);
+        const boardResponse = await fetch(
+          getTaskApiUrl(`/api/v1/workspaces/${wsId}/boards`)
+        );
         if (!boardResponse.ok) throw new Error('Failed to fetch boards');
         const boards = await boardResponse.json();
         const board = boards.find((b: any) => b.id === boardId);

package/src/components/ui/tu-do/shared/task-row-actions-menu.tsx

@@ -180,7 +180,7 @@ export function TaskRowActionsMenu({
           canUseBoardAssignees ??
           (task.source_workspace_id ? true : !isPersonalWorkspace),
         assigneeMemberSource: task.source_workspace_id
-          ? 'workspace'
+          ? 'board'
           : assigneeMemberSource,
       }
     );

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

@@ -41,6 +41,8 @@ vi.mock('@tuturuuu/internal-api/tasks', () => ({
 }));
 
 vi.mock('@tuturuuu/utils/task-helper', () => ({
+  isPersonalExternalStagingListId: (listId: string | null) =>
+    listId?.startsWith('personal-external-staging:') ?? false,
   useUpdateTask: vi.fn(),
 }));
 
@@ -1689,6 +1691,55 @@ describe('useTaskActions', () => {
       expect(setMenuOpen).toHaveBeenCalledWith(false);
     });
 
+    it('moves a personal-workspace task with personal board metadata through the normal task route', async () => {
+      const personalTask = {
+        ...mockTask,
+        personal_board_id: 'board-1',
+        personal_list_id: 'list-1',
+        source_workspace_id: 'ws-1',
+        source_board_id: 'board-1',
+        source_list_id: 'list-1',
+      } as unknown as Task;
+      const targetList = {
+        id: 'list-2',
+        name: 'Later',
+        board_id: 'board-1',
+        status: 'active',
+        created_at: '2025-01-01T00:00:00Z',
+        archived: false,
+        deleted: false,
+        creator_id: 'user-1',
+        color: null,
+        position: 3,
+      } as unknown as TaskList;
+
+      queryClient.setQueryData(['tasks', 'board-1'], [personalTask]);
+
+      const { result } = renderHook(
+        () =>
+          useTaskActions({
+            task: personalTask,
+            boardId: 'board-1',
+            targetCompletionList: mockCompletionList,
+            targetClosedList: mockClosedList,
+            availableLists: [...mockAvailableLists, targetList],
+            onUpdate: vi.fn(),
+            setIsLoading: vi.fn(),
+            setMenuOpen: vi.fn(),
+          }),
+        { wrapper }
+      );
+
+      await act(async () => {
+        await result.current.handleMoveToList('list-2');
+      });
+
+      expect(mockUpdateWorkspaceTask).toHaveBeenCalledWith('ws-1', 'task-1', {
+        list_id: 'list-2',
+      });
+      expect(mockUpsertCurrentUserTaskPersonalPlacement).not.toHaveBeenCalled();
+    });
+
     it('moves an external task between personal lists through personal placement only', async () => {
       const targetList = {
         id: 'list-2',

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

@@ -11,11 +11,10 @@ import {
   isTaskBoardCompletedStatus,
   isTaskBoardTerminalStatus,
 } from '@tuturuuu/utils/task-list-status';
+import { isPersonalExternalOverlayTask } from '../lib/task-personal-external';
 
 export function isPersonalExternalTask(task?: Task) {
-  return (
-    task?.is_personal_external === true || Boolean(task?.personal_board_id)
-  );
+  return isPersonalExternalOverlayTask(task);
 }
 
 function findFirstListByStatus(lists: TaskList[], status: TaskBoardStatus) {

package/src/hooks/use-board-actions.ts

@@ -1,5 +1,6 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { toast } from '@tuturuuu/ui/sonner';
+import { getTaskApiUrl } from '../lib/tasks-app-url';
 
 async function boardAction(
   wsId: string,
@@ -7,13 +8,17 @@ async function boardAction(
   method: 'PUT' | 'DELETE' | 'PATCH',
   body?: any
 ) {
-  const response = await fetch(`/api/v1/workspaces/${wsId}/boards/${boardId}`, {
-    method,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: body ? JSON.stringify(body) : undefined,
-  });
+  const response = await fetch(
+    getTaskApiUrl(`/api/v1/workspaces/${wsId}/boards/${boardId}`),
+    {
+      method,
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: body ? JSON.stringify(body) : undefined,
+    }
+  );
 
   if (!response.ok) {
     const errorData = await response.json();
@@ -29,9 +34,10 @@ async function archiveAction(
   method: 'POST' | 'DELETE'
 ) {
   const response = await fetch(
-    `/api/v1/workspaces/${wsId}/boards/${boardId}/archive`,
+    getTaskApiUrl(`/api/v1/workspaces/${wsId}/boards/${boardId}/archive`),
     {
       method,
+      credentials: 'include',
       headers: {
         'Content-Type': 'application/json',
       },
@@ -166,15 +172,19 @@ export function useBoardActions(wsId: string) {
     { boardId: string; options?: BoardActionOptions }
   >({
     mutationFn: ({ boardId }) =>
-      fetch(`/api/v1/workspaces/${wsId}/task-boards/${boardId}/copy`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          targetWorkspaceId: wsId,
-        }),
-      }).then(async (res) => {
+      fetch(
+        getTaskApiUrl(`/api/v1/workspaces/${wsId}/task-boards/${boardId}/copy`),
+        {
+          method: 'POST',
+          credentials: 'include',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({
+            targetWorkspaceId: wsId,
+          }),
+        }
+      ).then(async (res) => {
         if (!res.ok) {
           const errorData = await res.json();
           throw new Error(errorData.error || 'Failed to duplicate board');

package/src/hooks/use-calendar.tsx

@@ -29,6 +29,7 @@ import {
   useRef,
   useState,
 } from 'react';
+import { getTaskApiUrl } from '../lib/tasks-app-url';
 import { useCalendarSync } from './use-calendar-sync';
 
 // Utility function to round time to nearest 15-minute interval
@@ -319,11 +320,14 @@ async function syncTaskDurationAfterEventChange(
     let totalScheduledMinutes = resizedEventMinutes;
 
     const scheduleResponse = await fetch(
-      options?.isPersonalCalendar
-        ? `/api/v1/users/me/tasks/${taskId}/schedule`
-        : `/api/v1/workspaces/${calendarWsId}/tasks/${taskId}/schedule`,
+      getTaskApiUrl(
+        options?.isPersonalCalendar
+          ? `/api/v1/users/me/tasks/${taskId}/schedule`
+          : `/api/v1/workspaces/${calendarWsId}/tasks/${taskId}/schedule`
+      ),
       {
         cache: 'no-store',
+        credentials: 'include',
       }
     );
 

package/src/hooks/use-settings-dialog-shortcut.ts

@@ -0,0 +1,51 @@
+'use client';
+
+import { useEffect } from 'react';
+
+interface UseSettingsDialogShortcutOptions {
+  enabled: boolean;
+  onOpen: () => void;
+}
+
+function isEditableShortcutTarget(target: EventTarget | null) {
+  if (!(target instanceof HTMLElement)) return false;
+
+  const tagName = target.tagName.toLowerCase();
+
+  return (
+    target.isContentEditable ||
+    tagName === 'input' ||
+    tagName === 'textarea' ||
+    tagName === 'select'
+  );
+}
+
+function isSettingsDialogShortcut(event: KeyboardEvent) {
+  return (event.metaKey || event.ctrlKey) && !event.altKey && event.key === ',';
+}
+
+/**
+ * Opens the app settings dialog on Cmd/Ctrl+, — the platform-wide convention.
+ * Ignores the shortcut while typing in editable fields and when another handler
+ * has already called preventDefault(). Shared by apps/web and every satellite
+ * app (wired once in the satellite user-nav shell).
+ */
+export function useSettingsDialogShortcut({
+  enabled,
+  onOpen,
+}: UseSettingsDialogShortcutOptions) {
+  useEffect(() => {
+    if (!enabled) return;
+
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.defaultPrevented || !isSettingsDialogShortcut(event)) return;
+      if (isEditableShortcutTarget(event.target)) return;
+
+      event.preventDefault();
+      onOpen();
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+    return () => window.removeEventListener('keydown', handleKeyDown);
+  }, [enabled, onOpen]);
+}

package/src/lib/task-personal-external.ts

@@ -0,0 +1,49 @@
+import type { Task } from '@tuturuuu/types/primitives/Task';
+import { isPersonalExternalStagingListId } from '@tuturuuu/utils/task-helper';
+
+function hasValue(value: string | null | undefined): value is string {
+  return typeof value === 'string' && value.length > 0;
+}
+
+export function isPersonalExternalOverlayTask(task?: Task | null) {
+  if (!task) return false;
+
+  if (task.is_personal_external === true) {
+    return true;
+  }
+
+  if (task.is_personal_external === false) {
+    return false;
+  }
+
+  if (isPersonalExternalStagingListId(task.list_id)) {
+    return true;
+  }
+
+  const personalBoardId = hasValue(task.personal_board_id)
+    ? task.personal_board_id
+    : null;
+  const personalListId = hasValue(task.personal_list_id)
+    ? task.personal_list_id
+    : null;
+
+  if (!personalBoardId && !personalListId) {
+    return false;
+  }
+
+  if (
+    hasValue(task.source_board_id) &&
+    personalBoardId &&
+    task.source_board_id !== personalBoardId
+  ) {
+    return true;
+  }
+
+  return (
+    !hasValue(task.source_board_id) &&
+    hasValue(task.source_workspace_id) &&
+    hasValue(task.source_list_id) &&
+    personalListId !== null &&
+    task.source_list_id !== personalListId
+  );
+}

package/src/lib/tasks-app-url.ts

@@ -0,0 +1,85 @@
+function normalizeOrigin(value?: string) {
+  if (!value) {
+    return null;
+  }
+
+  const [firstValue] = value
+    .split(/[,\n]/u)
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+
+  if (!firstValue) {
+    return null;
+  }
+
+  const normalized = /^[a-z]+:\/\//iu.test(firstValue)
+    ? firstValue
+    : `https://${firstValue}`;
+
+  try {
+    return new URL(normalized).origin;
+  } catch {
+    return null;
+  }
+}
+
+function getTasksAppOriginForBrowser() {
+  const configured =
+    normalizeOrigin(process.env.NEXT_PUBLIC_TASKS_APP_URL) ??
+    normalizeOrigin(process.env.NEXT_PUBLIC_TUDO_APP_URL);
+
+  if (configured) {
+    return configured;
+  }
+
+  if (typeof window === 'undefined') {
+    return null;
+  }
+
+  const { hostname, port, protocol } = window.location;
+  const normalizedHostname = hostname.toLowerCase();
+
+  if (
+    normalizedHostname === 'tasks.tuturuuu.com' ||
+    normalizedHostname === 'tasks.tuturuuu.localhost' ||
+    port === '7809'
+  ) {
+    return null;
+  }
+
+  if (
+    normalizedHostname === 'localhost' ||
+    normalizedHostname === '127.0.0.1' ||
+    normalizedHostname === '::1' ||
+    normalizedHostname === '[::1]'
+  ) {
+    return port ? `${protocol}//${hostname}:7809` : null;
+  }
+
+  if (
+    normalizedHostname === 'tuturuuu.localhost' ||
+    normalizedHostname.endsWith('.tuturuuu.localhost')
+  ) {
+    return `${protocol}//tasks.tuturuuu.localhost`;
+  }
+
+  if (
+    normalizedHostname === 'tuturuuu.com' ||
+    normalizedHostname.endsWith('.tuturuuu.com')
+  ) {
+    return 'https://tasks.tuturuuu.com';
+  }
+
+  return null;
+}
+
+export function getTasksAppUrl(path: string) {
+  const normalizedPath = path.startsWith('/') ? path : `/${path}`;
+  const origin = getTasksAppOriginForBrowser();
+
+  return origin ? new URL(normalizedPath, origin).toString() : normalizedPath;
+}
+
+export function getTaskApiUrl(path: string) {
+  return getTasksAppUrl(path);
+}