fix(recently-deleted): cast chat ids in the trash union, keep loaded pages on errors

Author: waleedlatif1

apps/sim/app/api/workspaces/[id]/recently-deleted/route.ts

@@ -42,13 +42,13 @@ export const GET = defineInternalJsonRoute({
     ),
   }),
   useCase: listRecentlyDeleted,
-  present: ({ items, nextCursorKeys }, { params, query }) => ({
+  present: ({ items, nextCursorKeys }, { input }) => ({
     items,
     nextCursor: writeSortedCursor(
       nextCursorKeys,
-      query.sortBy,
-      query.sortOrder,
-      cursorScope(params.id, query.type, query.search)
+      input.sortBy,
+      input.sortOrder,
+      cursorScope(input.workspaceId, input.filter, input.search)
     ),
   }),
 })

apps/sim/app/workspace/[workspaceId]/components/resource/resource.tsx

@@ -288,7 +288,7 @@ const ResourceTable = memo(function ResourceTable({
   emptyState,
 }: ResourceTableProps) {
   const scrollRef = useRef<HTMLDivElement>(null)
-  const loadMoreRef = useLoadMoreSentinel(onLoadMore, Boolean(hasMore))
+  const loadMoreRef = useLoadMoreSentinel({ onLoadMore, enabled: Boolean(hasMore) })
 
   const showEmptyState = rows.length === 0 && Boolean(emptyState)
 

apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted.tsx

@@ -3,7 +3,6 @@
 import { useMemo, useState } from 'react'
 import { Chip, ChipInput, ChipModalTabs } from '@sim/emcn'
 import { Search } from '@sim/emcn/icons'
-import { toError } from '@sim/utils/errors'
 import { formatDate } from '@sim/utils/formatting'
 import { useParams, useRouter } from 'next/navigation'
 import { useQueryStates } from 'nuqs'
@@ -27,7 +26,10 @@ import {
   recentlyDeletedSortParams,
   recentlyDeletedUrlKeys,
 } from '@/app/workspace/[workspaceId]/settings/components/recently-deleted/search-params'
-import { SettingsEmptyState } from '@/app/workspace/[workspaceId]/settings/components/settings-empty-state'
+import {
+  SettingsEmptyState,
+  SettingsQueryErrorState,
+} from '@/app/workspace/[workspaceId]/settings/components/settings-empty-state'
 import { SettingsPanel } from '@/app/workspace/[workspaceId]/settings/components/settings-panel'
 import {
   RESOURCE_LIST_STACK,
@@ -232,9 +234,13 @@ export function RecentlyDeleted() {
   const restoreWorkspaceFileFolder = useRestoreWorkspaceFileFolder()
   const restoreChat = useRestoreMothershipChat(workspaceId)
 
-  const { hasNextPage, isFetchingNextPage, fetchNextPage, isLoading, error } = deletedQuery
+  const { hasNextPage, isFetchingNextPage, isFetchNextPageError, fetchNextPage, isLoading, error } =
+    deletedQuery
 
-  const loadMoreRef = useLoadMoreSentinel(fetchNextPage, hasNextPage && !isFetchingNextPage)
+  const loadMoreRef = useLoadMoreSentinel({
+    onLoadMore: fetchNextPage,
+    enabled: hasNextPage && !isFetchingNextPage && !isFetchNextPageError,
+  })
 
   const filtered = useMemo(() => {
     const items: DeletedResource[] = (deletedQuery.data?.pages ?? []).flatMap((page) =>
@@ -374,10 +380,13 @@ export function RecentlyDeleted() {
         onChange={(v) => setRecentlyDeletedFilters({ tab: v as RecentlyDeletedFilter })}
       />
 
-      {error ? (
-        <SettingsEmptyState>
-          {toError(error).message || 'Failed to load deleted items'}
-        </SettingsEmptyState>
+      {error && !deletedQuery.data ? (
+        <SettingsQueryErrorState
+          error={error}
+          fallback='Failed to load deleted items'
+          isRetrying={deletedQuery.isFetching}
+          onRetry={() => void deletedQuery.refetch()}
+        />
       ) : isLoading && filtered.length === 0 ? null : filtered.length === 0 ? (
         showNoResults ? (
           <SettingsEmptyState variant='inline'>
@@ -435,7 +444,17 @@ export function RecentlyDeleted() {
               />
             )
           })}
-          <div ref={loadMoreRef} aria-hidden />
+          {isFetchNextPageError ? (
+            <SettingsQueryErrorState
+              error={error}
+              fallback='Failed to load more deleted items'
+              isRetrying={isFetchingNextPage}
+              onRetry={() => void fetchNextPage()}
+              variant='inline'
+            />
+          ) : (
+            <div ref={loadMoreRef} aria-hidden />
+          )}
         </div>
       )}
     </SettingsPanel>

apps/sim/hooks/queries/recently-deleted.ts

@@ -1,4 +1,4 @@
-import { keepPreviousData, useInfiniteQuery } from '@tanstack/react-query'
+import { useInfiniteQuery } from '@tanstack/react-query'
 import { requestJson } from '@/lib/api/client/request'
 import {
   listRecentlyDeletedContract,
@@ -10,7 +10,7 @@ import { recentlyDeletedKeys } from '@/hooks/queries/utils/recently-deleted-keys
 import { shouldRetrySettingsRead } from '@/hooks/queries/utils/settings-read-retry'
 
 /** Always refetched on open, so a resource deleted anywhere else shows up here. */
-export const RECENTLY_DELETED_STALE_TIME = 0
+const RECENTLY_DELETED_STALE_TIME = 0
 
 interface RecentlyDeletedListParams {
   workspaceId: string
@@ -41,7 +41,12 @@ export function useRecentlyDeletedItems({
     getNextPageParam: (page) => page.nextCursor ?? undefined,
     enabled: Boolean(workspaceId),
     staleTime: RECENTLY_DELETED_STALE_TIME,
-    placeholderData: keepPreviousData,
+    placeholderData: (previous, previousQuery) =>
+      recentlyDeletedKeys
+        .workspaceLists(workspaceId)
+        .every((part, index) => previousQuery?.queryKey[index] === part)
+        ? previous
+        : undefined,
     retry: shouldRetrySettingsRead,
   })
 }

apps/sim/hooks/queries/utils/recently-deleted-keys.ts

@@ -12,12 +12,20 @@ import type { ListSortOrder } from '@/lib/api/list-query'
 export const recentlyDeletedKeys = {
   all: ['recentlyDeleted'] as const,
   lists: () => [...recentlyDeletedKeys.all, 'list'] as const,
+  /** Every list in one workspace — the scope a previous page may be carried within. */
+  workspaceLists: (workspaceId: string) => [...recentlyDeletedKeys.lists(), workspaceId] as const,
   list: (
     workspaceId: string,
     filter: RecentlyDeletedFilter,
     search: string | undefined,
     sortBy: RecentlyDeletedSortColumn,
     sortOrder: ListSortOrder
   ) =>
-    [...recentlyDeletedKeys.lists(), workspaceId, filter, search ?? '', sortBy, sortOrder] as const,
+    [
+      ...recentlyDeletedKeys.workspaceLists(workspaceId),
+      filter,
+      search ?? '',
+      sortBy,
+      sortOrder,
+    ] as const,
 }

apps/sim/hooks/use-load-more-sentinel.ts

@@ -2,12 +2,19 @@
 
 import { useCallback } from 'react'
 
+interface UseLoadMoreSentinelOptions {
+  /** Loads the next page; absent means the list has no further pages to request. */
+  onLoadMore: (() => void) | undefined
+  /** Whether reaching the sentinel should load more right now. */
+  enabled: boolean
+}
+
 /**
  * A callback ref for the element at the end of a paged list: `onLoadMore` runs when it scrolls
  * within 200px of view, while `enabled`. Pass `enabled: false` during a fetch, so the
  * observer is rebuilt when the fetch ends and fires again if the sentinel is still in view.
  */
-export function useLoadMoreSentinel(onLoadMore: (() => void) | undefined, enabled: boolean) {
+export function useLoadMoreSentinel({ onLoadMore, enabled }: UseLoadMoreSentinelOptions) {
   return useCallback(
     (sentinel: HTMLDivElement | null) => {
       if (!sentinel || !onLoadMore || !enabled) return

apps/sim/lib/api/contracts/recently-deleted.ts

@@ -32,7 +32,7 @@ export const RECENTLY_DELETED_FILTERS = [
 
 export const RECENTLY_DELETED_SORT_COLUMNS = ['deleted', 'name', 'type'] as const
 
-export const RECENTLY_DELETED_PAGE_SIZE = 50
+const RECENTLY_DELETED_PAGE_SIZE = 50
 
 const recentlyDeletedItemSchema = z.object({
   id: z.string(),

apps/sim/lib/mothership/request/go/file-preview-adapter.test.ts

@@ -307,7 +307,7 @@ describe('processFilePreviewStreamEvent — preview target resolution', () => {
 
   beforeEach(() => {
     executeCopilotFileUseCaseMock.mockResolvedValue({
-      files: [{ id: 'file-9', name: 'notes.md', folderPath: null }],
+      files: new Map([['files/notes.md', { id: 'file-9', name: 'notes.md', folderPath: null }]]),
     })
   })
 

apps/sim/lib/workspaces/recently-deleted.ts

@@ -161,7 +161,7 @@ function deletedSources(options: ListRecentlyDeletedOptions): DeletedSource[] {
         'chat',
         sql`${copilotChats}`,
         {
-          id: sql`${copilotChats.id}`,
+          id: sql`${copilotChats.id}::text`,
           name: sql`coalesce(${copilotChats.title}, 'New chat')`,
           deletedAt: sql`${copilotChats.deletedAt}`,
         },

scripts/check-unused-exports.baseline.json

@@ -572,8 +572,6 @@
   "apps/sim/app/workspace/[workspaceId]/settings/components/mothership/search-params.ts#MOTHERSHIP_ENVIRONMENTS",
   "apps/sim/app/workspace/[workspaceId]/settings/components/mothership/search-params.ts#MOTHERSHIP_TABS",
   "apps/sim/app/workspace/[workspaceId]/settings/components/mothership/search-params.ts#MothershipEnvironmentParam",
-  "apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/search-params.ts#RECENTLY_DELETED_SORT_COLUMNS",
-  "apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/search-params.ts#RECENTLY_DELETED_TABS",
   "apps/sim/app/workspace/[workspaceId]/settings/components/settings-header/settings-header.tsx#SettingsBackAction",
   "apps/sim/app/workspace/[workspaceId]/settings/components/settings-header/settings-header.tsx#SettingsHeaderConfig",
   "apps/sim/app/workspace/[workspaceId]/settings/components/settings-header/settings-header.tsx#SettingsHeaderSearch",