Skip to content
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

LocationForm/ReviewForm cleanup #650

Merged
merged 3 commits into from
Dec 26, 2024
Merged

LocationForm/ReviewForm cleanup #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7cb688
Remove FormikStepper
wbazant Dec 26, 2024
3e35fda
Tidy up validation exports
wbazant Dec 26, 2024
ce5fd81
Refactor: remove ReviewPhotoStep
wbazant Dec 26, 2024
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
49 changes: 14 additions & 35 deletions src/components/form/FormLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
import { useSelector } from 'react-redux'
import styled from 'styled-components/macro'

import FormikAllSteps from './FormikAllSteps'
import { FormikStepper } from './FormikStepper'
import { useInvisibleRecaptcha } from './useInvisibleRecaptcha'
export const ProgressButtons = styled.div`
margin-top: 16px;
margin-bottom: 16px;
text-align: center;

const StyledForm = styled.div`
button {
width: 110px;

&:not(:last-child) {
margin-right: 12px;
}
}
`

export const StyledForm = styled.div`
box-sizing: border-box;
width: 100%;
padding: 0 10px;
Expand All @@ -28,33 +37,3 @@ const StyledForm = styled.div`
}
}
`

export const FormWrapper = ({
children,
onSubmit,
validate,
initialValues,
stepped = false,
renderButtons,
}) => {
const StepDisplay = stepped ? FormikStepper : FormikAllSteps
const isLoggedIn = useSelector((state) => !!state.auth.user)
const { Recaptcha, handlePresubmit: onPresubmit } =
useInvisibleRecaptcha(onSubmit)

return (
<StyledForm>
<StepDisplay
validateOnChange={false}
validate={validate}
initialValues={initialValues}
validateOnMount
onSubmit={isLoggedIn ? onSubmit : onPresubmit}
renderButtons={renderButtons}
>
{children}
{!isLoggedIn && <Recaptcha />}
</StepDisplay>
</StyledForm>
)
}
31 changes: 0 additions & 31 deletions src/components/form/FormikAllSteps.js
View file
Open in desktop

This file was deleted.

107 changes: 0 additions & 107 deletions src/components/form/FormikStepper.js
View file
Open in desktop

This file was deleted.

121 changes: 57 additions & 64 deletions src/components/form/LocationForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Map } from '@styled-icons/boxicons-solid'
import { useFormikContext } from 'formik'
import { Form, Formik, useFormikContext } from 'formik'
import { useTranslation } from 'react-i18next'
import { useDispatch, useSelector } from 'react-redux'
import { Link } from 'react-router-dom'
Expand All @@ -17,8 +17,6 @@ import {
formToReview,
isEmptyReview,
validateLocation,
validateLocationStep,
validateReviewStep,
} from '../../utils/form'
import { useAppHistory } from '../../utils/useAppHistory'
import { useIsDesktop } from '../../utils/useBreakpoint'
Expand All @@ -27,11 +25,11 @@ import Button from '../ui/Button'
import IconBesideText from '../ui/IconBesideText'
import Label from '../ui/Label'
import LoadingIndicator from '../ui/LoadingIndicator'
import { ProgressButtons, Step } from './FormikStepper'
import { Checkbox, Select, Textarea } from './FormikWrappers'
import { FormWrapper } from './FormLayout'
import { ReviewPhotoStep, ReviewStep } from './ReviewForm'
import { ProgressButtons, StyledForm } from './FormLayout'
import { ReviewStep } from './ReviewForm'
import TypesSelect from './TypesSelect'
import { useInvisibleRecaptcha } from './useInvisibleRecaptcha'

const StyledPositionFieldLink = styled(Link)`
color: ${({ theme }) => theme.orange};
Expand Down Expand Up @@ -151,7 +149,7 @@ const LocationStep = ({ lat, lng, isDesktop, editingId, isLoading }) => {
)
}

export const LocationForm = ({ editingId, initialValues, stepped }) => {
export const LocationForm = ({ editingId, initialValues }) => {
const reduxFormValues = useSelector((state) => state.location.form)
const mergedInitialValues = {
...INITIAL_LOCATION_VALUES,
Expand All @@ -173,33 +171,6 @@ export const LocationForm = ({ editingId, initialValues, stepped }) => {
location &&
!(position.lat === location.lat && position.lng === location.lng))

const formikSteps = [
<Step key={1} label="Step 1" validate={validateLocationStep}>
<LocationStep
key={1}
lat={position?.lat}
lng={position?.lng}
isDesktop={isDesktop}
editingId={editingId}
isLoading={isLoading}
/>
</Step>,
...(editingId
? []
: [
<Step
key={2}
label="Step 2"
validate={({ review }) => validateReviewStep(review)}
>
<ReviewStep />
</Step>,
<Step key={3} label="Step 3" validate={validateLocation}>
<ReviewPhotoStep />
</Step>,
]),
]

const handleSubmit = (
{ 'g-recaptcha-response': recaptcha, review, ...location },
formikProps,
Expand Down Expand Up @@ -244,36 +215,58 @@ export const LocationForm = ({ editingId, initialValues, stepped }) => {
}
}

const isLoggedIn = useSelector((state) => !!state.auth.user)
const { Recaptcha, handlePresubmit: onPresubmit } =
useInvisibleRecaptcha(handleSubmit)

return (
<FormWrapper
validate={validateLocation}
initialValues={mergedInitialValues}
onSubmit={handleSubmit}
stepped={stepped}
renderButtons={(formikProps) => {
const { isSubmitting, isValid, dirty } = formikProps
const isUploadingPhotos = formikProps.values.review.photos.some(
(p) => p.isUploading,
)
const formDirty = dirty || positionDirty
return (
<ProgressButtons>
<Button secondary type="button" onClick={handleCancel}>
Cancel
</Button>
<Button
disabled={
isSubmitting || !isValid || !formDirty || isUploadingPhotos
}
type="submit"
>
{isSubmitting ? 'Submitting' : t('glossary.submit')}
</Button>
</ProgressButtons>
)
}}
>
{formikSteps}
</FormWrapper>
<StyledForm>
<Formik
validate={validateLocation}
validateOnChange={false}
initialValues={mergedInitialValues}
validateOnMount
onSubmit={isLoggedIn ? handleSubmit : onPresubmit}
>
{(formikProps) => {
const { isSubmitting, isValid, dirty } = formikProps
const isUploadingPhotos = formikProps.values.review.photos.some(
(p) => p.isUploading,
)
const formDirty = dirty || positionDirty

return (
<Form>
<LocationStep
lat={position?.lat}
lng={position?.lng}
isDesktop={isDesktop}
editingId={editingId}
isLoading={isLoading}
/>
{!editingId && (
<>
<ReviewStep />
</>
)}
<ProgressButtons>
<Button secondary type="button" onClick={handleCancel}>
Cancel
</Button>
<Button
disabled={
isSubmitting || !isValid || !formDirty || isUploadingPhotos
}
type="submit"
>
{isSubmitting ? 'Submitting' : t('glossary.submit')}
</Button>
</ProgressButtons>
{!isLoggedIn && <Recaptcha />}
</Form>
)
}}
</Formik>
</StyledForm>
)
}
Loading
Loading