move getUser to top caller and add null check there itself

This commit is contained in:
Abhinav 2022-07-26 14:02:33 +05:30
parent d9ab97cc34
commit f11c1d6e51
2 changed files with 10 additions and 8 deletions

View file

@ -99,6 +99,8 @@ import { NotificationAttributes } from 'types/Notification';
import { ITEM_TYPE, TimeStampListItem } from 'components/PhotoList';
import UploadInputs from 'components/UploadSelectorInputs';
import useFileInput from 'hooks/useFileInput';
import { User } from 'types/user';
import { getData, LS_KEYS } from 'utils/storage/localStorage';
export const DeadCenter = styled('div')`
flex: 1;
@ -260,7 +262,11 @@ export default function Gallery() {
}, []);
useEffect(() => {
setDerivativeState(collections, files);
const user: User = getData(LS_KEYS.USER);
if (!user || !files || !collections) {
return;
}
setDerivativeState(user, collections, files);
}, [collections, files]);
useEffect(
@ -375,18 +381,17 @@ export default function Gallery() {
};
const setDerivativeState = async (
user: User,
collections: Collection[],
files: EnteFile[]
) => {
if (!collections || !files) {
return;
}
const favItemIds = await getFavItemIds(files);
setFavItemIds(favItemIds);
const archivedCollections = getArchivedCollections(collections);
setArchivedCollections(archivedCollections);
const collectionSummaries = getCollectionSummaries(
user,
collections,
files,
archivedCollections

View file

@ -770,14 +770,11 @@ function compareCollectionsLatestFile(first: EnteFile, second: EnteFile) {
}
export function getCollectionSummaries(
user: User,
collections: Collection[],
files: EnteFile[],
archivedCollections: Set<number>
): CollectionSummaries {
const user: User = getData(LS_KEYS.USER);
if (!user) {
return;
}
const collectionSummaries: CollectionSummaries = new Map();
const collectionLatestFiles = getCollectionLatestFiles(
files,