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

added try catch block to dropzone Callback and setErrorCode on errors

Browse source
This commit is contained in:
Abhinav-grd 2021-02-02 18:11:22 +05:30
parent ee663bc72c
commit 187d781726
2 changed files with 40 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/pages/gallery/components/CollectionDropZone.tsx
View file

@ -31,26 +31,30 @@ export const DropDiv = styled.div`
transition: border 0.24s ease-in-out;
`;
function CollectionDropZone({
children,
closeModal,
showModal,
refetchData,
collectionLatestFile,
setProgressView,
progressBarProps
}) {
function CollectionDropZone(props) {
const { children,
closeModal,
showModal,
refetchData,
collectionLatestFile,
setProgressView,
progressBarProps, setErrorCode } = props
const upload = async (acceptedFiles) => {
const token = getToken();
closeModal();
progressBarProps.setPercentComplete(0);
setProgressView(true);
try {
const token = getToken();
closeModal();
progressBarProps.setPercentComplete(0);
setProgressView(true);
await UploadService.uploadFiles(acceptedFiles, collectionLatestFile, token, progressBarProps);
refetchData();
setProgressView(false);
await UploadService.uploadFiles(acceptedFiles, collectionLatestFile, token, progressBarProps);
refetchData();
} catch (err) {
if (err.response)
setErrorCode(err.response.status);
}
finally {
setProgressView(false);
}
}
return (
<Dropzone

30
src/pages/gallery/components/CreateCollection.tsx
View file

@ -7,7 +7,7 @@ import { getToken } from 'utils/common/key';
export default function CreateCollection(props) {
const { acceptedFiles, setProgressView, progressBarProps, refetchData, modalView, closeModal, closeUploadModal } = props;
const { acceptedFiles, setProgressView, progressBarProps, refetchData, modalView, closeModal, closeUploadModal, setErrorCode } = props;
const [albumName, setAlbumName] = useState("");
const handleChange = (event) => { setAlbumName(event.target.value); }
@ -27,22 +27,28 @@ export default function CreateCollection(props) {
setAlbumName(commonPathPrefix);
}, [acceptedFiles]);
const handleSubmit = async (event) => {
const token = getToken();
event.preventDefault();
try {
const token = getToken();
event.preventDefault();
closeModal();
closeUploadModal();
closeModal();
closeUploadModal();
const collection = await createAlbum(albumName);
const collection = await createAlbum(albumName);
const collectionLatestFile: collectionLatestFile = { collection, file: null }
const collectionLatestFile: collectionLatestFile = { collection, file: null }
progressBarProps.setPercentComplete(0);
setProgressView(true);
progressBarProps.setPercentComplete(0);
setProgressView(true);
await UploadService.uploadFiles(acceptedFiles, collectionLatestFile, token, progressBarProps);
refetchData();
setProgressView(false);
await UploadService.uploadFiles(acceptedFiles, collectionLatestFile, token, progressBarProps);
refetchData();
setProgressView(false);
}
catch (err) {
if (err.response)
setErrorCode(err.response.status);
}
}
return (
<Modal