MCR-3900 Can continue or save as draft with new API #2313

haworku · 2024-03-08T23:15:56Z

Summary

Happy path for Continue and Save As Draft - using the new updateDraftContractRates mutation on Continue

Change formik object to be called rateForms instead of rates. I'm sorry for the code diff. It was getting very confusing to me in the code when we had rates as in GQL rates and when we had rate forms coming from Formik. Tried to make naming more distinct.
I moved LinkYourRates a level up so that I can control form data using the FieldArray.replace in next PR
Fix route navigate call

Related issues

https://jiraent.cms.gov/browse/MCR-3900

Screenshots

Test cases covered

Added tests for the new generateUpdatedRates utility
Skip RateDetails tests again

QA guidance

You can add and remove data from rate details V2 now with existing form data
Note: Linked Rates radio and dropdown won't hook in yet - thats the next set of PRs

haworku · 2024-03-08T23:21:36Z

I think I'm seeing an issue with the API. It seems to be creatingdraftRates on the contract that are malformatted due to the stateNumber, I believe? Can investigate next week. Surfacing for visibility @macrael

Getting this error back

 Error from API fetch ApolloError: Issue finding a contract with history with id 2b18aa60-fec4-458e-82dd-b49d41690ef3. Message: [
  {
    "code": "too_small",
    "minimum": 1,
    "type": "number",
    "inclusive": true,
    "exact": false,
    "message": "Number must be greater than or equal to 1",
    "path": [
      "draftRevision",
      "rateRevisions",
      0,
      "rate",
      "stateNumber"
    ]
  },
  {
    "code": "too_small",
    "minimum": 1,
    "type": "number",
    "inclusive": true,
    "exact": false,
    "message": "Number must be greater than or equal to 1",
    "path": [
      "draftRates",
      0,
      "stateNumber"
    ]
  }

…ious

haworku · 2024-03-11T22:14:37Z

services/app-web/src/index.tsx

+        RateRevision: {
+            fields: {
+                formData: {
+                    merge: true,


Getting GQL warnings (not blocking but they clutter the console) because form datas dont have id but are nested objects that are changing.

https://www.apollographql.com/docs/react/caching/cache-field-behavior/#merging-non-normalized-objects

Following docs, I believe this is the proper way to address but welcome other eyes.

interesting, funny because these aren't really stand alone objects, we just made formData to wrap the data up nicely. This looks right to me based on those docs

macrael

Looks good. I am a little surprised at the dual headed nature of this component but that's for another time

macrael · 2024-03-11T22:52:16Z

services/app-web/src/formHelpers/formatters.ts

-    attribute: boolean | Date | string | null | undefined
-): string => {
+function formatForForm<T> (
+    attribute: T


I suspect you could just use any here and it would work the same as the generic parameter

macrael · 2024-03-11T22:54:00Z

services/app-web/src/pages/LinkYourRates/LinkYourRates.test.tsx

@@ -16,7 +16,7 @@ describe('LinkYourRates', () => {
                onSubmit={(values) => console.info('submitted', values)}
            >
                <form>
-                    <LinkYourRates fieldNamePrefix="rates.1" index={1} />
+                    <LinkYourRates fieldNamePrefix="rateForms.1" index={1} />


good name change

macrael · 2024-03-11T23:02:57Z

services/app-web/src/pages/StateSubmission/RateDetails/V2/RateDetailsV2.tsx

+    // Set up data for form. Either based on contract API (for multi rate) or rates API (for edit and submit of standalone rate)
+    const ratesFromContract =
+        fetchContractData?.fetchContract.contract.draftRates // TODO WHEN WE IMPLEMENT UPDATE API, THIS SHOULD ALSO LOAD FROM ANY LINKED RATES
+    const initialRequestLoading = fetchContractLoading || fetchRateLoading


Ok, now I think I see where you are skipping requests. I'm a little surprised by this pattern, seems like a lot of overhead is required in order to use this component for both stand alone rate edit and inside of the RateDetails array. No need to change this now but I'd like to look at that after summit again.

macrael · 2024-03-11T23:04:34Z

services/app-web/src/pages/StateSubmission/RateDetails/V2/rateDetailsHelpers.ts

+}
+
+// convert from FormikRateForm to GQL RateFormData used in API
+const convertRateFormToGQLRateFormData = (


I like having these explicit converters

Same, this is a great addition!

haworku · 2024-03-12T13:14:46Z

am a little surprised at the dual headed nature of this component but that's for another time

Yes hoping we remove this and that we get to actually do this right. I still would like to see a SINGLE and MULTIPLE RateDetails v2 also with separation of concerns. However, I was finding keeping that interface clean and also figuring out how to encapsulate the API requests and their handling challenging. A bit hard to refactor and do forward facing work with the short timeline. Putting them together helped me see more clearly what's the same (for standalone v multiple rates) and whats different in one file. Made me more confident I didnt totally break single rate experience

pearl-truss

LGTM

haworku added 2 commits March 8, 2024 16:33

Add generateUpdatedRates, rateHelpers, call updateDraftContractRates

f35608a

Merge remote-tracking branch 'origin/main' into MCR-3900-continue-button

d09dc10

haworku added 2 commits March 11, 2024 13:03

Get routing working

2e79ac5

Add merge for repeated fetchDraftContract requests on page by page basis

eedb097

github-actions bot requested a deployment to review-apps March 11, 2024 18:09 In progress

github-actions bot requested a deployment to review-apps March 11, 2024 18:14 In progress

fix rate numbering

085ceff

github-actions bot requested a deployment to review-apps March 11, 2024 20:47 In progress

Fix small bugs, skip tests, move LinkYourRates a level up

299208f

github-actions bot deployed to review-apps March 11, 2024 22:05 View deployment

GQL can trust form data within a revision and merge incoming and prev…

96ec412

…ious

haworku commented Mar 11, 2024

View reviewed changes

haworku marked this pull request as ready for review March 11, 2024 22:15

haworku requested review from macrael, pearl-truss and ruizajtruss and removed request for macrael March 11, 2024 22:15

github-actions bot deployed to review-apps March 11, 2024 22:26 View deployment

macrael approved these changes Mar 11, 2024

View reviewed changes

pearl-truss approved these changes Mar 12, 2024

View reviewed changes

haworku merged commit 619f2f2 into main Mar 12, 2024
28 checks passed

haworku deleted the MCR-3900-continue-button branch March 12, 2024 14:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MCR-3900 Can continue or save as draft with new API #2313

MCR-3900 Can continue or save as draft with new API #2313

haworku commented Mar 8, 2024 •

edited

Loading

haworku commented Mar 8, 2024

haworku Mar 11, 2024

macrael Mar 11, 2024 •

edited

Loading

macrael left a comment

macrael Mar 11, 2024

macrael Mar 11, 2024

macrael Mar 11, 2024

macrael Mar 11, 2024

pearl-truss Mar 12, 2024

haworku commented Mar 12, 2024 •

edited

Loading

pearl-truss left a comment

MCR-3900 Can continue or save as draft with new API #2313

MCR-3900 Can continue or save as draft with new API #2313

Conversation

haworku commented Mar 8, 2024 • edited Loading

Summary

Related issues

Screenshots

Test cases covered

QA guidance

haworku commented Mar 8, 2024

haworku Mar 11, 2024

Choose a reason for hiding this comment

macrael Mar 11, 2024 • edited Loading

Choose a reason for hiding this comment

macrael left a comment

Choose a reason for hiding this comment

macrael Mar 11, 2024

Choose a reason for hiding this comment

macrael Mar 11, 2024

Choose a reason for hiding this comment

macrael Mar 11, 2024

Choose a reason for hiding this comment

macrael Mar 11, 2024

Choose a reason for hiding this comment

pearl-truss Mar 12, 2024

Choose a reason for hiding this comment

haworku commented Mar 12, 2024 • edited Loading

pearl-truss left a comment

Choose a reason for hiding this comment

haworku commented Mar 8, 2024 •

edited

Loading

macrael Mar 11, 2024 •

edited

Loading

haworku commented Mar 12, 2024 •

edited

Loading