updated files state to include trash files
This commit is contained in:
parent
e28154e5b1
commit
ad173f7481
|
@ -76,6 +76,11 @@ import {
|
||||||
getSelectedCollection,
|
getSelectedCollection,
|
||||||
} from 'utils/collection';
|
} from 'utils/collection';
|
||||||
import { logError } from 'utils/sentry';
|
import { logError } from 'utils/sentry';
|
||||||
|
import {
|
||||||
|
getLocalTrash,
|
||||||
|
getTrashedFiles,
|
||||||
|
syncTrash,
|
||||||
|
} from 'services/trashService';
|
||||||
|
|
||||||
export const DeadCenter = styled.div`
|
export const DeadCenter = styled.div`
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
@ -201,7 +206,9 @@ export default function Gallery() {
|
||||||
setIsFirstLogin(false);
|
setIsFirstLogin(false);
|
||||||
const files = await getLocalFiles();
|
const files = await getLocalFiles();
|
||||||
const collections = await getLocalCollections();
|
const collections = await getLocalCollections();
|
||||||
setFiles(files);
|
const trash = await getLocalTrash();
|
||||||
|
const trashedFile = getTrashedFiles(trash);
|
||||||
|
setFiles([...files, ...trashedFile]);
|
||||||
setCollections(collections);
|
setCollections(collections);
|
||||||
await setDerivativeState(collections, files);
|
await setDerivativeState(collections, files);
|
||||||
await checkSubscriptionPurchase(
|
await checkSubscriptionPurchase(
|
||||||
|
@ -257,8 +264,9 @@ export default function Gallery() {
|
||||||
await billingService.syncSubscription();
|
await billingService.syncSubscription();
|
||||||
const collections = await syncCollections();
|
const collections = await syncCollections();
|
||||||
setCollections(collections);
|
setCollections(collections);
|
||||||
const { files } = await syncFiles(collections, setFiles);
|
const files = await syncFiles(collections, setFiles);
|
||||||
await setDerivativeState(collections, files);
|
await setDerivativeState(collections, files);
|
||||||
|
await syncTrash(collections, setFiles);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
switch (e.message) {
|
switch (e.message) {
|
||||||
case ServerErrorCodes.SESSION_EXPIRED:
|
case ServerErrorCodes.SESSION_EXPIRED:
|
||||||
|
@ -416,6 +424,7 @@ export default function Gallery() {
|
||||||
const selectedFiles = getSelectedFiles(selected, files);
|
const selectedFiles = getSelectedFiles(selected, files);
|
||||||
await trashFiles(selectedFiles);
|
await trashFiles(selectedFiles);
|
||||||
setDeleted([...deleted, ...selectedFiles.map((file) => file.id)]);
|
setDeleted([...deleted, ...selectedFiles.map((file) => file.id)]);
|
||||||
|
clearSelection();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
switch (e.status?.toString()) {
|
switch (e.status?.toString()) {
|
||||||
case ServerErrorCodes.FORBIDDEN:
|
case ServerErrorCodes.FORBIDDEN:
|
||||||
|
|
Loading…
Reference in a new issue