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

use suggested if available during first upload

Browse source
This commit is contained in:
Abhinav 2022-01-12 14:42:46 +05:30
parent 980f6439df
commit bed6a086a6
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/pages/gallery/CollectionSelector.tsx
View file

@ -50,7 +50,7 @@ function CollectionSelector({
CollectionAndItsLatestFile[] CollectionAndItsLatestFile[]
>([]); >([]);
useEffect(() => { useEffect(() => {
if (!attributes) { if (!attributes || !props.show) {
return; return;
} }
const user: User = getData(LS_KEYS.USER); const user: User = getData(LS_KEYS.USER);

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

@ -141,7 +141,7 @@ export default function Upload(props: Props) {
} }
} }
return { return {
suggestedCollectionName: commonPathPrefix, suggestedCollectionName: commonPathPrefix || null,
multipleFolders: firstFileFolder !== lastFileFolder, multipleFolders: firstFileFolder !== lastFileFolder,
}; };
} }
@ -279,14 +279,14 @@ export default function Upload(props: Props) {
collectionName collectionName
); );
} else { } else {
showCollectionCreateModal(analysisResult); showCollectionCreateModal();
} }
}; };
const showCollectionCreateModal = (analysisResult: AnalysisResult) => { const showCollectionCreateModal = () => {
props.setCollectionNamerAttributes({ props.setCollectionNamerAttributes({
title: constants.CREATE_COLLECTION, title: constants.CREATE_COLLECTION,
buttonText: constants.CREATE, buttonText: constants.CREATE,
autoFilledName: analysisResult?.suggestedCollectionName, autoFilledName: null,
callback: uploadToSingleNewCollection, callback: uploadToSingleNewCollection,
}); });
}; };
@ -296,7 +296,10 @@ export default function Upload(props: Props) {
isFirstUpload: boolean isFirstUpload: boolean
) => { ) => {
if (isFirstUpload) { if (isFirstUpload) {
uploadToSingleNewCollection(FIRST_ALBUM_NAME); const collectionName =
analysisResult.suggestedCollectionName ?? FIRST_ALBUM_NAME;
uploadToSingleNewCollection(collectionName);
} else { } else {
let showNextModal = () => {}; let showNextModal = () => {};
if (analysisResult.multipleFolders) { if (analysisResult.multipleFolders) {