ack pr comments

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-drag-drop.ts

@@ -165,15 +165,20 @@ export function useDragDrop() {
         .filter((item) => item.type === 'workflow')
         .map((item) => ({ id: item.id, sortOrder: item.sortOrder, folderId: destinationFolderId }))
 
-      await Promise.all([
-        folderUpdates.length > 0 &&
-          reorderFoldersMutation.mutateAsync({ workspaceId: workspaceId!, updates: folderUpdates }),
-        workflowUpdates.length > 0 &&
-          reorderWorkflowsMutation.mutateAsync({
-            workspaceId: workspaceId!,
-            updates: workflowUpdates,
-          }),
-      ])
+      await Promise.all(
+        [
+          folderUpdates.length > 0 &&
+            reorderFoldersMutation.mutateAsync({
+              workspaceId: workspaceId!,
+              updates: folderUpdates,
+            }),
+          workflowUpdates.length > 0 &&
+            reorderWorkflowsMutation.mutateAsync({
+              workspaceId: workspaceId!,
+              updates: workflowUpdates,
+            }),
+        ].filter(Boolean)
+      )
     },
     [workspaceId, reorderFoldersMutation, reorderWorkflowsMutation]
   )
@@ -209,7 +214,6 @@ export function useDragDrop() {
       setDropIndicator((prev) => {
         let next: DropIndicator | null = indicator
 
-        // Normalize 'after' to 'before' of next sibling
         if (indicator && indicator.position === 'after' && indicator.targetId !== 'root') {
           const siblings = getSiblingItems(indicator.folderId)
           const currentIdx = siblings.findIndex((s) => s.id === indicator.targetId)
@@ -223,7 +227,6 @@ export function useDragDrop() {
           }
         }
 
-        // Skip update if indicator hasn't changed
         if (
           prev?.targetId === next?.targetId &&
           prev?.position === next?.position &&

apps/sim/lib/workflows/operations/import-export.ts

@@ -301,6 +301,15 @@ export interface WorkspaceImportMetadata {
   }>
 }
 
+function extractSortOrder(content: string): number | undefined {
+  try {
+    const parsed = JSON.parse(content)
+    return parsed.state?.metadata?.sortOrder ?? parsed.metadata?.sortOrder
+  } catch {
+    return undefined
+  }
+}
+
 export async function extractWorkflowsFromZip(
   zipFile: File
 ): Promise<{ workflows: ImportedWorkflow[]; metadata?: WorkspaceImportMetadata }> {
@@ -333,19 +342,11 @@ export async function extractWorkflowsFromZip(
       const pathParts = path.split('/').filter((p) => p.length > 0)
       const filename = pathParts.pop() || path
 
-      let sortOrder: number | undefined
-      try {
-        const parsed = JSON.parse(content)
-        sortOrder = parsed.state?.metadata?.sortOrder ?? parsed.metadata?.sortOrder
-      } catch {
-        // ignore parse errors for sortOrder extraction
-      }
-
       workflows.push({
         content,
         name: filename,
         folderPath: pathParts,
-        sortOrder,
+        sortOrder: extractSortOrder(content),
       })
     } catch (error) {
       logger.error(`Failed to extract ${path}:`, error)
@@ -364,19 +365,11 @@ export async function extractWorkflowsFromFiles(files: File[]): Promise<Imported
     try {
       const content = await file.text()
 
-      let sortOrder: number | undefined
-      try {
-        const parsed = JSON.parse(content)
-        sortOrder = parsed.state?.metadata?.sortOrder ?? parsed.metadata?.sortOrder
-      } catch {
-        // ignore parse errors for sortOrder extraction
-      }
-
       workflows.push({
         content,
         name: file.name,
         folderPath: [],
-        sortOrder,
+        sortOrder: extractSortOrder(content),
       })
     } catch (error) {
       logger.error(`Failed to read ${file.name}:`, error)