beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Moved removeFromCollection logic from collectionOptions to collectionServices

Browse source
This commit is contained in:
Ananddubey01 2023-02-02 21:15:29 +05:30
parent 6d780f6b92
commit aa427b7ac7
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/Collections/CollectionOptions/index.tsx
View file

@ -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();
};

7
src/services/collectionService.ts
View file

@ -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(