fix(dashboards): address review round on the restored resource

Fork payloads accept file discovery, dashboard queries are keyed and
invalidated per workspace, dashboard contexts open tabs and resolve in
organization chats, archived dashboard folders keep their paths, and the
folder dialog skips no-op moves and hides the edited subtree.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01S6aTRnkiu7PxYZPNPXYEMV

Author: TheodoreSpeaks

apps/sim/app/workspace/[workspaceId]/dashboards/dashboard-dialog.tsx

@@ -65,6 +65,16 @@ export function DashboardDialog({
     if (!row) return ''
     return `${row.parentId ? pathFor(row.parentId) : ''}/${encodeFolderPathSegment(row.name)}`
   }
+  function labelFor(id: string): string {
+    const row = folders.find((folder) => folder.id === id)
+    if (!row) return ''
+    return row.parentId ? `${labelFor(row.parentId)} / ${row.name}` : row.name
+  }
+  function isWithin(id: string, ancestorId: string): boolean {
+    const row = folders.find((folder) => folder.id === id)
+    if (!row) return false
+    return row.id === ancestorId || (row.parentId !== null && isWithin(row.parentId, ancestorId))
+  }
   function save() {
     const callbacks = {
       onSuccess: (result: Awaited<ReturnType<typeof mutation.mutateAsync>>) => {
@@ -95,16 +105,15 @@ export function DashboardDialog({
           callbacks
         )
         break
-      case 'editFolder':
-        mutation.mutate(
-          {
-            operation: 'moveFolder',
-            path: state.path,
-            destinationPath: `${pathFor(target)}/${encodeFolderPathSegment(name)}`,
-          },
-          callbacks
-        )
+      case 'editFolder': {
+        const destinationPath = `${pathFor(target)}/${encodeFolderPathSegment(name)}`
+        if (destinationPath === state.path) {
+          onClose()
+          break
+        }
+        mutation.mutate({ operation: 'moveFolder', path: state.path, destinationPath }, callbacks)
         break
+      }
       case 'deleteFolder':
         mutation.mutate({ operation: 'deleteFolder', path: state.path }, callbacks)
         break
@@ -137,8 +146,10 @@ export function DashboardDialog({
                 options={[
                   { value: '', label: 'Dashboards' },
                   ...folders
-                    .filter((folder) => !('folder' in state) || folder.id !== state.folder.id)
-                    .map((folder) => ({ value: folder.id, label: pathFor(folder.id) })),
+                    .filter(
+                      (folder) => !('folder' in state) || !isWithin(folder.id, state.folder.id)
+                    )
+                    .map((folder) => ({ value: folder.id, label: labelFor(folder.id) })),
                 ]}
               />
             )}

apps/sim/app/workspace/[workspaceId]/files/hooks/use-workspace-files-room.ts

@@ -21,7 +21,7 @@ export function useWorkspaceFilesRoom(workspaceId: string): void {
     ROOM_TYPES.WORKSPACE_FILES,
     () => {
       invalidateWorkspaceFileBrowsers(queryClient, workspaceId)
-      void queryClient.invalidateQueries({ queryKey: dashboardKeys.all })
+      void queryClient.invalidateQueries({ queryKey: dashboardKeys.workspace(workspaceId) })
     },
     WORKSPACE_FILE_BROWSER_INVALIDATION_KEY
   )

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.tsx

@@ -96,6 +96,7 @@ import type {
 // ConnectServiceAccountModal, and that edge would pull the modal into this
 // chunk and defeat the lazy() split below.
 import { useServiceAccountConnectTarget } from '@/app/workspace/[workspaceId]/integrations/components/connect-service-account-modal/use-service-account-connect'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { useOptionalWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { BrandIcon } from '@/blocks/brand-icon'
@@ -105,6 +106,7 @@ import {
   useWorkspaceCredential,
   useWorkspaceCredentials,
 } from '@/hooks/queries/credentials'
+import { useDashboards } from '@/hooks/queries/dashboards'
 import {
   usePersonalEnvironment,
   useSavePersonalEnvironment,
@@ -1994,6 +1996,14 @@ function WorkspaceResourceDisplayContent({
   const { data: tables = [] } = useTablesList(workspaceId)
   const { data: files = [] } = useWorkspaceFiles(workspaceId)
   const { data: knowledgeBases = [] } = useKnowledgeBasesQuery(workspaceId)
+  const dashboardsEnabled = useFeatureFlag('dashboards')
+  const { data: dashboardList } = useDashboards(
+    workspaceId,
+    {},
+    {
+      enabled: dashboardsEnabled && data.type === 'dashboard',
+    }
+  )
 
   const resource = useMemo<WorkspaceResourceRef>(() => {
     const fileFromPath =
@@ -2005,13 +2015,17 @@ function WorkspaceResourceDisplayContent({
         : data.type === 'table'
           ? (tables.find((table) => table.id === data.id)?.name ??
             fallbackWorkspaceResourceTitle(data.type))
-          : data.type === 'file' || data.type === 'dashboard'
-            ? (files.find((file) => file.id === data.id)?.name ??
-              fileFromPath?.name ??
+          : data.type === 'dashboard'
+            ? (dashboardList?.dashboards.find((dashboard) => dashboard.id === data.id)?.name ??
               data.title ??
               fallbackWorkspaceResourceTitle(data.type))
-            : (knowledgeBases.find((knowledgeBase) => knowledgeBase.id === data.id)?.name ??
-              fallbackWorkspaceResourceTitle(data.type))
+            : data.type === 'file'
+              ? (files.find((file) => file.id === data.id)?.name ??
+                fileFromPath?.name ??
+                data.title ??
+                fallbackWorkspaceResourceTitle(data.type))
+              : (knowledgeBases.find((knowledgeBase) => knowledgeBase.id === data.id)?.name ??
+                fallbackWorkspaceResourceTitle(data.type))
 
     const id = data.id ?? fileFromPath?.id
     return {
@@ -2026,6 +2040,7 @@ function WorkspaceResourceDisplayContent({
     data.path,
     data.title,
     data.type,
+    dashboardList,
     files,
     knowledgeBases,
     tables,

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-invalidation.ts

@@ -28,9 +28,9 @@ const RESOURCE_INVALIDATORS: Record<
     invalidate(qc, id ? tableKeys.views(id) : tableKeys.viewsRoot())
   },
   dashboard: (qc, wId, id) => {
-    invalidate(qc, dashboardKeys.lists())
+    invalidate(qc, dashboardKeys.lists(wId))
     invalidate(qc, dashboardKeys.folders(wId))
-    invalidate(qc, id ? dashboardKeys.detail(wId, id) : dashboardKeys.details())
+    invalidate(qc, id ? dashboardKeys.detail(wId, id) : dashboardKeys.details(wId))
   },
   file: (qc, wId, id) => {
     invalidate(qc, workspaceFilesKeys.lists())

apps/sim/app/workspace/[workspaceId]/home/home.tsx

@@ -314,6 +314,8 @@ function HomeContent({ chatId, userName, userId }: HomeProps) {
         return context.fileId ? { type: 'file', id: context.fileId } : null
       case 'file_selection':
         return context.fileId ? { type: 'file', id: context.fileId } : null
+      case 'dashboard':
+        return { type: 'dashboard', id: context.fileId }
       default:
         return null
     }

apps/sim/ee/workspace-forking/application/content-outbox.ts

@@ -1,5 +1,5 @@
 import { db } from '@sim/db'
-import { workspaceOperationReceipt } from '@sim/db/schema'
+import { fileDiscoveryEnum, workspaceOperationReceipt } from '@sim/db/schema'
 import { and, eq } from 'drizzle-orm'
 import { z } from 'zod'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
@@ -107,6 +107,7 @@ const contentPayloadSchema = z
                   'logs',
                   'workspace-logos',
                 ]),
+                discovery: z.enum(fileDiscoveryEnum.enumValues).optional(),
                 fileName: z.string().max(4096),
                 contentType: z.string().max(1024),
                 size: z.number().min(0),

apps/sim/hooks/queries/dashboards.ts

@@ -1,4 +1,4 @@
-import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { requestJson } from '@/lib/api/client/request'
 import {
   type CreateDashboardBody,
@@ -21,13 +21,13 @@ import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
 export const DASHBOARD_STALE_TIME = 30_000
 export const dashboardKeys = {
   all: ['dashboards'] as const,
-  lists: () => [...dashboardKeys.all, 'list'] as const,
+  workspace: (workspaceId: string) => [...dashboardKeys.all, workspaceId] as const,
+  lists: (workspaceId: string) => [...dashboardKeys.workspace(workspaceId), 'list'] as const,
   list: (workspaceId: string, query: ListDashboardsQuery = {}) =>
-    [...dashboardKeys.lists(), workspaceId, query.search ?? '', query.folder ?? ''] as const,
-  details: () => [...dashboardKeys.all, 'detail'] as const,
-  detail: (workspaceId: string, id: string) =>
-    [...dashboardKeys.details(), workspaceId, id] as const,
-  folders: (workspaceId: string) => [...dashboardKeys.all, 'folders', workspaceId] as const,
+    [...dashboardKeys.lists(workspaceId), query.search ?? '', query.folder ?? ''] as const,
+  details: (workspaceId: string) => [...dashboardKeys.workspace(workspaceId), 'detail'] as const,
+  detail: (workspaceId: string, id: string) => [...dashboardKeys.details(workspaceId), id] as const,
+  folders: (workspaceId: string) => [...dashboardKeys.workspace(workspaceId), 'folders'] as const,
 }
 export function useDashboards(
   workspaceId: string,
@@ -44,7 +44,12 @@ export function useDashboards(
       }),
     enabled: Boolean(workspaceId) && (options?.enabled ?? true),
     staleTime: DASHBOARD_STALE_TIME,
-    placeholderData: keepPreviousData,
+    placeholderData: (previous, previousQuery) =>
+      dashboardKeys
+        .lists(workspaceId)
+        .every((part, index) => previousQuery?.queryKey[index] === part)
+        ? previous
+        : undefined,
   })
 }
 export function useDashboard(workspaceId: string, dashboardId: string) {
@@ -115,7 +120,7 @@ export function useDashboardMutation(workspaceId: string) {
       }
     },
     onSuccess: (_data, input) => {
-      void client.invalidateQueries({ queryKey: dashboardKeys.lists() })
+      void client.invalidateQueries({ queryKey: dashboardKeys.lists(workspaceId) })
       void client.invalidateQueries({ queryKey: dashboardKeys.folders(workspaceId) })
       void client.invalidateQueries({ queryKey: workspaceFilesKeys.lists() })
       if ('dashboardId' in input)

apps/sim/lib/api/contracts/dashboards.ts

@@ -32,7 +32,7 @@ export const createDashboardBodySchema = z
   .object({
     name: dashboardNameSchema,
     content: dashboardContentSchema,
-    folderId: z.string().min(1).nullable().optional(),
+    folderId: folderIdSchema.nullable().optional(),
   })
   .strict()
 export const updateDashboardBodySchema = z
@@ -41,7 +41,7 @@ export const updateDashboardBodySchema = z
 export const moveDashboardBodySchema = z
   .object({
     name: dashboardNameSchema.optional(),
-    folderId: z.string().min(1).nullable().optional(),
+    folderId: folderIdSchema.nullable().optional(),
   })
   .strict()
 export const listDashboardsQuerySchema = z.object({

apps/sim/lib/api/contracts/mothership-management-tools.test.ts

@@ -32,6 +32,20 @@ const examples = {
     { action: 'setup', connectorType: 'google_drive', accessMode: 'admin' },
     { action: 'approve', connectorType: 'google_drive', approved: true },
   ],
+  dashboards: [
+    { action: 'list', search: 'support' },
+    { action: 'get', dashboardId: 'dash-1' },
+    { action: 'create', name: 'Support', content: 'title: Support\nblocks: []', folderId: null },
+    { action: 'update', dashboardId: 'dash-1', content: 'title: Support', expectedRevision: 'r1' },
+    { action: 'move', dashboardId: 'dash-1', folderId: null },
+    { action: 'delete', dashboardId: 'dash-1' },
+  ],
+  dashboard_folders: [
+    { action: 'list' },
+    { action: 'create', path: '/Operations' },
+    { action: 'move', path: '/Operations', destinationPath: '/Ops' },
+    { action: 'delete', path: '/Operations' },
+  ],
 }
 
 describe('management tool provider contract', () => {

apps/sim/lib/dashboards/application/dashboards.ts

@@ -71,7 +71,7 @@ function validateContent(content: string) {
 }
 
 function storageName(name: string) {
-  const clean = name.trim().replace(/\.dashboard$/, '')
+  const clean = name.trim().replace(/\.dashboard$/i, '')
   if (!clean || clean.length > 220 || /[/\\]/.test(clean) || clean === '.' || clean === '..') {
     throw new OrchestrationError(
       'validation',