Skip to content

674: Implement edit form with resource info populated #678

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
icycoldveins wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

674: Implement edit form with resource info populated #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
506ed25
674: implement edit form with resource info populated
icycoldveins Nov 5, 2025
3a13dc9
fix: populate edit form with resource data using react-hook-form reset
icycoldveins Nov 5, 2025
d74c862
674: feat: enable address editing in resource edit forms and defer su…
icycoldveins Nov 17, 2025
8933d3a
refactor(674): address PR review comments
icycoldveins Dec 3, 2025
f66762e
674: fix: prevent switching resources while editing
icycoldveins Dec 16, 2025
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
1 change: 1 addition & 0 deletions src/actions/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export const setTapInfoOpenedWhileSearchOpen = createAction(
);

export const setToolbarModal = createAction('SET_TOOLBAR_MODAL');
export const setEditingResource = createAction('SET_EDITING_RESOURCE');
export const TOOLBAR_MODAL_NONE = 'TOOLBAR_MODAL_NONE';
export const TOOLBAR_MODAL_RESOURCE = 'TOOLBAR_MODAL_RESOURCE';
export const TOOLBAR_MODAL_FILTER = 'TOOLBAR_MODAL_FILTER';
Expand Down
25 changes: 22 additions & 3 deletions src/components/AddResourceModal/AddBathroom/AddBathroom.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ const AddBathroom = ({
hasFountain,
checkboxChangeHandler,
textFieldChangeHandler,
isValidAddress
isValidAddress,
editMode
}) => {
const isMobile = useIsMobile();
const userLocation = useSelector(getUserLocation);
Expand All @@ -51,8 +52,25 @@ const AddBathroom = ({
setValue,
trigger,
control,
reset,
formState: { errors }
} = useForm();
} = useForm({
defaultValues: {
name,
address,
website,
description
}
});

useEffect(() => {
reset({
name,
address,
website,
description
});
}, [name, address, website, description, reset]);

const requiredFieldMsg = (
<span>
Expand Down Expand Up @@ -90,7 +108,7 @@ const AddBathroom = ({
})
}}
>
Add a Bathroom Resource
{editMode ? 'Edit Bathroom Resource' : 'Add a Bathroom Resource'}
</Typography>
</Box>
<CardContent
Expand Down Expand Up @@ -122,6 +140,7 @@ const AddBathroom = ({
setValue={setValue}
textFieldChangeHandler={textFieldChangeHandler}
isValidAddress={isValidAddress}
editMode={editMode}
/>
)}
{(page === 1 || isMobile) && (
Expand Down
3 changes: 2 additions & 1 deletion src/components/AddResourceModal/AddBathroom/PageOne.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ const PageOne = ({
control,
setValue,
textFieldChangeHandler,
isValidAddress
isValidAddress,
editMode
}) => {
const isMobile = useIsMobile();

Expand Down
25 changes: 22 additions & 3 deletions src/components/AddResourceModal/AddFood/AddFood.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ const AddFood = ({
guidelines,
checkboxChangeHandler,
textFieldChangeHandler,
isValidAddress
isValidAddress,
editMode
}) => {
const isMobile = useIsMobile();
const getVariableName = variable => Object.keys(variable)[0];
Expand All @@ -66,8 +67,25 @@ const AddFood = ({
setValue,
trigger,
control,
reset,
formState: { errors }
} = useForm();
} = useForm({
defaultValues: {
name,
address,
website,
description
}
});

useEffect(() => {
reset({
name,
address,
website,
description
});
}, [name, address, website, description, reset]);

const requiredFieldMsg = (
<span>
Expand Down Expand Up @@ -110,7 +128,7 @@ const AddFood = ({
})
}}
>
Add a Food Resource
{editMode ? 'Edit Food Resource' : 'Add a Food Resource'}
</Typography>
</Box>
<CardContent
Expand Down Expand Up @@ -152,6 +170,7 @@ const AddFood = ({
checkboxChangeHandler={checkboxChangeHandler}
textFieldChangeHandler={textFieldChangeHandler}
isValidAddress={isValidAddress}
editMode={editMode}
/>
)}
{(page === 1 || isMobile) && (
Expand Down
3 changes: 2 additions & 1 deletion src/components/AddResourceModal/AddFood/PageOne.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ const PageOne = ({
getVariableName,
checkboxChangeHandler,
textFieldChangeHandler,
isValidAddress
isValidAddress,
editMode
}) => {
const isMobile = useIsMobile();

Expand Down
25 changes: 22 additions & 3 deletions src/components/AddResourceModal/AddForaging/AddForaging.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ const AddForaging = ({
communityGarden,
checkboxChangeHandler,
textFieldChangeHandler,
isValidAddress
isValidAddress,
editMode
}) => {
const isMobile = useIsMobile();
const userLocation = useSelector(getUserLocation);
Expand All @@ -63,8 +64,25 @@ const AddForaging = ({
setValue,
trigger,
control,
reset,
formState: { errors }
} = useForm();
} = useForm({
defaultValues: {
name,
address,
website,
description
}
});

useEffect(() => {
reset({
name,
address,
website,
description
});
}, [name, address, website, description, reset]);

const requiredFieldMsg = (
<span>
Expand Down Expand Up @@ -109,7 +127,7 @@ const AddForaging = ({
})
}}
>
Add a Foraging Resource
{editMode ? 'Edit Foraging Resource' : 'Add a Foraging Resource'}
</Typography>
</Box>
<CardContent
Expand Down Expand Up @@ -155,6 +173,7 @@ const AddForaging = ({
checkboxChangeHandler={checkboxChangeHandler}
textFieldChangeHandler={textFieldChangeHandler}
isValidAddress={isValidAddress}
editMode={editMode}
/>
)}
{(page === 1 || isMobile) && (
Expand Down
3 changes: 2 additions & 1 deletion src/components/AddResourceModal/AddForaging/PageOne.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ const PageOne = ({
getVariableName,
checkboxChangeHandler,
textFieldChangeHandler,
isValidAddress
isValidAddress,
editMode
}) => {
const isMobile = useIsMobile();

Expand Down
Loading