show empty trash button only when trash has files
This commit is contained in:
parent
d57f829adc
commit
9d6ae6afea
|
@ -87,6 +87,7 @@ import {
|
||||||
getLocalTrash,
|
getLocalTrash,
|
||||||
getTrashedFiles,
|
getTrashedFiles,
|
||||||
syncTrash,
|
syncTrash,
|
||||||
|
Trash,
|
||||||
} from 'services/trashService';
|
} from 'services/trashService';
|
||||||
import DeleteBtn from 'components/DeleteBtn';
|
import DeleteBtn from 'components/DeleteBtn';
|
||||||
|
|
||||||
|
@ -200,6 +201,7 @@ export default function Gallery() {
|
||||||
useState(false);
|
useState(false);
|
||||||
|
|
||||||
const [isFavCollectionActive, setIsFavCollectionActive] = useState(false);
|
const [isFavCollectionActive, setIsFavCollectionActive] = useState(false);
|
||||||
|
const [trash, setTrash] = useState<Trash>([]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const key = getKey(SESSION_KEYS.ENCRYPTION_KEY);
|
const key = getKey(SESSION_KEYS.ENCRYPTION_KEY);
|
||||||
|
@ -221,6 +223,7 @@ export default function Gallery() {
|
||||||
const trashedFile = getTrashedFiles(trash);
|
const trashedFile = getTrashedFiles(trash);
|
||||||
setFiles([...files, ...trashedFile]);
|
setFiles([...files, ...trashedFile]);
|
||||||
setCollections(collections);
|
setCollections(collections);
|
||||||
|
setTrash(trash);
|
||||||
await setDerivativeState(collections, files);
|
await setDerivativeState(collections, files);
|
||||||
await checkSubscriptionPurchase(
|
await checkSubscriptionPurchase(
|
||||||
setDialogMessage,
|
setDialogMessage,
|
||||||
|
@ -290,7 +293,8 @@ export default function Gallery() {
|
||||||
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, files);
|
const trash = await syncTrash(collections, setFiles, files);
|
||||||
|
setTrash(trash);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
switch (e.message) {
|
switch (e.message) {
|
||||||
case ServerErrorCodes.SESSION_EXPIRED:
|
case ServerErrorCodes.SESSION_EXPIRED:
|
||||||
|
@ -506,6 +510,9 @@ export default function Gallery() {
|
||||||
loadingBar.current?.continuousStart();
|
loadingBar.current?.continuousStart();
|
||||||
try {
|
try {
|
||||||
await emptyTrash();
|
await emptyTrash();
|
||||||
|
if (selected.collectionID === TRASH_SECTION) {
|
||||||
|
clearSelection();
|
||||||
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setDialogMessage({
|
setDialogMessage({
|
||||||
title: constants.ERROR,
|
title: constants.ERROR,
|
||||||
|
@ -682,7 +689,7 @@ export default function Gallery() {
|
||||||
isFavoriteCollection={isFavCollectionActive}
|
isFavoriteCollection={isFavCollectionActive}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{activeCollection === TRASH_SECTION && (
|
{activeCollection === TRASH_SECTION && trash?.length > 0 && (
|
||||||
<DeleteBtn onClick={emptyTrashHandler} />
|
<DeleteBtn onClick={emptyTrashHandler} />
|
||||||
)}
|
)}
|
||||||
</FullScreenDropZone>
|
</FullScreenDropZone>
|
||||||
|
|
|
@ -72,6 +72,7 @@ export async function syncTrash(
|
||||||
trash
|
trash
|
||||||
);
|
);
|
||||||
cleanTrashCollections(updatedTrash);
|
cleanTrashCollections(updatedTrash);
|
||||||
|
return updatedTrash;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const updateTrash = async (
|
export const updateTrash = async (
|
||||||
|
|
Loading…
Reference in a new issue