fix(emcn): restore Cancel disable guard for in-flight ChipModal actions

emir-karabeg · emir-karabeg · commit 6c7cbdb681de · 2026-06-08T13:32:11.000-07:00
Add `cancelDisabled` to ChipModalFooter and thread the pre-migration
in-flight guards back into all 45 footers that had them, so destructive
flows can no longer be dismissed mid-mutation.
diff --git a/apps/sim/app/(auth)/login/login-form.tsx b/apps/sim/app/(auth)/login/login-form.tsx
@@ -561,6 +561,7 @@ export default function LoginPage({
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setForgotPasswordOpen(false)}
+          cancelDisabled={isSubmittingReset}
           primaryAction={{
             label: isSubmittingReset ? 'Sending…' : 'Send Reset Link',
             onClick: handleForgotPassword,
diff --git a/apps/sim/app/(landing)/integrations/components/request-integration-modal.tsx b/apps/sim/app/(landing)/integrations/components/request-integration-modal.tsx
@@ -145,6 +145,7 @@ export function RequestIntegrationModal() {
         ) : (
           <ChipModalFooter
             onCancel={() => setOpen(false)}
+            cancelDisabled={status === 'submitting'}
             primaryAction={{
               label: status === 'submitting' ? 'Submitting...' : 'Submit request',
               onClick: handleSubmit,
diff --git a/apps/sim/app/workspace/[workspaceId]/components/connect-oauth-modal/connect-oauth-modal.tsx b/apps/sim/app/workspace/[workspaceId]/components/connect-oauth-modal/connect-oauth-modal.tsx
@@ -443,6 +443,7 @@ export function ConnectOAuthModal(props: ConnectOAuthModalProps) {
       </ChipModalBody>
       <ChipModalFooter
         onCancel={handleClose}
+        cancelDisabled={isPending}
         primaryAction={{
           label: isPending ? 'Connecting...' : 'Connect',
           onClick: handleConnect,
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/delete-confirm-modal/delete-confirm-modal.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/delete-confirm-modal/delete-confirm-modal.tsx
@@ -49,6 +49,7 @@ export const DeleteConfirmModal = memo(function DeleteConfirmModal({
       </ChipModalBody>
       <ChipModalFooter
         onCancel={() => onOpenChange(false)}
+        cancelDisabled={isPending}
         primaryAction={{
           label: isPending ? 'Deleting...' : 'Delete',
           onClick: onDelete,
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/components/delete-chunk-modal/delete-chunk-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/components/delete-chunk-modal/delete-chunk-modal.tsx
@@ -39,6 +39,7 @@ export function DeleteChunkModal({
       </ChipModalBody>
       <ChipModalFooter
         onCancel={onClose}
+        cancelDisabled={isDeleting}
         primaryAction={{
           label: isDeleting ? 'Deleting…' : 'Delete',
           onClick: handleDeleteChunk,
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/document.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/document.tsx
@@ -1229,6 +1229,7 @@ export function Document({
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setShowDeleteDocumentDialog(false)}
+          cancelDisabled={isDeletingDocument}
           primaryAction={{
             label: isDeletingDocument ? 'Deleting...' : 'Delete Document',
             onClick: handleDeleteDocument,
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
@@ -1212,6 +1212,7 @@ export function KnowledgeBase({
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setShowDeleteDialog(false)}
+          cancelDisabled={isDeleting}
           primaryAction={{
             label: isDeleting ? 'Deleting...' : 'Delete Knowledge Base',
             onClick: handleDeleteKnowledgeBase,
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-connector-modal/add-connector-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-connector-modal/add-connector-modal.tsx
@@ -499,6 +499,7 @@ export function AddConnectorModal({
         {step === 'configure' && (
           <ChipModalFooter
             onCancel={() => onOpenChange(false)}
+            cancelDisabled={isCreating}
             primaryAction={{
               label: isCreating ? 'Connecting…' : 'Connect & Sync',
               onClick: handleSubmit,
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-documents-modal/add-documents-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-documents-modal/add-documents-modal.tsx
@@ -259,6 +259,7 @@ export function AddDocumentsModal({
 
       <ChipModalFooter
         onCancel={handleClose}
+        cancelDisabled={isUploading}
         primaryAction={{
           label: isUploading
             ? uploadProgress.stage === 'uploading'
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/base-tags-modal/base-tags-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/base-tags-modal/base-tags-modal.tsx
@@ -432,6 +432,7 @@ export function BaseTagsModal({ open, onOpenChange, knowledgeBaseId }: BaseTagsM
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setDeleteTagDialogOpen(false)}
+          cancelDisabled={deleteTagMutation.isPending}
           primaryAction={{
             label: deleteTagMutation.isPending ? 'Deleting...' : 'Delete Tag',
             onClick: confirmDeleteTag,
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/connectors-section/connectors-section.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/connectors-section/connectors-section.tsx
@@ -284,6 +284,7 @@ export function ConnectorsSection({
         </ChipModalBody>
         <ChipModalFooter
           onCancel={closeDeleteModal}
+          cancelDisabled={isDeleting}
           primaryAction={{
             label: isDeleting ? 'Removing...' : 'Remove',
             onClick: handleDeleteConnector,
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/edit-connector-modal/edit-connector-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/edit-connector-modal/edit-connector-modal.tsx
@@ -315,6 +315,7 @@ export function EditConnectorModal({
       {activeTab === 'settings' && (
         <ChipModalFooter
           onCancel={() => onOpenChange(false)}
+          cancelDisabled={isSaving}
           primaryAction={{
             label: isSaving ? 'Saving…' : 'Save',
             onClick: handleSave,
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/rename-document-modal/rename-document-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/rename-document-modal/rename-document-modal.tsx
@@ -103,6 +103,7 @@ export function RenameDocumentModal({
       </ChipModalBody>
       <ChipModalFooter
         onCancel={() => onOpenChange(false)}
+        cancelDisabled={isSubmitting}
         primaryAction={{
           label: isSubmitting ? 'Renaming...' : 'Rename',
           onClick: () => void handleSubmit(),
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/components/create-base-modal/create-base-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/components/create-base-modal/create-base-modal.tsx
@@ -579,6 +579,7 @@ export const CreateBaseModal = memo(function CreateBaseModal({
 
         <ChipModalFooter
           onCancel={() => handleClose(false)}
+          cancelDisabled={isSubmitting}
           primaryAction={{
             label: isSubmitting
               ? isUploading
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/components/delete-knowledge-base-modal/delete-knowledge-base-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/components/delete-knowledge-base-modal/delete-knowledge-base-modal.tsx
@@ -63,6 +63,7 @@ export const DeleteKnowledgeBaseModal = memo(function DeleteKnowledgeBaseModal({
       </ChipModalBody>
       <ChipModalFooter
         onCancel={onClose}
+        cancelDisabled={isDeleting}
         primaryAction={{
           label: isDeleting ? 'Deleting...' : 'Delete',
           onClick: onConfirm,
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/components/edit-knowledge-base-modal/edit-knowledge-base-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/components/edit-knowledge-base-modal/edit-knowledge-base-modal.tsx
@@ -157,6 +157,7 @@ export const EditKnowledgeBaseModal = memo(function EditKnowledgeBaseModal({
       </ChipModalBody>
       <ChipModalFooter
         onCancel={() => onOpenChange(false)}
+        cancelDisabled={isSubmitting}
         primaryAction={{
           label: isSubmitting ? 'Saving...' : 'Save',
           onClick: handleSubmit,
diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/components/notifications/notifications.tsx b/apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/components/notifications/notifications.tsx
@@ -1285,6 +1285,7 @@ export const NotificationSettings = memo(function NotificationSettings({
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setShowDeleteDialog(false)}
+          cancelDisabled={deleteNotification.isPending}
           primaryAction={{
             label: deleteNotification.isPending ? 'Deleting...' : 'Delete',
             onClick: handleDelete,
diff --git a/apps/sim/app/workspace/[workspaceId]/scheduled-tasks/scheduled-tasks.tsx b/apps/sim/app/workspace/[workspaceId]/scheduled-tasks/scheduled-tasks.tsx
@@ -466,6 +466,7 @@ export function ScheduledTasks() {
         </ChipModalBody>
         <ChipModalFooter
           onCancel={handleCancelDelete}
+          cancelDisabled={deleteSchedule.isPending}
           primaryAction={{
             label: deleteSchedule.isPending ? 'Deleting...' : 'Delete',
             onClick: handleDelete,
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx
@@ -360,6 +360,7 @@ export function ApiKeys() {
             setShowDeleteDialog(false)
             setDeleteKey(null)
           }}
+          cancelDisabled={deleteApiKeyMutation.isPending}
           primaryAction={{
             label: deleteApiKeyMutation.isPending ? 'Deleting...' : 'Delete',
             onClick: handleDeleteKey,
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/byok/byok.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/byok/byok.tsx
@@ -500,6 +500,7 @@ export function BYOK() {
             setShowApiKey(false)
             setError(null)
           }}
+          cancelDisabled={upsertKey.isPending}
           primaryAction={{
             label: upsertKey.isPending ? 'Saving...' : 'Save',
             onClick: handleSave,
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/copilot/copilot.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/copilot/copilot.tsx
@@ -352,6 +352,7 @@ export function Copilot() {
             setShowDeleteDialog(false)
             setDeleteKey(null)
           }}
+          cancelDisabled={deleteKeyMutation.isPending}
           primaryAction={{
             label: deleteKeyMutation.isPending ? 'Deleting...' : 'Delete',
             onClick: handleDeleteKey,
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx
@@ -532,6 +532,7 @@ export function General() {
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setShowResetPasswordModal(false)}
+          cancelDisabled={resetPassword.isPending || resetPassword.isSuccess}
           primaryAction={{
             label: resetPassword.isPending
               ? 'Sending...'
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/inbox/components/inbox-enable-toggle/inbox-enable-toggle.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/inbox/components/inbox-enable-toggle/inbox-enable-toggle.tsx
@@ -126,6 +126,7 @@ export function InboxEnableToggle() {
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setIsDisableOpen(false)}
+          cancelDisabled={toggleInbox.isPending}
           primaryAction={{
             label: toggleInbox.isPending ? 'Disabling...' : 'Disable inbox',
             onClick: handleDisable,
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/inbox/components/inbox-settings-tab/inbox-settings-tab.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/inbox/components/inbox-settings-tab/inbox-settings-tab.tsx
@@ -308,6 +308,7 @@ export function InboxSettingsTab() {
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setIsEditAddressOpen(false)}
+          cancelDisabled={updateAddress.isPending}
           primaryAction={{
             label: updateAddress.isPending ? 'Updating...' : 'Change address',
             onClick: handleEditAddress,
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/components/no-organization-view/no-organization-view.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/components/no-organization-view/no-organization-view.tsx
@@ -165,6 +165,7 @@ export function NoOrganizationView({
           </ChipModalBody>
           <ChipModalFooter
             onCancel={() => setCreateOrgDialogOpen(false)}
+            cancelDisabled={isCreatingOrg}
             primaryAction={{
               label: isCreatingOrg ? 'Creating...' : 'Create Organization',
               onClick: onCreateOrganization,
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/components/remove-member-dialog/remove-member-dialog.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/components/remove-member-dialog/remove-member-dialog.tsx
@@ -65,6 +65,7 @@ export function RemoveMemberDialog({
       </ChipModalBody>
       <ChipModalFooter
         onCancel={onCancel}
+        cancelDisabled={isSubmitting}
         primaryAction={{
           label: isSelfRemoval ? 'Leave Organization' : 'Remove',
           onClick: () => onConfirmRemove(),
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/components/transfer-ownership-dialog/transfer-ownership-dialog.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/components/transfer-ownership-dialog/transfer-ownership-dialog.tsx
@@ -205,6 +205,7 @@ export function TransferOwnershipDialog({
       </ChipModalBody>
       <ChipModalFooter
         onCancel={() => handleClose(false)}
+        cancelDisabled={isSubmitting}
         primaryAction={{
           label: isSubmitting ? 'Transferring...' : 'Transfer & leave',
           onClick: handleConfirm,
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/row-modal/row-modal.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/row-modal/row-modal.tsx
@@ -177,6 +177,7 @@ export function RowModal({ mode, isOpen, onClose, table, row, rowIds, onSuccess
         </ChipModalBody>
         <ChipModalFooter
           onCancel={handleClose}
+          cancelDisabled={isSubmitting}
           primaryAction={{
             label: isSubmitting ? 'Deleting...' : 'Delete',
             onClick: handleDelete,
@@ -221,6 +222,7 @@ export function RowModal({ mode, isOpen, onClose, table, row, rowIds, onSuccess
       </ChipModalBody>
       <ChipModalFooter
         onCancel={handleClose}
+        cancelDisabled={isSubmitting}
         primaryAction={{
           label: isSubmitting
             ? isAddMode
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx
@@ -787,6 +787,7 @@ export function Table({
           </ChipModalBody>
           <ChipModalFooter
             onCancel={() => setShowDeleteTableConfirm(false)}
+            cancelDisabled={deleteTableMutation.isPending}
             primaryAction={{
               label: deleteTableMutation.isPending ? 'Deleting...' : 'Delete',
               onClick: handleDeleteTable,
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/components/import-csv-dialog/import-csv-dialog.tsx b/apps/sim/app/workspace/[workspaceId]/tables/components/import-csv-dialog/import-csv-dialog.tsx
@@ -479,6 +479,7 @@ export function ImportCsvDialog({
       </ChipModalBody>
       <ChipModalFooter
         onCancel={() => onOpenChange(false)}
+        cancelDisabled={importMutation.isPending}
         primaryAction={{
           label: importMutation.isPending
             ? mode === 'replace'
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/tables.tsx b/apps/sim/app/workspace/[workspaceId]/tables/tables.tsx
@@ -618,6 +618,7 @@ export function Tables() {
             setIsDeleteDialogOpen(false)
             setActiveTable(null)
           }}
+          cancelDisabled={deleteTable.isPending}
           primaryAction={{
             label: deleteTable.isPending ? 'Deleting...' : 'Delete',
             onClick: handleDelete,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/chat/chat.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/chat/chat.tsx
@@ -437,6 +437,7 @@ export function ChatDeploy({
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setShowDeleteConfirmation(false)}
+          cancelDisabled={deleteChatMutation.isPending}
           primaryAction={{
             label: deleteChatMutation.isPending ? 'Deleting...' : 'Delete',
             onClick: handleDelete,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/api-info-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/api-info-modal.tsx
@@ -274,6 +274,7 @@ export function ApiInfoModal({ open, onOpenChange, workflowId }: ApiInfoModalPro
         </ChipModalBody>
         <ChipModalFooter
           onCancel={handleCloseAttempt}
+          cancelDisabled={isSaving}
           primaryAction={{
             label: 'Save',
             onClick: handleSave,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/version-description-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/version-description-modal.tsx
@@ -135,6 +135,7 @@ export function VersionDescriptionModal({
         </ChipModalBody>
         <ChipModalFooter
           onCancel={handleCloseAttempt}
+          cancelDisabled={updateMutation.isPending || isGenerating}
           primaryAction={{
             label: updateMutation.isPending ? 'Saving...' : 'Save',
             onClick: handleSave,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
@@ -852,6 +852,7 @@ export function DeployModal({
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setUndeployTargetWorkflowId(null)}
+          cancelDisabled={isUndeploying}
           primaryAction={{
             label: isUndeploying ? 'Undeploying...' : 'Undeploy',
             onClick: handleUndeploy,
@@ -884,6 +885,7 @@ export function DeployModal({
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setShowA2aDeleteConfirm(false)}
+          cancelDisabled={a2aSubmitting}
           primaryAction={{
             label: a2aSubmitting ? 'Deleting...' : 'Delete',
             onClick: handleA2aDelete,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal.tsx
@@ -1201,6 +1201,7 @@ try {
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setShowDeleteConfirm(false)}
+          cancelDisabled={deleteToolMutation.isPending}
           primaryAction={{
             label: deleteToolMutation.isPending ? 'Deleting...' : 'Delete',
             onClick: handleDelete,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
@@ -953,6 +953,7 @@ export const Panel = memo(function Panel({ workspaceId: propWorkspaceId }: Panel
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setIsDeleteModalOpen(false)}
+          cancelDisabled={isDeleting}
           primaryAction={{
             label: isDeleting ? 'Deleting...' : 'Delete',
             onClick: handleDeleteWorkflow,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/help-modal/help-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/help-modal/help-modal.tsx
@@ -349,6 +349,7 @@ export function HelpModal({ open, onOpenChange, workflowId, workspaceId }: HelpM
 
         <ChipModalFooter
           onCancel={() => onOpenChange(false)}
+          cancelDisabled={helpMutation.isPending}
           primaryAction={{
             label: helpMutation.isPending
               ? 'Submitting...'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal.tsx
@@ -277,6 +277,7 @@ export function DeleteModal({
       </ChipModalBody>
       <ChipModalFooter
         onCancel={handleClose}
+        cancelDisabled={isDeleting}
         primaryAction={{
           label: isDeleting ? 'Deleting...' : 'Delete',
           onClick: onConfirm,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/create-workspace-modal/create-workspace-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/create-workspace-modal/create-workspace-modal.tsx
@@ -66,6 +66,7 @@ export function CreateWorkspaceModal({
       </ChipModalBody>
       <ChipModalFooter
         onCancel={() => onOpenChange(false)}
+        cancelDisabled={isCreating}
         primaryAction={{
           label: isCreating ? 'Creating...' : 'Create',
           onClick: () => void handleSubmit(),
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
@@ -702,6 +702,7 @@ function WorkspaceHeaderImpl({
         </ChipModalBody>
         <ChipModalFooter
           onCancel={() => setIsLeaveModalOpen(false)}
+          cancelDisabled={isLeavingWorkspace}
           primaryAction={{
             label: isLeavingWorkspace ? 'Leaving...' : 'Leave workspace',
             onClick: handleLeaveWorkspace,
diff --git a/apps/sim/components/emcn/components/chip-modal/chip-modal.tsx b/apps/sim/components/emcn/components/chip-modal/chip-modal.tsx
@@ -761,9 +761,17 @@ export interface ChipModalFooterProps {
   /**
    * Dismiss handler for the always-present Cancel button. Like the header's
    * close (X), Cancel is structural — it always reads "Cancel" and there is no
-   * prop to relabel, remove, or disable it.
+   * prop to relabel or remove it. Its enabled state can be controlled via
+   * {@link ChipModalFooterProps.cancelDisabled}.
    */
   onCancel: () => void
+  /**
+   * Disables the Cancel button. Set this while a primary/secondary action is
+   * in flight (e.g. an async delete or save) so the user cannot dismiss the
+   * modal and assume the operation was aborted while the mutation keeps running.
+   * @default false
+   */
+  cancelDisabled?: boolean
   /** Primary action, anchored bottom-right (e.g. Save, Create, Delete). */
   primaryAction: ChipModalFooterAction
   /**
@@ -779,7 +787,12 @@ export interface ChipModalFooterProps {
  * `primaryAction`. Buttons are described via {@link ChipModalFooterAction} and
  * rendered as {@link Chip}s, so no footer can drift from the canonical layout.
  */
-function ChipModalFooter({ onCancel, primaryAction, secondaryAction }: ChipModalFooterProps) {
+function ChipModalFooter({
+  onCancel,
+  cancelDisabled,
+  primaryAction,
+  secondaryAction,
+}: ChipModalFooterProps) {
   return (
     <div className='flex flex-col'>
       <ChipModalSeparator />
@@ -800,7 +813,7 @@ function ChipModalFooter({ onCancel, primaryAction, secondaryAction }: ChipModal
           </Chip>
         ) : null}
         <div className='flex gap-2'>
-          <Chip variant='filled' flush onClick={onCancel}>
+          <Chip variant='filled' flush onClick={onCancel} disabled={cancelDisabled}>
             Cancel
           </Chip>
           <Chip
diff --git a/apps/sim/ee/data-drains/components/data-drains-settings.tsx b/apps/sim/ee/data-drains/components/data-drains-settings.tsx
