Prevent Unnecessary Update Request in Facilities Section #8956
Conversation
✅ Deploy Preview for care-ohc ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
package-lock.json
Outdated
There was a problem hiding this comment.
Remove package-lock from commit.
|
There's already another PR for the infinite load issues for Beds. In the future, make sure to get issue assigned or mention in the original thread before starting to work on an issue. |
|
I had made those necessary changes. |
package-lock.json
Outdated
There was a problem hiding this comment.
So, this will just remove the file from develop branch. You can make use to checkout command to check package-lock file from develop and then commit that.
src/components/Form/Form.tsx
Outdated
| data-testid="submit-button" | ||
| type="submit" | ||
| disabled={disabled || !isDirty} | ||
| label={"Save & Add More"} |
There was a problem hiding this comment.
Let's pass in the label as showSaveAndAddMoreBtn prop. Refer to the original files on how we are updating this label, i.e. 'Save and Add More' vs 'Save Bed/Staff Capacity'.
There was a problem hiding this comment.
ok got it and made those changes.
| if (btnType == "Save and Exit") handleClose(); | ||
| if ( | ||
| btnType !== "save-and-add-more" || | ||
| bedTypes.length === BED_TYPES.length |
There was a problem hiding this comment.
The latter comparison wouldn't work as bedTypes length will always be the same.
Here, you want to bring updatedBedTypes out of scope earlier*, calculate the number of beds that are disabled and then do a check (if it exists + if it equals to BED_TYPES length).
Something like:
const disabledBedTypesLength = updatedBedTypes?.filter((item) => item.disabled).length;
*In this case, we can't use bedTypes right away since we are updating it (state may or may not be updated in time).
| @@ -115,11 +135,21 @@ const Form = <T extends FormDetails>({ | |||
| onClick={props.onCancel} | |||
| label={props.cancelLabel ?? "Cancel"} | |||
| /> | |||
| {props.showSaveAndAddMoreBtn && ( | |||
There was a problem hiding this comment.
This works, but it's a bit confusing with the button text and labeling, since regular submitBtn seems to be using showSaveAndAddMoreBtn as label.
We could change it so that buttonText corresponds to Save/Update Bed/Staff Capacity and showSaveAndAddMoreBtn passes in Save & Add More.
Proposed Changes
when all bed types are added it shows an error message "can't add more bed types" and not allowing user to add more bed types
@ohcnetwork/care-fe-code-reviewers
Merge Checklist