feat: improved conflict resolution when uploading/copying/moving files (#5765)

frontend/src/types/file.d.ts

@@ -52,6 +52,8 @@ type DownloadFormat =
 interface ClipItem {
   from: string;
   name: string;
+  size?: number;
+  modified?: string;
 }
 
 interface BreadCrumb {
@@ -59,6 +61,19 @@ interface BreadCrumb {
   url: string;
 }
 
+interface ConflictingItem {
+  lastModified: number | string | undefined;
+  size: number | undefined;
+}
+
+interface ConflictingResource {
+  index: number;
+  name: string;
+  origin: ConflictingItem;
+  dest: ConflictingItem;
+  checked: Array<"origin" | "dest">;
+}
+  
 interface CsvData {
   headers: string[];
   rows: string[][];

frontend/src/types/upload.d.ts

@@ -17,6 +17,7 @@ interface UploadEntry {
   isDir: boolean;
   fullPath?: string;
   file?: File;
+  overwrite?: boolean;
 }
 
 type UploadList = UploadEntry[];