upates delete file to trash file

src/pages/gallery/index.tsx

@@ -10,10 +10,10 @@ import { clearKeys, getKey, SESSION_KEYS } from 'utils/storage/sessionStorage';
 import {
     File,
     getLocalFiles,
-    deleteFiles,
     syncFiles,
     updateMagicMetadata,
     VISIBILITY_STATE,
+    trashFiles,
 } from 'services/fileService';
 import styled from 'styled-components';
 import LoadingBar from 'react-top-loading-bar';
@@ -49,7 +49,7 @@ import { LoadingOverlay } from 'components/LoadingOverlay';
 import PhotoFrame from 'components/PhotoFrame';
 import {
     changeFilesVisibility,
-    getSelectedFileIds,
+    getSelectedFiles,
     sortFilesIntoCollections,
 } from 'utils/file';
 import SearchBar, { DateValue } from 'components/SearchBar';
@@ -413,10 +413,9 @@ export default function Gallery() {
     const deleteFileHelper = async () => {
         loadingBar.current?.continuousStart();
         try {
-            const fileIds = getSelectedFileIds(selected);
+            const selectedFiles = getSelectedFiles(selected, files);
-            await deleteFiles(fileIds);
+            await trashFiles(selectedFiles);
-            setDeleted([...deleted, ...fileIds]);
+            setDeleted([...deleted, ...selectedFiles.map((file) => file.id)]);
-            clearSelection();
         } catch (e) {
             switch (e.status?.toString()) {
                 case ServerErrorCodes.FORBIDDEN:

src/services/fileService.ts

@@ -86,6 +86,14 @@ export const NEW_MAGIC_METADATA: MagicMetadata = {
     count: 0,
 };
 
+interface TrashRequest {
+    items: TrashRequestItems[];
+}
+
+interface TrashRequestItems {
+    fileID: number;
+    collectionID: number;
+}
 export const getLocalFiles = async () => {
     const files: Array<File> = (await localForage.getItem<File[]>(FILES)) || [];
     return files;
@@ -232,22 +240,23 @@ const removeDeletedCollectionFiles = async (
     return files;
 };
 
-export const deleteFiles = async (filesToDelete: number[]) => {
+export const trashFiles = async (filesToTrash: File[]) => {
     try {
         const token = getToken();
         if (!token) {
             return;
         }
-        await HTTPService.post(
+        const trashRequest: TrashRequest = {
-            `${ENDPOINT}/files/delete`,
+            items: filesToTrash.map((file) => ({
-            { fileIDs: filesToDelete },
+                fileID: file.id,
-            null,
+                collectionID: file.collectionID,
-            {
+            })),
-                'X-Auth-Token': token,
+        };
-            }
+        await HTTPService.post(`${ENDPOINT}/files/trash`, trashRequest, null, {
-        );
+            'X-Auth-Token': token,
+        });
     } catch (e) {
-        logError(e, 'delete failed');
+        logError(e, 'trash file failed');
         throw e;
     }
 };

src/utils/file/index.ts

@@ -54,7 +54,7 @@ export function sortFilesIntoCollections(files: File[]) {
     return collectionWiseFiles;
 }
 
-export function getSelectedFileIds(selectedFiles: SelectedState) {
+function getSelectedFileIds(selectedFiles: SelectedState) {
     const filesIDs: number[] = [];
     for (const [key, val] of Object.entries(selectedFiles)) {
         if (typeof val === 'boolean' && val) {