chore(workspaces): drop leftover churn and mark the legacy last-active column for contract

Author: waleedlatif1

apps/sim/hooks/queries/workspace.test.tsx

@@ -78,7 +78,6 @@ function seedList(queryClient: QueryClient, pinnedWorkspaceIds: string[]) {
     workspaces: [],
     lastActiveWorkspaceId: null,
     pinnedWorkspaceIds,
-    recentWorkspaceIds: [],
     creationPolicy: null,
   })
 }

apps/sim/lib/workspaces/list.ts

@@ -125,29 +125,28 @@ export async function listWorkspacesForViewer(params: {
   const { userId, activeOrganizationId, scope = 'active' } = params
 
   /** Workspace pins ride along here; see `pinnedResourceTypeSchema` for why. */
-  const [creationPolicy, accessibleWorkspaces, userSettings, workspacePins, recentIds] =
-    await Promise.all([
-      getWorkspaceCreationPolicy({ userId, activeOrganizationId }),
-      listAccessibleWorkspaceRowsForUser(userId, scope).then((rows) =>
-        buildWorkspacesWithInviteFlags(rows, userId)
-      ),
-      db
-        .select({ lastActiveWorkspaceId: settings.lastActiveWorkspaceId })
-        .from(settings)
-        .where(eq(settings.userId, userId))
-        .limit(1),
-      db
-        .select({ resourceId: pinnedItem.resourceId })
-        .from(pinnedItem)
-        .where(and(eq(pinnedItem.userId, userId), eq(pinnedItem.resourceType, 'workspace'))),
-      listRecentWorkspaceIds(userId),
-    ])
-  const workspaces = sortByVisitRecency(accessibleWorkspaces, recentIds)
-  const [mostRecent] = workspaces
+  const [creationPolicy, workspaces, userSettings, workspacePins, recentIds] = await Promise.all([
+    getWorkspaceCreationPolicy({ userId, activeOrganizationId }),
+    listAccessibleWorkspaceRowsForUser(userId, scope).then((rows) =>
+      buildWorkspacesWithInviteFlags(rows, userId)
+    ),
+    db
+      .select({ lastActiveWorkspaceId: settings.lastActiveWorkspaceId })
+      .from(settings)
+      .where(eq(settings.userId, userId))
+      .limit(1),
+    db
+      .select({ resourceId: pinnedItem.resourceId })
+      .from(pinnedItem)
+      .where(and(eq(pinnedItem.userId, userId), eq(pinnedItem.resourceType, 'workspace'))),
+    listRecentWorkspaceIds(userId),
+  ])
+  const orderedWorkspaces = sortByVisitRecency(workspaces, recentIds)
+  const [mostRecent] = orderedWorkspaces
   const lastVisitedId = mostRecent && recentIds.includes(mostRecent.id) ? mostRecent.id : null
 
   return {
-    workspaces,
+    workspaces: orderedWorkspaces,
     /** Visits supersede the settings column, which only predates them. */
     lastActiveWorkspaceId: lastVisitedId ?? userSettings[0]?.lastActiveWorkspaceId ?? null,
     pinnedWorkspaceIds: workspacePins.map((row) => row.resourceId),

packages/db/schema.ts

@@ -1030,6 +1030,7 @@ export const settings = pgTable('settings', {
   copilotAutoAllowedTools: jsonb('copilot_auto_allowed_tools').notNull().default('[]'),
 
   // Workspace navigation
+  /** contract-pending(after #8284 is fully deployed): drop this column and its settings API fields — `workspace_visit` supersedes it, and the workspace list reads it only as a fallback for users with no visits. */
   lastActiveWorkspaceId: text('last_active_workspace_id'),
 
   updatedAt: timestamp('updated_at').notNull().defaultNow(),