diff --git a/src/components/Collections/CollectionOptions/index.tsx b/src/components/Collections/CollectionOptions/index.tsx index 42241b4c7..a239e27db 100644 --- a/src/components/Collections/CollectionOptions/index.tsx +++ b/src/components/Collections/CollectionOptions/index.tsx @@ -22,7 +22,6 @@ import { OnlyDownloadCollectionOption } from './OnlyDownloadCollectionOption'; import { QuickOptions } from './QuickOptions'; import MoreHoriz from '@mui/icons-material/MoreHoriz'; import { HorizontalFlex } from 'components/Container'; -import { getLocalFiles } from 'services/fileService'; interface CollectionOptionsProps { setCollectionNamerAttributes: SetCollectionNamerAttributes; @@ -148,14 +147,6 @@ const CollectionOptions = (props: CollectionOptionsProps) => { }; const deleteCollectionButKeepFiles = async () => { - const allFiles = await getLocalFiles(); - const collectionFiles = allFiles.filter((file) => { - return file.collectionID === activeCollection.id; - }); - await CollectionAPI.removeFromCollection( - activeCollection.id, - collectionFiles - ); await CollectionAPI.deleteCollection(activeCollection.id, true); redirectToAll(); }; diff --git a/src/services/collectionService.ts b/src/services/collectionService.ts index f00e0c34a..d9c3c9bc2 100644 --- a/src/services/collectionService.ts +++ b/src/services/collectionService.ts @@ -532,6 +532,13 @@ export const deleteCollection = async ( keepFiles: boolean ) => { try { + if (keepFiles) { + const allFiles = await getLocalFiles(); + const collectionFiles = allFiles.filter((file) => { + return file.collectionID === collectionID; + }); + await removeFromCollection(collectionID, collectionFiles); + } const token = getToken(); await HTTPService.delete(