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

updated upload component to call nextModal instead on collectionCreateModal when no Colletions present

Browse source
This commit is contained in:
Abhinav-grd 2021-03-22 11:22:05 +05:30
parent 08b71b04d2
commit 241afa3412
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/pages/gallery/components/Upload.tsx
View file

@ -50,9 +50,9 @@ export default function Upload(props: Props) {
props.collectionAndItsLatestFile && props.collectionAndItsLatestFile &&
props.collectionAndItsLatestFile.length == 0 props.collectionAndItsLatestFile.length == 0
) { ) {
setCreateCollectionView(true); props.closeCollectionSelector();
nextModal();
} }
setFileAnalysisResult(analyseUploadFiles());
init(); init();
}, [props.collectionSelectorView]); }, [props.collectionSelectorView]);
@ -64,7 +64,7 @@ export default function Upload(props: Props) {
function analyseUploadFiles() { function analyseUploadFiles() {
if (props.acceptedFiles.length == 0) { if (props.acceptedFiles.length == 0) {
return {} as AnalysisResult; return null;
} }
const paths: string[] = props.acceptedFiles.map((file) => file.path); const paths: string[] = props.acceptedFiles.map((file) => file.path);
paths.sort(); paths.sort();
@ -171,10 +171,12 @@ export default function Upload(props: Props) {
} }
}; };
const nextModal = () => { const nextModal = () => {
let fileAnalysisResult = analyseUploadFiles();
setTriggerFocus((prev) => !prev); setTriggerFocus((prev) => !prev);
fileAnalysisResult.multipleFolders fileAnalysisResult.multipleFolders
? setChoiceModalView(true) ? setChoiceModalView(true)
: setCreateCollectionView(true); : setCreateCollectionView(true);
setFileAnalysisResult(fileAnalysisResult);
}; };
return ( return (
<> <>