Handle filename conflicts in trash folder

src/Dashboard/Dashboard.ts

@@ -347,6 +347,12 @@ function putBackDocsHandler() {
     const targetFolder = state.getFolderPathByNames(folderPathNames);
     if (targetFolder) {
       entry = FileSystemTools.removeMetadata(entry, ['removed_on', 'recover_folder']);
+      const dateTimePattern = / - \d{1,2}\/\d{1,2}\/\d{4}, \d{1,2}:\d{2}:\d{2} [APMapm]{2}$/;
+
+      // Check if the filename ends with the date time pattern
+      if (dateTimePattern.test(entry.name)) {
+        entry.name = entry.name.replace(dateTimePattern, '');
+      }
       moveToFolder([entry], parentFolder, targetFolder);
     }    
   }
@@ -804,6 +810,10 @@ function createHandleDrop(currentFolder: IFolder, destinationFolder: IFolder) {
 function moveToFolder(entries: IEntry[], parentFolder: IFolder, newFolder: IFolder) {
   const errorMessages = [];
   entries.forEach((entry) => {
+    // Handle name conflicts for trash folder
+    if (newFolder.type === 'trash' && newFolder.children.some((e) => e.name === entry.name)) {
+      entry.name = trashFNConflictHandler(entry.name);
+    }
     const response = FileSystemTools.canMoveEntry(entry, parentFolder, newFolder);
     if (!response.succeeded) errorMessages.push(response.error);
     else FileSystemTools.moveEntry(entry, parentFolder, newFolder);
@@ -815,6 +825,11 @@ function moveToFolder(entries: IEntry[], parentFolder: IFolder, newFolder: IFold
   updateDashboard();
 }
 
+function trashFNConflictHandler(filename: string): string {
+  const datetime = new Date().toLocaleString();
+  return filename + ' - ' + datetime;
+}
+
 /**
  * Opens Move-To menu modal window with UI for moving selected entries to a new folder.
  */