feat: only cancel conflicting files on Cancel button click (#540)

Co-authored-by: Magomed-Elbi_Dzhukalaev <magomed-elbi_dzhukalaev@epam.com>

Author: Gimir

src/components/FileManager/FileManager.tsx

@@ -566,16 +566,16 @@ export const DialFileManagerView: FC = () => {
 
     conflictingFiles,
     conflictResolutionOpen,
-    closeConflictResolution,
     handleConflictReplace,
     handleConflictDuplicate,
+    handleConflictCancel,
     handleConflictDecideForEach,
 
     uploadConflictingFiles,
     uploadConflictResolutionOpen,
-    closeUploadConflictResolution,
     handleUploadConflictReplace,
     handleUploadConflictDuplicate,
+    handleUploadConflictCancel,
     handleUploadConflictDecideForEach,
 
     openMetadataPopup,
@@ -1318,7 +1318,7 @@ export const DialFileManagerView: FC = () => {
       <ConflictResolutionPopup
         {...conflictResolutionPopupOptions}
         open={conflictResolutionOpen}
-        onClose={closeConflictResolution}
+        onClose={handleConflictCancel}
         onReplace={handleConflictReplace}
         onDuplicate={handleConflictDuplicate}
         onDecideForEach={handleConflictDecideForEach}
@@ -1328,7 +1328,7 @@ export const DialFileManagerView: FC = () => {
       <ConflictResolutionPopup
         {...conflictResolutionPopupOptions}
         open={uploadConflictResolutionOpen}
-        onClose={closeUploadConflictResolution}
+        onClose={handleUploadConflictCancel}
         onReplace={handleUploadConflictReplace}
         onDuplicate={handleUploadConflictDuplicate}
         onDecideForEach={handleUploadConflictDecideForEach}

src/components/FileManager/FileManagerContext.tsx

@@ -159,13 +159,15 @@ export interface FileManagerContextValue {
   conflictResolutionOpen: boolean;
   closeConflictResolution: () => void;
   handleConflictReplace: () => void;
+  handleConflictCancel: () => void;
   handleConflictDuplicate: () => void;
   handleConflictDecideForEach: (decisions: FileConflictDecision[]) => void;
 
   uploadConflictingFiles: DialFile[];
   uploadConflictResolutionOpen: boolean;
   closeUploadConflictResolution: () => void;
   handleUploadConflictReplace: () => void;
+  handleUploadConflictCancel: () => void;
   handleUploadConflictDuplicate: () => void;
   handleUploadConflictDecideForEach: (
     decisions: FileConflictDecision[],

src/components/FileManager/FileManagerProvider.tsx

@@ -253,6 +253,7 @@ export const FileManagerProvider: FC<FileManagerProviderProps> = ({
     closeConflictResolution,
     handleConflictReplace,
     handleConflictDuplicate,
+    handleConflictCancel,
     handleConflictDecideForEach,
     sourceFolder,
   } = useFileClipboard({
@@ -310,6 +311,7 @@ export const FileManagerProvider: FC<FileManagerProviderProps> = ({
     closeUploadConflictResolution,
     handleUploadConflictReplace,
     handleUploadConflictDuplicate,
+    handleUploadConflictCancel,
     handleUploadConflictDecideForEach,
   } = useFileUpload({
     onUploadFiles,
@@ -656,13 +658,15 @@ export const FileManagerProvider: FC<FileManagerProviderProps> = ({
     closeConflictResolution,
     handleConflictReplace,
     handleConflictDuplicate,
+    handleConflictCancel,
     handleConflictDecideForEach,
 
     uploadConflictingFiles,
     uploadConflictResolutionOpen,
     closeUploadConflictResolution,
     handleUploadConflictReplace,
     handleUploadConflictDuplicate,
+    handleUploadConflictCancel,
     handleUploadConflictDecideForEach,
 
     fileMetadataPopupOptions,

src/components/FileManager/hooks/use-conflict-resolution.ts

@@ -1,4 +1,4 @@
-import { useCallback, useState, useRef } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import type { DialFile } from '@/models/file';
 import { DialFileNodeType } from '@/models/file';
 import type { DialCopiedItem } from '@/models/file-manager';
@@ -228,6 +228,32 @@ export const useConflictResolution = ({
     closeConflictResolution,
   ]);
 
+  const handleCancelAll = useCallback(() => {
+    if (!pendingOperation) return;
+    const { files, destinationFolder, metadata } = pendingOperation;
+
+    const resolvedItems = resolveConflictsWithDecisions(
+      destinationFolder,
+      files,
+      new Map(
+        conflictingFiles.map((file) => [
+          file.path,
+          DialFileManagerConflictActions.Cancel,
+        ]),
+      ),
+      metadata,
+    );
+
+    onResolve?.(resolvedItems, destinationFolder);
+    closeConflictResolution();
+  }, [
+    closeConflictResolution,
+    conflictingFiles,
+    onResolve,
+    pendingOperation,
+    resolveConflictsWithDecisions,
+  ]);
+
   const handleDecideForEach = useCallback(
     (decisions: FileConflictDecision[]) => {
       if (!pendingOperation) return;
@@ -269,6 +295,7 @@ export const useConflictResolution = ({
 
     handleReplaceAll,
     handleDuplicateAll,
+    handleCancelAll,
     handleDecideForEach,
   };
 };

src/components/FileManager/hooks/use-file-clipboard.ts

@@ -54,6 +54,7 @@ export const useFileClipboard = ({
     openConflictResolution,
     handleReplaceAll: baseHandleReplaceAll,
     handleDuplicateAll: baseHandleDuplicateAll,
+    handleCancelAll: baseHandleCancelAll,
     handleDecideForEach: baseHandleDecideForEach,
   } = useConflictResolution({
     getDestinationFiles,
@@ -153,6 +154,11 @@ export const useFileClipboard = ({
     clearState();
   }, [baseHandleDuplicateAll, clearState]);
 
+  const handleConflictCancel = useCallback(() => {
+    baseHandleCancelAll();
+    clearState();
+  }, [baseHandleCancelAll, clearState]);
+
   const handleConflictDecideForEach = useCallback(
     (decisions: FileConflictDecision[]) => {
       baseHandleDecideForEach(decisions);
@@ -245,6 +251,7 @@ export const useFileClipboard = ({
     openConflictResolution,
     closeConflictResolution,
     handleConflictReplace,
+    handleConflictCancel,
     handleConflictDuplicate,
     handleConflictDecideForEach,
     sourceFolder,

src/components/FileManager/hooks/use-file-upload.tsx

@@ -114,6 +114,7 @@ export const useFileUpload = ({
     openConflictResolution,
     handleReplaceAll: baseHandleReplaceAll,
     handleDuplicateAll: baseHandleDuplicateAll,
+    handleCancelAll: baseHandleCancelAll,
     handleDecideForEach: baseHandleDecideForEach,
   } = useConflictResolution({
     getDestinationFiles: () => existingFilesRef.current,
@@ -321,6 +322,11 @@ export const useFileUpload = ({
     clearUploadState();
   }, [baseHandleDuplicateAll, clearUploadState]);
 
+  const handleConflictCancel = useCallback(() => {
+    baseHandleCancelAll();
+    clearUploadState();
+  }, [baseHandleCancelAll, clearUploadState]);
+
   const handleConflictDecideForEach = useCallback(
     (decisions: FileConflictDecision[]) => {
       baseHandleDecideForEach(decisions);
@@ -595,6 +601,7 @@ export const useFileUpload = ({
     closeUploadConflictResolution: handleCloseConflictResolution,
     handleUploadConflictReplace: handleConflictReplace,
     handleUploadConflictDuplicate: handleConflictDuplicate,
+    handleUploadConflictCancel: handleConflictCancel,
     handleUploadConflictDecideForEach: handleConflictDecideForEach,
   };
 };