ack comments

Author: waleedlatif1

apps/sim/hooks/queries/folders.ts

@@ -5,11 +5,11 @@ import {
   createOptimisticMutationHandlers,
   generateTempId,
 } from '@/hooks/queries/utils/optimistic-mutation'
+import { getTopInsertionSortOrder } from '@/hooks/queries/utils/top-insertion-sort-order'
 import { workflowKeys } from '@/hooks/queries/workflows'
 import { useFolderStore } from '@/stores/folders/store'
 import type { WorkflowFolder } from '@/stores/folders/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import type { WorkflowMetadata } from '@/stores/workflows/registry/types'
 
 const logger = createLogger('FolderQueries')
 
@@ -135,37 +135,6 @@ function createFolderMutationHandlers<TVariables extends { workspaceId: string }
   })
 }
 
-/**
- * Calculates the insertion sort order for a folder at the top of mixed siblings.
- * Siblings include both folders and workflows because they are rendered together.
- */
-function getTopInsertionSortOrder(
-  folders: Record<string, WorkflowFolder>,
-  workflows: Record<string, WorkflowMetadata>,
-  workspaceId: string,
-  parentId: string | null | undefined
-): number {
-  const normalizedParentId = parentId ?? null
-
-  const siblingFolders = Object.values(folders).filter(
-    (f) => f.workspaceId === workspaceId && f.parentId === normalizedParentId
-  )
-  const siblingWorkflows = Object.values(workflows).filter(
-    (w) => w.workspaceId === workspaceId && (w.folderId ?? null) === normalizedParentId
-  )
-
-  const siblingOrders = [
-    ...siblingFolders.map((folder) => folder.sortOrder),
-    ...siblingWorkflows.map((workflow) => workflow.sortOrder ?? 0),
-  ]
-
-  if (siblingOrders.length === 0) {
-    return 0
-  }
-
-  return Math.min(...siblingOrders) - 1
-}
-
 export function useCreateFolder() {
   const queryClient = useQueryClient()
 

apps/sim/hooks/queries/utils/top-insertion-sort-order.ts

@@ -0,0 +1,44 @@
+interface SortableWorkflow {
+  workspaceId: string
+  folderId?: string | null
+  sortOrder?: number
+}
+
+interface SortableFolder {
+  workspaceId: string
+  parentId?: string | null
+  sortOrder: number
+}
+
+/**
+ * Calculates the insertion sort order that places a new item at the top of a
+ * mixed list of folders and workflows within the same parent scope.
+ */
+export function getTopInsertionSortOrder(
+  workflows: Record<string, SortableWorkflow>,
+  folders: Record<string, SortableFolder>,
+  workspaceId: string,
+  parentId: string | null | undefined
+): number {
+  const normalizedParentId = parentId ?? null
+
+  const siblingWorkflows = Object.values(workflows).filter(
+    (workflow) =>
+      workflow.workspaceId === workspaceId && (workflow.folderId ?? null) === normalizedParentId
+  )
+  const siblingFolders = Object.values(folders).filter(
+    (folder) =>
+      folder.workspaceId === workspaceId && (folder.parentId ?? null) === normalizedParentId
+  )
+
+  const siblingOrders = [
+    ...siblingWorkflows.map((workflow) => workflow.sortOrder ?? 0),
+    ...siblingFolders.map((folder) => folder.sortOrder),
+  ]
+
+  if (siblingOrders.length === 0) {
+    return 0
+  }
+
+  return Math.min(...siblingOrders) - 1
+}

apps/sim/hooks/queries/workflows.ts

@@ -8,6 +8,7 @@ import {
   createOptimisticMutationHandlers,
   generateTempId,
 } from '@/hooks/queries/utils/optimistic-mutation'
+import { getTopInsertionSortOrder } from '@/hooks/queries/utils/top-insertion-sort-order'
 import { useFolderStore } from '@/stores/folders/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import type { WorkflowMetadata } from '@/stores/workflows/registry/types'
@@ -161,39 +162,6 @@ interface DuplicateWorkflowResult {
   subflowsCount: number
 }
 
-/**
- * Calculates the insertion sort order for a workflow at the top of mixed siblings.
- * Siblings include both workflows and folders because they share one rendered list.
- */
-function getTopInsertionSortOrder(
-  workflows: Record<string, WorkflowMetadata>,
-  folders: ReturnType<typeof useFolderStore.getState>['folders'],
-  workspaceId: string,
-  folderId: string | null | undefined
-): number {
-  const normalizedFolderId = folderId ?? null
-
-  const siblingWorkflows = Object.values(workflows).filter(
-    (workflow) =>
-      workflow.workspaceId === workspaceId && (workflow.folderId ?? null) === normalizedFolderId
-  )
-  const siblingFolders = Object.values(folders).filter(
-    (folder) =>
-      folder.workspaceId === workspaceId && (folder.parentId ?? null) === normalizedFolderId
-  )
-
-  const siblingOrders = [
-    ...siblingWorkflows.map((workflow) => workflow.sortOrder ?? 0),
-    ...siblingFolders.map((folder) => folder.sortOrder),
-  ]
-
-  if (siblingOrders.length === 0) {
-    return 0
-  }
-
-  return Math.min(...siblingOrders) - 1
-}
-
 /**
  * Creates optimistic mutation handlers for workflow operations
  */