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

abstracted fetch calls to load data function

Browse source
This commit is contained in:
Abhinav-grd 2021-02-05 19:14:47 +05:30
parent f3d15342e7
commit 2e7f0e520a
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,6 +117,10 @@ export default function Gallery(props) {
const [progress, setProgress] = useState(0)
useEffect(() => {
const key = getKey(SESSION_KEYS.ENCRYPTION_KEY);
if (!key) {
router.push('/');
}
const main = async () => {
setLoading(true);
const data = await localFiles();
@ -124,37 +128,31 @@ export default function Gallery(props) {
setData(data);
setCollections(collections);
setLoading(false);
setProgress(80);
await loadData();
setProgress(100);
};
main();
props.setUploadButtonView(true);
}, []);
useEffect(() => {
const key = getKey(SESSION_KEYS.ENCRYPTION_KEY);
const loadData = async () => {
const token = getToken();
if (!key || !token) {
router.push('/');
const encryptionKey = await getActualKey();
const updatedCollections = await fetchUpdatedCollections(token, encryptionKey);
const data = await fetchData(token, updatedCollections);
const collections = await getLocalCollections();
const collectionLatestFile = await getCollectionLatestFile(collections, token);
const favItemIds = await getFavItemIds(data);
if (updatedCollections.length > 0) {
setCollections(collections);
setData(data);
}
const main = async () => {
setProgress(80);
const encryptionKey = await getActualKey();
const updatedCollections = await fetchUpdatedCollections(token, encryptionKey);
const data = await fetchData(token, updatedCollections);
const collections = await getLocalCollections();
const collectionLatestFile = await getCollectionLatestFile(collections, token);
const favItemIds = await getFavItemIds(data);
if (updatedCollections.length > 0) {
setCollections(collections);
setData(data);
}
setCollectionLatestFile(collectionLatestFile);
setFavItemIds(favItemIds);
setProgress(100);
};
main();
setCollectionLatestFile(collectionLatestFile);
setFavItemIds(favItemIds);
props.setUploadButtonView(true);
}, [reload]);
}
if (!data || loading) {
return (
<div className='text-center'>
@ -324,8 +322,8 @@ export default function Gallery(props) {
closeUploadModal={props.closeUploadModal}
showUploadModal={props.showUploadModal}
collectionLatestFile={collectionLatestFile}
refetchData={() => setReload(Math.random())}
refetchData={loadData}
/>
{filteredData.length ? (
<Container>