fixed move folder tool, infinite oauth fetching

Author: Adam Gough

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/components/folder-selector-input.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import {
   type FolderInfo,
   FolderSelector,
@@ -33,6 +33,11 @@ export function FolderSelectorInput({
   const { activeWorkflowId } = useWorkflowRegistry()
   const [selectedFolderId, setSelectedFolderId] = useState<string>('')
   const [_folderInfo, setFolderInfo] = useState<FolderInfo | null>(null)
+  const provider = (subBlock.provider || subBlock.serviceId || 'google-email').toLowerCase()
+  const isCopyDestinationSelector =
+    subBlock.canonicalParamId === 'copyDestinationId' ||
+    subBlock.id === 'copyDestinationFolder' ||
+    subBlock.id === 'manualCopyDestinationFolder'
   const { isForeignCredential } = useForeignCredential(
     subBlock.provider || subBlock.serviceId || 'outlook',
     (connectedCredential as string) || ''
@@ -54,11 +59,15 @@ export function FolderSelectorInput({
       setSelectedFolderId(current)
       return
     }
-    // Set default INBOX if empty
-    const defaultValue = 'INBOX'
-    setSelectedFolderId(defaultValue)
-    if (!isPreview) {
-      collaborativeSetSubblockValue(blockId, subBlock.id, defaultValue)
+    const shouldDefaultInbox = provider !== 'outlook' && !isCopyDestinationSelector
+    if (shouldDefaultInbox) {
+      const defaultValue = 'INBOX'
+      setSelectedFolderId(defaultValue)
+      if (!isPreview) {
+        collaborativeSetSubblockValue(blockId, subBlock.id, defaultValue)
+      }
+    } else {
+      setSelectedFolderId('')
     }
   }, [
     blockId,
@@ -71,19 +80,22 @@ export function FolderSelectorInput({
   ])
 
   // Handle folder selection
-  const handleFolderChange = (folderId: string, info?: FolderInfo) => {
-    setSelectedFolderId(folderId)
-    setFolderInfo(info || null)
-    if (!isPreview) {
-      collaborativeSetSubblockValue(blockId, subBlock.id, folderId)
-    }
-  }
+  const handleFolderChange = useCallback(
+    (folderId: string, info?: FolderInfo) => {
+      setSelectedFolderId(folderId)
+      setFolderInfo(info || null)
+      if (!isPreview) {
+        collaborativeSetSubblockValue(blockId, subBlock.id, folderId)
+      }
+    },
+    [blockId, subBlock.id, collaborativeSetSubblockValue, isPreview]
+  )
 
   return (
     <FolderSelector
       value={selectedFolderId}
       onChange={handleFolderChange}
-      provider={subBlock.provider || 'google-email'}
+      provider={provider}
       requiredScopes={subBlock.requiredScopes || []}
       label={subBlock.placeholder || 'Select folder'}
       disabled={finalDisabled}

apps/sim/blocks/blocks/gmail.ts

@@ -412,9 +412,15 @@ export const GmailBlock: BlockConfig<GmailToolResponse> = {
 
         // Handle move operation
         if (rest.operation === 'move_gmail') {
-          rest.messageId = moveMessageId
-          rest.addLabelIds = (destinationLabel || manualDestinationLabel || '').trim()
-          rest.removeLabelIds = (sourceLabel || manualSourceLabel || '').trim()
+          if (moveMessageId) {
+            rest.messageId = moveMessageId
+          }
+          if (!rest.addLabelIds) {
+            rest.addLabelIds = (destinationLabel || manualDestinationLabel || '').trim()
+          }
+          if (!rest.removeLabelIds) {
+            rest.removeLabelIds = (sourceLabel || manualSourceLabel || '').trim()
+          }
         }
 
         // Handle simple message ID operations
@@ -427,13 +433,18 @@ export const GmailBlock: BlockConfig<GmailToolResponse> = {
             'delete_gmail',
           ].includes(rest.operation)
         ) {
-          rest.messageId = actionMessageId
+          if (actionMessageId) {
+            rest.messageId = actionMessageId
+          }
         }
 
-        // Handle label management operations
         if (['add_label_gmail', 'remove_label_gmail'].includes(rest.operation)) {
-          rest.messageId = labelActionMessageId
-          rest.labelIds = (labelManagement || manualLabelManagement || '').trim()
+          if (labelActionMessageId) {
+            rest.messageId = labelActionMessageId
+          }
+          if (!rest.labelIds) {
+            rest.labelIds = (labelManagement || manualLabelManagement || '').trim()
+          }
         }
 
         return {

apps/sim/blocks/blocks/outlook.ts

@@ -363,26 +363,38 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
 
         // Handle move operation
         if (rest.operation === 'move_outlook') {
-          rest.messageId = moveMessageId
-          rest.destinationId = (destinationFolder || manualDestinationFolder || '').trim()
+          if (moveMessageId) {
+            rest.messageId = moveMessageId
+          }
+          if (!rest.destinationId) {
+            rest.destinationId = (destinationFolder || manualDestinationFolder || '').trim()
+          }
         }
 
-        // Handle simple message ID operations
         if (
           ['mark_read_outlook', 'mark_unread_outlook', 'delete_outlook'].includes(rest.operation)
         ) {
-          rest.messageId = actionMessageId
+          if (actionMessageId) {
+            rest.messageId = actionMessageId
+          }
         }
 
-        // Handle copy operation
         if (rest.operation === 'copy_outlook') {
-          rest.messageId = copyMessageId
-          rest.destinationId = (copyDestinationFolder || manualCopyDestinationFolder || '').trim()
+          if (copyMessageId) {
+            rest.messageId = copyMessageId
+          }
+          // Handle copyDestinationId (from UI canonical param) or destinationId (from trigger)
+          if (rest.copyDestinationId) {
+            rest.destinationId = rest.copyDestinationId
+            rest.copyDestinationId = undefined
+          } else if (!rest.destinationId) {
+            rest.destinationId = (copyDestinationFolder || manualCopyDestinationFolder || '').trim()
+          }
         }
 
         return {
           ...rest,
-          credential, // Keep the credential parameter
+          credential,
         }
       },
     },