Skip to content

Fix blocked navigation between pages on submission form #3484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lmcnulty wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Fix blocked navigation between pages on submission form #3484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions site/gatsby-site/src/components/forms/SubmissionWizard/StepOne.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ const StepOne = (props) => {
submissionReset={props.submissionReset}
urlFromQueryString={props.urlFromQueryString}
setSavingInLocalStorage={props.setSavingInLocalStorage}
returning={props.returning}
/>
</Formik>
</StepContainer>
Expand All @@ -116,6 +117,7 @@ const FormDetails = ({
submissionReset,
urlFromQueryString,
setSavingInLocalStorage,
returning,
}) => {
const { t } = useTranslation(['submit']);

Expand Down Expand Up @@ -172,6 +174,16 @@ const FormDetails = ({
}
}, [urlFromQueryString]);

useEffect(() => {
if (returning) {
validateForm().then((invalidFields) => {
Object.keys(invalidFields).map((key) => {
setFieldTouched(key, true);
});
});
}
}, [returning]);

const fetchNews = async (url) => {
await parseNewsUrl(url);
Object.keys(errors).map((key) => {
Expand Down
12 changes: 12 additions & 0 deletions site/gatsby-site/src/components/forms/SubmissionWizard/StepThree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ const StepThree = (props) => {
setSavingInLocalStorage={props.setSavingInLocalStorage}
submissionComplete={props.submissionComplete}
submissionReset={props.submissionReset}
returning={props.returning}
/>
</Formik>
</StepContainer>
Expand All @@ -216,6 +217,7 @@ const FormDetails = ({
submissionReset,
entityNames,
setSavingInLocalStorage,
returning,
}) => {
const { t } = useTranslation(['submit']);

Expand Down Expand Up @@ -293,6 +295,16 @@ const FormDetails = ({
saveInLocalStorage(values);
}, [values]);

useEffect(() => {
if (returning) {
validateForm().then((invalidFields) => {
Object.keys(invalidFields).map((key) => {
setFieldTouched(key, true);
});
});
}
}, [returning]);

return (
<>
<Form>
Expand Down
12 changes: 12 additions & 0 deletions site/gatsby-site/src/components/forms/SubmissionWizard/StepTwo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const StepTwo = (props) => {
setSavingInLocalStorage={props.setSavingInLocalStorage}
submissionComplete={props.submissionComplete}
submissionReset={props.submissionReset}
returning={props.returning}
/>
</Formik>
</StepContainer>
Expand All @@ -81,6 +82,7 @@ const FormDetails = ({
submissionComplete,
submissionReset,
setSavingInLocalStorage,
returning,
}) => {
const { t } = useTranslation(['submit']);

Expand Down Expand Up @@ -137,6 +139,16 @@ const FormDetails = ({
saveInLocalStorage(values);
}, [values]);

useEffect(() => {
if (returning) {
validateForm().then((invalidFields) => {
Object.keys(invalidFields).map((key) => {
setFieldTouched(key, true);
});
});
}
}, [returning]);

const isUserDetailsComplete = user && user.first_name && user.last_name;

return (
Expand Down
4 changes: 3 additions & 1 deletion site/gatsby-site/src/components/forms/SubmitForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ const SubmitForm = () => {
scrollToTop={() => {
setTimeout(() => {
// This is needed to make it work in Firefox
submissionRef.current.scrollIntoView();
if (submissionRef.current) {
submissionRef.current.scrollIntoView();
}
}, 0);
}}
clearForm={clearForm}
Expand Down
13 changes: 12 additions & 1 deletion site/gatsby-site/src/components/submissions/SubmissionWizard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ const SubmissionWizard = ({

const [parsingNews, setParsingNews] = useState(false);

const [returning, setReturning] = useState(false);

const handleNextStep = async (newData, final = false) => {
setSubmissionFailed(false);
setSubmissionComplete(false);
Expand All @@ -55,6 +57,7 @@ const SubmissionWizard = ({
};

const handlePreviousStep = (newData) => {
setReturning(true);
setData((prev) => ({ ...prev, ...newData }));
scrollToTop();
setCurrentStep((prev) => prev - 1);
Expand Down Expand Up @@ -168,7 +171,12 @@ const SubmissionWizard = ({
Object.keys(invalidFields).map((key) => {
setFieldTouched(key, true);
});
setIsSubmitting(false);

if (last) {
setIsSubmitting(false);
} else {
submitForm(values, last);
}
} else {
submitForm(values, last);
}
Expand All @@ -181,6 +189,7 @@ const SubmissionWizard = ({
next={handleNextStep}
data={data}
name={t('Step 1 - main information')}
returning={returning}
parseNewsUrl={parseNewsUrl}
parsingNews={parsingNews}
validateAndSubmitForm={validateAndSubmitForm}
Expand All @@ -196,6 +205,7 @@ const SubmissionWizard = ({
previous={handlePreviousStep}
data={data}
name={t('Step 2 - additional information')}
returning={returning}
validateAndSubmitForm={validateAndSubmitForm}
submissionFailed={submissionFailed}
submissionComplete={submissionComplete}
Expand All @@ -208,6 +218,7 @@ const SubmissionWizard = ({
previous={handlePreviousStep}
data={data}
name={t('Step 3 - Tell us more')}
returning={returning}
validateAndSubmitForm={validateAndSubmitForm}
submissionFailed={submissionFailed}
submissionComplete={submissionComplete}
Expand Down