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

set archived to quickly show archived file before server sync

Browse source
This commit is contained in:
abhinav-grd 2021-09-22 13:51:06 +05:30
parent cbb880b42d
commit 31632d779f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/PhotoFrame.tsx
View file

@ -150,6 +150,7 @@ interface Props {
search: Search; search: Search;
setSearchStats: setSearchStats; setSearchStats: setSearchStats;
deleted?: number[]; deleted?: number[];
archived?: number[];
setDialogMessage: SetDialogMessage; setDialogMessage: SetDialogMessage;
activeCollection: number; activeCollection: number;
isSharedCollection: boolean; isSharedCollection: boolean;
@ -169,6 +170,7 @@ const PhotoFrame = ({
search, search,
setSearchStats, setSearchStats,
deleted, deleted,
archived,
setDialogMessage, setDialogMessage,
activeCollection, activeCollection,
isSharedCollection, isSharedCollection,
@ -406,7 +408,10 @@ const PhotoFrame = ({
) { ) {
return false; return false;
} }
if (activeCollection === 0 && fileIsArchived(item)) { if (
activeCollection === 0 &&
(fileIsArchived(item) || archived.includes(item.id))
) {
return false; return false;
} }
if (activeCollection === ARCHIVE_SECTION && !fileIsArchived(item)) { if (activeCollection === ARCHIVE_SECTION && !fileIsArchived(item)) {

4
src/pages/gallery/index.tsx
View file

@ -175,6 +175,7 @@ export default function Gallery() {
const syncInProgress = useRef(true); const syncInProgress = useRef(true);
const resync = useRef(false); const resync = useRef(false);
const [deleted, setDeleted] = useState<number[]>([]); const [deleted, setDeleted] = useState<number[]>([]);
const [archived, setArchived] = useState<number[]>([]);
const appContext = useContext(AppContext); const appContext = useContext(AppContext);
const [collectionFilesCount, setCollectionFilesCount] = const [collectionFilesCount, setCollectionFilesCount] =
useState<Map<number, number>>(); useState<Map<number, number>>();
@ -374,7 +375,7 @@ export default function Gallery() {
try { try {
const archivedFiles = await archiveFiles(files, selected); const archivedFiles = await archiveFiles(files, selected);
await updateMagicMetadata(archivedFiles); await updateMagicMetadata(archivedFiles);
setDeleted([...deleted, ...archivedFiles.map((file) => file.id)]); setArchived([...archived, ...archivedFiles.map((file) => file.id)]);
} catch (e) { } catch (e) {
console.log(e); console.log(e);
switch (e.status?.toString()) { switch (e.status?.toString()) {
@ -594,6 +595,7 @@ export default function Gallery() {
search={search} search={search}
setSearchStats={setSearchStats} setSearchStats={setSearchStats}
deleted={deleted} deleted={deleted}
archived={archived}
setDialogMessage={setDialogMessage} setDialogMessage={setDialogMessage}
activeCollection={activeCollection} activeCollection={activeCollection}
isSharedCollection={isSharedCollectionActive} isSharedCollection={isSharedCollectionActive}