@tuturuuu/ui 0.7.0 → 0.9.0

package/src/components/ui/calendar-app/components/calendar-connections-settings-content.tsx

@@ -48,6 +48,13 @@ import { Separator } from '../../separator';
 import { Switch } from '../../switch';
 import type { CalendarConnectionsManagerState } from './use-calendar-connections-manager';
 
+function isWritableProviderAccess(accessRole?: string | null) {
+  if (!accessRole) return true;
+  return ['owner', 'writer', 'write', 'editor'].includes(
+    accessRole.toLowerCase()
+  );
+}
+
 export function CalendarConnectionsSettingsContent({
   state,
   className,
@@ -75,13 +82,26 @@ export function CalendarConnectionsSettingsContent({
     setNewCalendarName,
     setShowCreateCalendarDialog,
     showCreateCalendarDialog,
+    syncPreferencesData,
+    syncPreferencesMutation,
     systemCalendars,
     t,
     togglingIds,
     togglingTuturuuuIds,
     toggleAccountExpanded,
     toggleWorkspaceCalendarMutation,
+    updateConnectionSyncSettingsMutation,
   } = state;
+  const externalSyncOptions =
+    syncPreferencesData?.options.filter(
+      (option) => option.provider !== 'tuturuuu'
+    ) ?? [];
+  const syncSettingsUnavailable =
+    syncPreferencesData?.settingsAvailable === false;
+  const syncSettingsDisabled =
+    !syncPreferencesData ||
+    syncSettingsUnavailable ||
+    syncPreferencesMutation.isPending;
 
   return (
     <div className={className ? `space-y-4 ${className}` : 'space-y-4'}>
@@ -128,6 +148,126 @@ export function CalendarConnectionsSettingsContent({
           </Select>
         </div>
 
+        <div className="space-y-3 rounded-md border p-3">
+          <div>
+            <h4 className="font-medium text-sm">
+              {t('two_way_sync') || 'Two-way sync'}
+            </h4>
+            <p className="text-muted-foreground text-xs">
+              {t('two_way_sync_desc') ||
+                'Control how Tuturuuu imports provider changes and mirrors native events outward.'}
+            </p>
+          </div>
+
+          {syncSettingsUnavailable && (
+            <p className="rounded-md bg-muted px-3 py-2 text-muted-foreground text-xs">
+              {t('calendar_sync_settings_unavailable') ||
+                'Sync controls will be available after the latest calendar migration is applied.'}
+            </p>
+          )}
+
+          <div className="space-y-2">
+            <div className="flex items-center justify-between gap-3">
+              <div className="min-w-0">
+                <p className="font-medium text-sm">
+                  {t('import_external_changes') || 'Import external changes'}
+                </p>
+                <p className="text-muted-foreground text-xs">
+                  {t('import_external_changes_desc') ||
+                    'Bring Google and Outlook event changes into Tuturuuu.'}
+                </p>
+              </div>
+              <Switch
+                checked={syncPreferencesData?.inboundSyncEnabled ?? true}
+                onCheckedChange={(checked) =>
+                  syncPreferencesMutation.mutate({
+                    inboundSyncEnabled: checked,
+                  })
+                }
+                disabled={syncSettingsDisabled}
+              />
+            </div>
+
+            <div className="flex items-center justify-between gap-3">
+              <div className="min-w-0">
+                <p className="font-medium text-sm">
+                  {t('sync_tuturuuu_events_outward') ||
+                    'Sync Tuturuuu events outward'}
+                </p>
+                <p className="text-muted-foreground text-xs">
+                  {t('sync_tuturuuu_events_outward_desc') ||
+                    'Mirror native Tuturuuu event creates and edits to a connected provider calendar.'}
+                </p>
+              </div>
+              <Switch
+                checked={syncPreferencesData?.outboundSyncEnabled ?? false}
+                onCheckedChange={(checked) =>
+                  syncPreferencesMutation.mutate({
+                    outboundSyncEnabled: checked,
+                  })
+                }
+                disabled={
+                  syncSettingsDisabled || externalSyncOptions.length === 0
+                }
+              />
+            </div>
+          </div>
+
+          <Select
+            value={syncPreferencesData?.defaultOutboundConnectionId ?? 'none'}
+            onValueChange={(value) =>
+              syncPreferencesMutation.mutate({
+                defaultOutboundConnectionId: value === 'none' ? null : value,
+              })
+            }
+            disabled={syncSettingsDisabled || externalSyncOptions.length === 0}
+          >
+            <SelectTrigger className="w-full">
+              <SelectValue
+                placeholder={
+                  t('choose_outbound_calendar') || 'Choose outbound calendar'
+                }
+              />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="none">
+                {t('no_outbound_calendar') || 'No outbound calendar'}
+              </SelectItem>
+              {externalSyncOptions.map((option) => (
+                <SelectItem key={option.id} value={option.connectionId}>
+                  <div className="flex min-w-0 items-center gap-2">
+                    <span
+                      className="h-2.5 w-2.5 shrink-0 rounded-full"
+                      style={{
+                        backgroundColor: option.color ?? undefined,
+                      }}
+                    />
+                    <span className="truncate">{option.label}</span>
+                    <Badge variant="secondary" className="capitalize">
+                      {option.provider}
+                    </Badge>
+                  </div>
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+
+          <div className="flex items-center justify-between gap-3 rounded-md bg-muted/40 px-3 py-2">
+            <div className="min-w-0">
+              <p className="font-medium text-xs">
+                {t('conflict_policy') || 'Conflict policy'}
+              </p>
+              <p className="text-muted-foreground text-xs">
+                {t('latest_write_wins_desc') ||
+                  'When both sides changed, the most recently written event wins.'}
+              </p>
+            </div>
+            <Badge variant="outline">
+              {t('latest_write_wins') || 'Latest write wins'}
+            </Badge>
+          </div>
+        </div>
+
         {/* Tuturuuu Calendars Section */}
         <div className="space-y-3">
           <div className="flex items-center justify-between">
@@ -370,40 +510,106 @@ export function CalendarConnectionsSettingsContent({
                 <Separator />
                 <div className="space-y-2 p-3">
                   {(calendarsByAccount[account.id] || []).length > 0 ? (
-                    (calendarsByAccount[account.id] || []).map((cal) => (
-                      <div
-                        key={cal.id}
-                        className="flex items-center justify-between gap-2 rounded-md px-2 py-1.5 hover:bg-muted/50"
-                      >
-                        <div className="flex min-w-0 flex-1 items-center gap-2">
-                          <div
-                            className="h-3 w-3 shrink-0 rounded-full"
-                            style={{
-                              backgroundColor: cal.color || '#4285f4',
-                            }}
-                          />
-                          <span
-                            className="line-clamp-1 break-all text-sm"
-                            title={cal.calendar_name}
-                          >
-                            {cal.calendar_name}
-                          </span>
+                    (calendarsByAccount[account.id] || []).map((cal) => {
+                      const syncControlsDisabled =
+                        !cal.connectionExists ||
+                        !cal.is_enabled ||
+                        syncSettingsDisabled ||
+                        updateConnectionSyncSettingsMutation.isPending;
+                      const canWriteToProvider = isWritableProviderAccess(
+                        cal.accessRole
+                      );
+
+                      return (
+                        <div
+                          key={cal.id}
+                          className="rounded-md px-2 py-1.5 hover:bg-muted/50"
+                        >
+                          <div className="flex items-center justify-between gap-2">
+                            <div className="flex min-w-0 flex-1 items-center gap-2">
+                              <div
+                                className="h-3 w-3 shrink-0 rounded-full"
+                                style={{
+                                  backgroundColor: cal.color || '#4285f4',
+                                }}
+                              />
+                              <span
+                                className="line-clamp-1 break-all text-sm"
+                                title={cal.calendar_name}
+                              >
+                                {cal.calendar_name}
+                              </span>
+                            </div>
+                            <Switch
+                              checked={cal.is_enabled}
+                              onCheckedChange={() =>
+                                handleToggle(cal.id, cal.is_enabled, {
+                                  calendar_id: cal.calendar_id,
+                                  calendar_name: cal.calendar_name,
+                                  color: cal.color,
+                                  connectionExists: cal.connectionExists,
+                                  accountId: cal.accountId,
+                                  accessRole: cal.accessRole,
+                                })
+                              }
+                              disabled={togglingIds.has(cal.id)}
+                            />
+                          </div>
+
+                          {cal.connectionExists && (
+                            <div className="mt-2 grid grid-cols-3 gap-2 pl-5">
+                              <label className="flex items-center justify-between gap-2 rounded-md bg-muted/40 px-2 py-1 text-muted-foreground text-xs">
+                                <span>{t('import') || 'Import'}</span>
+                                <Switch
+                                  checked={cal.syncInboundEnabled}
+                                  onCheckedChange={(checked) =>
+                                    updateConnectionSyncSettingsMutation.mutate(
+                                      {
+                                        id: cal.id,
+                                        syncInboundEnabled: checked,
+                                      }
+                                    )
+                                  }
+                                  disabled={syncControlsDisabled}
+                                />
+                              </label>
+                              <label className="flex items-center justify-between gap-2 rounded-md bg-muted/40 px-2 py-1 text-muted-foreground text-xs">
+                                <span>{t('send') || 'Send'}</span>
+                                <Switch
+                                  checked={cal.syncOutboundEnabled}
+                                  onCheckedChange={(checked) =>
+                                    updateConnectionSyncSettingsMutation.mutate(
+                                      {
+                                        id: cal.id,
+                                        syncOutboundEnabled: checked,
+                                      }
+                                    )
+                                  }
+                                  disabled={
+                                    syncControlsDisabled || !canWriteToProvider
+                                  }
+                                />
+                              </label>
+                              <label className="flex items-center justify-between gap-2 rounded-md bg-muted/40 px-2 py-1 text-muted-foreground text-xs">
+                                <span>{t('deletes') || 'Deletes'}</span>
+                                <Switch
+                                  checked={cal.syncDeleteEnabled}
+                                  onCheckedChange={(checked) =>
+                                    updateConnectionSyncSettingsMutation.mutate(
+                                      {
+                                        id: cal.id,
+                                        syncDeleteEnabled: checked,
+                                      }
+                                    )
+                                  }
+                                  disabled={syncControlsDisabled}
+                                />
+                              </label>
+                            </div>
+                          )}
                         </div>
-                        <Switch
-                          checked={cal.is_enabled}
-                          onCheckedChange={() =>
-                            handleToggle(cal.id, cal.is_enabled, {
-                              calendar_id: cal.calendar_id,
-                              calendar_name: cal.calendar_name,
-                              color: cal.color,
-                              connectionExists: cal.connectionExists,
-                              accountId: cal.accountId,
-                            })
-                          }
-                          disabled={togglingIds.has(cal.id)}
-                        />
-                      </div>
-                    ))
+                      );
+                    })
                   ) : (
                     <p className="py-2 text-center text-muted-foreground text-xs">
                       {t('no_calendars_found')}

package/src/components/ui/calendar-app/components/load-smart-scheduling-tasks.tsx

@@ -0,0 +1,143 @@
+import { createAdminClient } from '@tuturuuu/supabase/next/server';
+import type { ExtendedWorkspaceTask } from '../../time-tracker/types';
+
+interface LoadSmartSchedulingTasksOptions {
+  resolvedWsId: string;
+  userId: string;
+}
+
+interface AccessibleTaskRow {
+  task_id: string;
+  task_name: string | null;
+  task_description: string | null;
+  task_creator_id: string | null;
+  task_list_id: string | null;
+  task_start_date: string | null;
+  task_end_date: string | null;
+  task_priority: ExtendedWorkspaceTask['priority'];
+  task_completed_at: string | null;
+  task_closed_at: string | null;
+  task_deleted_at: string | null;
+  task_estimation_points: number | null;
+  task_created_at: string | null;
+}
+
+interface TaskListWorkspaceRow {
+  id?: string | null;
+  workspace_boards?: {
+    ws_id?: string | null;
+  } | null;
+}
+
+interface TaskSchedulingRow {
+  task_id?: string | null;
+  total_duration: number | null;
+  is_splittable: boolean | null;
+  min_split_duration_minutes: number | null;
+  max_split_duration_minutes: number | null;
+  calendar_hours: ExtendedWorkspaceTask['calendar_hours'];
+  auto_schedule: boolean | null;
+}
+
+export async function loadSmartSchedulingTasks({
+  resolvedWsId,
+  userId,
+}: LoadSmartSchedulingTasksOptions): Promise<ExtendedWorkspaceTask[]> {
+  const supabase = await createAdminClient({ noCookie: true });
+  const { data: rpcTasks } = await supabase.rpc('get_user_accessible_tasks', {
+    p_user_id: userId,
+    p_ws_id: resolvedWsId,
+    p_include_deleted: false,
+    p_list_statuses: ['not_started', 'active'],
+  });
+
+  const tasksBase = ((rpcTasks ?? []) as AccessibleTaskRow[]).map((task) => ({
+    id: task.task_id,
+    name: task.task_name,
+    description: task.task_description,
+    creator_id: task.task_creator_id,
+    list_id: task.task_list_id,
+    start_date: task.task_start_date,
+    end_date: task.task_end_date,
+    due_date: task.task_end_date,
+    priority: task.task_priority,
+    completed_at: task.task_completed_at,
+    closed_at: task.task_closed_at,
+    deleted_at: task.task_deleted_at,
+    estimation_points: task.task_estimation_points,
+    created_at: task.task_created_at,
+  })) as ExtendedWorkspaceTask[];
+
+  const listIds = Array.from(
+    new Set(tasksBase.map((task) => task.list_id).filter(Boolean))
+  ) as string[];
+
+  const wsIdByListId = new Map<string, string>();
+  if (listIds.length > 0) {
+    const { data: lists } = await supabase
+      .from('task_lists')
+      .select(
+        `
+        id,
+        workspace_boards!inner (
+          ws_id
+        )
+      `
+      )
+      .in('id', listIds);
+
+    (lists as TaskListWorkspaceRow[] | null)?.forEach((list) => {
+      const taskWsId = list.workspace_boards?.ws_id;
+      if (list.id && taskWsId) wsIdByListId.set(list.id, taskWsId);
+    });
+  }
+
+  const tasks = tasksBase.map((task) => ({
+    ...task,
+    ws_id:
+      (task.list_id ? wsIdByListId.get(task.list_id) : undefined) ??
+      resolvedWsId,
+  })) as ExtendedWorkspaceTask[];
+
+  const taskIds = tasks.map((task) => task.id).filter(Boolean);
+  const settingsByTaskId = new Map<string, TaskSchedulingRow>();
+
+  if (taskIds.length > 0) {
+    const { data: schedulingRows } = await supabase
+      .from('task_user_scheduling_settings')
+      .select(
+        `
+        task_id,
+        total_duration,
+        is_splittable,
+        min_split_duration_minutes,
+        max_split_duration_minutes,
+        calendar_hours,
+        auto_schedule
+      `
+      )
+      .eq('user_id', userId)
+      .in('task_id', taskIds);
+
+    (schedulingRows as TaskSchedulingRow[] | null)?.forEach((row) => {
+      if (row.task_id) settingsByTaskId.set(row.task_id, row);
+    });
+  }
+
+  return tasks.map((task) => {
+    const settings = settingsByTaskId.get(task.id);
+    return settings
+      ? ({
+          ...task,
+          total_duration: settings.total_duration,
+          is_splittable: settings.is_splittable ?? false,
+          min_split_duration_minutes:
+            settings.min_split_duration_minutes ?? null,
+          max_split_duration_minutes:
+            settings.max_split_duration_minutes ?? null,
+          calendar_hours: settings.calendar_hours ?? null,
+          auto_schedule: settings.auto_schedule ?? false,
+        } as ExtendedWorkspaceTask)
+      : task;
+  });
+}

package/src/components/ui/calendar-app/components/priority-view.tsx

@@ -23,6 +23,7 @@ import {
 } from '@tuturuuu/icons';
 import {
   listWorkspaceTaskLists,
+  listWorkspaceTasks,
   updateWorkspaceTask,
 } from '@tuturuuu/internal-api/tasks';
 import type { TaskPriority } from '@tuturuuu/types/primitives/Priority';
@@ -40,7 +41,6 @@ import ActionsDropdown from './actions-dropdown';
 import PriorityDropdown from './priority-dropdown';
 import { QuickTaskDialog } from './quick-task-dialog';
 import { SchedulingDialog } from './scheduling-dialog';
-import { getAssignedTasks } from './task-fetcher';
 
 // Priority labels (matching task-properties-section.tsx)
 const PRIORITY_LABELS: Record<TaskPriority, string> = {
@@ -356,8 +356,15 @@ export default function PriorityView({
     setSearchError(null);
 
     try {
-      const results = await getAssignedTasks(assigneeId, searchQuery.trim());
-      setSearchResults(results);
+      const results = await listWorkspaceTasks(wsId, {
+        assigneeIds: [assigneeId],
+        closed: 'exclude',
+        completed: 'exclude',
+        includeArchivedBoards: true,
+        limit: 50,
+        q: searchQuery.trim(),
+      });
+      setSearchResults(results.tasks as ExtendedWorkspaceTask[]);
     } catch (error) {
       console.error('Error searching tasks:', error);
       setSearchError('Failed to search tasks');

package/src/components/ui/calendar-app/components/tasks-sidebar.tsx

@@ -1,4 +1,3 @@
-import { createAdminClient } from '@tuturuuu/supabase/next/server';
 import type { ExtendedWorkspaceTask } from '../../time-tracker/types';
 import { CalendarSidebar } from './sidebar';
 
@@ -6,126 +5,15 @@ interface TasksSidebarProps {
   resolvedWsId: string;
   locale: string;
   userId: string;
+  tasks?: ExtendedWorkspaceTask[];
 }
 
-export default async function TasksSidebar({
+export default function TasksSidebar({
   resolvedWsId,
   locale,
   userId,
+  tasks = [],
 }: TasksSidebarProps) {
-  // Use the same RPC as the tasks page to get accessible tasks
-  const supabase = await createAdminClient({ noCookie: true });
-  const { data: rpcTasks } = await supabase.rpc('get_user_accessible_tasks', {
-    p_user_id: userId,
-    p_ws_id: resolvedWsId,
-    p_include_deleted: false,
-    p_list_statuses: ['not_started', 'active'],
-  });
-
-  // Map RPC results to match expected structure (same as my-tasks-data-loader.tsx)
-  const tasksBase = (rpcTasks?.map((task) => ({
-    id: task.task_id,
-    name: task.task_name,
-    description: task.task_description,
-    creator_id: task.task_creator_id,
-    list_id: task.task_list_id,
-    start_date: task.task_start_date,
-    end_date: task.task_end_date,
-    due_date: task.task_end_date, // Map end_date to due_date for display
-    priority: task.task_priority,
-    completed_at: task.task_completed_at,
-    closed_at: task.task_closed_at,
-    deleted_at: task.task_deleted_at,
-    estimation_points: task.task_estimation_points,
-    created_at: task.task_created_at,
-    // Scheduling fields are per-user now. These legacy RPC fields may not exist after migration.
-  })) || []) as ExtendedWorkspaceTask[];
-
-  // Enrich tasks with the *actual* workspace UUID (ws_id) via list -> board relation.
-  // This is critical for personal workspace views where tasks may belong to other workspaces.
-  const listIds = Array.from(
-    new Set(tasksBase.map((t) => t.list_id).filter(Boolean))
-  ) as string[];
-
-  const wsIdByListId = new Map<string, string>();
-  if (listIds.length > 0) {
-    const { data: lists } = await supabase
-      .from('task_lists')
-      .select(
-        `
-        id,
-        workspace_boards!inner (
-          ws_id
-        )
-      `
-      )
-      .in('id', listIds);
-
-    (lists as any[] | null)?.forEach((l) => {
-      const resolvedTaskWsId = l?.workspace_boards?.ws_id;
-      if (l?.id && resolvedTaskWsId) wsIdByListId.set(l.id, resolvedTaskWsId);
-    });
-  }
-
-  const tasks = tasksBase.map((t) => ({
-    ...t,
-    ws_id:
-      (t.list_id ? wsIdByListId.get(t.list_id) : undefined) ??
-      // Fallback: if a task is list-less, treat it as current workspace-scoped.
-      resolvedWsId,
-  })) as ExtendedWorkspaceTask[];
-
-  // Merge per-user scheduling settings so the calendar UI can still show duration/hour type.
-  const taskIds = tasks.map((t) => t.id).filter(Boolean);
-  const settingsByTaskId = new Map<
-    string,
-    {
-      total_duration: number | null;
-      is_splittable: boolean | null;
-      min_split_duration_minutes: number | null;
-      max_split_duration_minutes: number | null;
-      calendar_hours: any;
-      auto_schedule: boolean | null;
-    }
-  >();
-
-  if (taskIds.length > 0) {
-    const { data: schedulingRows } = await (supabase as any)
-      .from('task_user_scheduling_settings')
-      .select(
-        `
-        task_id,
-        total_duration,
-        is_splittable,
-        min_split_duration_minutes,
-        max_split_duration_minutes,
-        calendar_hours,
-        auto_schedule
-      `
-      )
-      .eq('user_id', userId)
-      .in('task_id', taskIds);
-
-    (schedulingRows as any[] | null)?.forEach((r) => {
-      if (r?.task_id) settingsByTaskId.set(r.task_id, r);
-    });
-  }
-
-  const tasksWithScheduling = tasks.map((t) => {
-    const s = settingsByTaskId.get(t.id);
-    return s
-      ? ({
-          ...t,
-          total_duration: s.total_duration,
-          is_splittable: s.is_splittable ?? false,
-          min_split_duration_minutes: s.min_split_duration_minutes ?? null,
-          max_split_duration_minutes: s.max_split_duration_minutes ?? null,
-          calendar_hours: s.calendar_hours ?? null,
-          auto_schedule: s.auto_schedule ?? false,
-        } as ExtendedWorkspaceTask)
-      : t;
-  });
-
   // Personal workspace = workspace ID matches user ID (no need for auto-assignment)
   const isPersonalWorkspace = resolvedWsId === userId;
 
@@ -135,7 +23,7 @@ export default async function TasksSidebar({
       // Always pass the resolved workspace UUID, not the route slug (e.g. "personal").
       wsId={resolvedWsId}
       assigneeId={userId}
-      tasks={tasksWithScheduling}
+      tasks={tasks}
       locale={locale}
       isPersonalWorkspace={isPersonalWorkspace}
     />