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

fix error handling in share dialog

Browse source
This commit is contained in:
Abhinav 2024-01-31 11:26:43 +05:30
parent 622b203026
commit 826679b183
2 changed files with 39 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipant.tsx
View file

@ -40,29 +40,31 @@ export default function AddParticipant({
);
const collectionShare: AddParticipantFormProps['callback'] = async (
emails,
setFieldError,
resetForm
emails
) => {
try {
for (const email of emails) {
if (email === user.email) {
setFieldError(t('SHARE_WITH_SELF'));
break;
} else if (
collection?.sharees?.find((value) => value.email === email)
) {
setFieldError(t('ALREADY_SHARED', { email }));
break;
} else {
await shareCollection(collection, email, type);
await syncWithRemote(false, true);
}
if (emails.length === 1) {
if (emails[0] === user.email) {
throw new Error(t('SHARE_WITH_SELF'));
} else if (
collection?.sharees?.find((value) => value.email === emails[0])
) {
throw new Error(t('ALREADY_SHARED', { email: emails[0] }));
}
}
for (const email of emails) {
if (
email === user.email ||
collection?.sharees?.find((value) => value.email === email)
) {
continue;
}
try {
await shareCollection(collection, email, type);
await syncWithRemote(false, true);
} catch (e) {
const errorMessage = handleSharingErrors(e);
throw new Error(errorMessage);
}
resetForm();
} catch (e) {
const errorMessage = handleSharingErrors(e);
setFieldError(errorMessage);
}
};

43
apps/photos/src/components/Collections/CollectionShare/emailShare/AddParticipantForm.tsx
View file

@ -1,5 +1,5 @@
import React, { useMemo, useState } from 'react';
import { Formik, FormikHelpers, FormikState } from 'formik';
import { Formik, FormikHelpers } from 'formik';
import * as Yup from 'yup';
import SubmitButton from '@ente/shared/components/SubmitButton';
import TextField from '@mui/material/TextField';
@ -18,11 +18,7 @@ interface formValues {
selectedOptions: string[];
}
export interface AddParticipantFormProps {
callback: (
emails: string[],
setFieldError: (errorMessage: string) => void,
resetForm: (nextState?: Partial<FormikState<formValues>>) => void
) => Promise<void>;
callback: (emails: string[]) => Promise<void>;
fieldType: 'text' | 'email' | 'password';
placeholder: string;
buttonText: string;
@ -43,7 +39,6 @@ export interface AddParticipantFormProps {
export default function AddParticipantForm(props: AddParticipantFormProps) {
const { submitButtonProps } = props;
const { sx: buttonSx, ...restSubmitButtonProps } = submitButtonProps ?? {};
const [disableInput, setDisableInput] = useState(false);
const [loading, SetLoading] = useState(false);
@ -51,26 +46,20 @@ export default function AddParticipantForm(props: AddParticipantFormProps) {
values: formValues,
{ setFieldError, resetForm }: FormikHelpers<formValues>
) => {
SetLoading(true);
if (values.inputValue !== '') {
await props.callback(
[values.inputValue],
(message) => setFieldError('inputValue', message),
resetForm
);
} else if (values.selectedOptions.length !== 0) {
await props.callback(
values.selectedOptions,
(message) => setFieldError('inputValue', message),
resetForm
);
try {
SetLoading(true);
if (values.inputValue !== '') {
await props.callback([values.inputValue]);
} else if (values.selectedOptions.length !== 0) {
await props.callback(values.selectedOptions);
}
SetLoading(false);
props.onClose();
resetForm();
} catch (e) {
setFieldError('inputValue', e?.message);
SetLoading(false);
}
setDisableInput(false);
SetLoading(false);
props.onClose();
};
const validationSchema = useMemo(() => {
@ -129,7 +118,7 @@ export default function AddParticipantForm(props: AddParticipantFormProps) {
error={Boolean(errors.inputValue)}
helperText={errors.inputValue}
value={values.inputValue}
disabled={loading || disableInput}
disabled={loading}
autoFocus={!props.disableAutoFocus}
autoComplete={props.autoComplete}
/>