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

Merge pull request #286 from ente-io/fix-multiple-folder-detection

Browse source 
fix multiple folder upload choices not showing up for sibling folder with no common ancestor
This commit is contained in:
Vishnu Mohandas 2022-01-08 14:10:27 +05:30 committed by GitHub
parent c53a94240b 585d3acf88
commit 944aeaa479
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -273,10 +273,14 @@ export default function Upload(props: Props) {
}; };
const uploadToSingleNewCollection = (collectionName: string) => { const uploadToSingleNewCollection = (collectionName: string) => {
uploadFilesToNewCollections( if (collectionName) {
UPLOAD_STRATEGY.SINGLE_COLLECTION, uploadFilesToNewCollections(
collectionName UPLOAD_STRATEGY.SINGLE_COLLECTION,
); collectionName
);
} else {
showCollectionCreateModal(analysisResult);
}
}; };
const showCollectionCreateModal = (analysisResult: AnalysisResult) => { const showCollectionCreateModal = (analysisResult: AnalysisResult) => {
props.setCollectionNamerAttributes({ props.setCollectionNamerAttributes({
@ -291,25 +295,23 @@ export default function Upload(props: Props) {
analysisResult: AnalysisResult, analysisResult: AnalysisResult,
isFirstUpload: boolean isFirstUpload: boolean
) => { ) => {
if (!analysisResult.suggestedCollectionName) { if (isFirstUpload) {
if (isFirstUpload) { uploadToSingleNewCollection(FIRST_ALBUM_NAME);
uploadToSingleNewCollection(FIRST_ALBUM_NAME);
} else {
props.setCollectionSelectorAttributes({
callback: uploadFilesToExistingCollection,
showNextModal: () =>
showCollectionCreateModal(analysisResult),
title: constants.UPLOAD_TO_COLLECTION,
});
}
} else { } else {
let showNextModal = () => {};
if (analysisResult.multipleFolders) { if (analysisResult.multipleFolders) {
setChoiceModalView(true); showNextModal = () => setChoiceModalView(true);
} else if (analysisResult.suggestedCollectionName) { } else {
uploadToSingleNewCollection( showNextModal = () =>
analysisResult.suggestedCollectionName uploadToSingleNewCollection(
); analysisResult.suggestedCollectionName
);
} }
props.setCollectionSelectorAttributes({
callback: uploadFilesToExistingCollection,
showNextModal,
title: constants.UPLOAD_TO_COLLECTION,
});
} }
}; };