Replaced useDispatch with useQuery and request. #6344

shyamprakash123 · 2023-09-25T15:47:00Z

WHAT

`🤖 Generated by Copilot at 741fbac`

Refactored ABDM components to use request utility and ABDM API routes. Added ABDM API support in api.tsx and models.ts.

Proposed Changes

Fixes 🛠️ Replace useDispatch w. useQuery/request: ABDM (src/Components/ABDM/**) #6330

@coronasafe/care-fe-code-reviewers @coronasafe/code-reviewers

Merge Checklist

Add specs that demonstrate bug / test a new feature.
Update product documentation.
Ensure that UI text is kept in I18n files.
Prep screenshot or demo video for changelog entry, and attach it to issue.
Request for Peer Reviews
Completion of QA

HOW

`🤖 Generated by Copilot at 741fbac`

Refactor the ABDM components to use the custom request and query utilities and the ABDM API routes (F0, F1, F2, F3)
Remove the unused imports of useDispatch and various ABDM actions from the ABDM components (link, link, link, link, link, link, link)
Add the imports of request, useQuery, and routes to the ABDM components to use the custom request and query utilities and the API routes for the ABDM module (link, link, link, link)
Replace the dispatch actions with the request utility to fetch or update the data from the ABDM API endpoints, and destructure the response and data variables from the request result (link, link, link, link, link, link, link, link, link, link, link, link, link, link, link, link)
Use the data variable to populate the success data, generate the QR code and the download link, show the notification or error messages, and call the callback functions (link, link, link, link, link, link, link, link, link, link, link, link, link)
Replace the dispatch action with the useQuery utility to fetch the health facility data, and destructure the health_facility, loading, and refetch variables from the useQuery result (link)
Use the health_facility variable to populate the form data, and use the refetch function to refetch the data on mount or update (link)
Use the loading and isLoading variables to render the loading component (link)
Define the IHealthFacility, ILinkABHANumber, IConfirmMobileOtp, IHealthId, IAadhaarOtp, ICheckAndGenerateMobileOtp, and ICreateHealthIdResponse interfaces to specify the expected response types for the ABDM API endpoints (link)
Import the ABDM interfaces from the ./src/Components/ABDM/models.ts file (link)
Define the abha property with the ABDM API routes, such as getAbhaCard, linkAbhaNumber, confirmMobileOtp, createHealthId, generateAadhaarOtp, checkAndGenerateMobileOtp, and verifyAadhaarOtp (link)
Include the TRes property for each route, which specifies the expected response type for each route, such as IHealthFacility, ILinkABHANumber, IConfirmMobileOtp, IHealthId, IAadhaarOtp, ICheckAndGenerateMobileOtp, and ICreateHealthIdResponse (link)

vercel · 2023-09-25T15:47:04Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
care-storybook	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Oct 18, 2023 1:18am

netlify · 2023-09-25T15:47:07Z

✅ Deploy Preview for care-egov-staging ready!

Name	Link
🔨 Latest commit	`b56daee`
🔍 Latest deploy log	https://app.netlify.com/sites/care-egov-staging/deploys/652f324b56d41c00089c9bd9
😎 Deploy Preview	https://deploy-preview-6344--care-egov-staging.netlify.app/
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

khavinshankar

LGTM, why was package-lock.json changed?

@rithviknishad can you review this pr once

rithviknishad

Nice work on nesting the ABDM related routes under abdm.

However, you'll also have to remove the corresponding actions from https://github.com/coronasafe/care_fe/blob/develop/src/Redux/actions.tsx as mentioned in the point 5 of the EPIC issue.

You'll also have to untrack your package-lock.json changes

rithviknishad

You'll also have to add TBody type definitions for all mutation routes such as (POST PUT PATCH DELETE).

9bc19ed Adds support for it. so you'll have to rebase with the latest develop too in order to do that.

shyamprakash123 · 2023-09-30T12:43:39Z

You'll also have to add TBody type definitions for all mutation routes such as (POST PUT PATCH DELETE).

9bc19ed Adds support for it. so you'll have to rebase with the latest develop too in order to do that.

All mutation routes mean only for the Abha routes right?

rithviknishad · 2023-09-30T12:46:04Z

yes @shyamprakash123

shyamprakash123 · 2023-09-30T13:49:44Z

Ready for the review.

rithviknishad

You shouldn't delete package-lock
rename: Tbody to TBody.
Avoid declaring types in api.tsx. Consider declaring them in ABDM's models.ts file itself. Also, you can reuse existing types instead of creating seperate types for TBody. You can share types by making some unavailable fields to take value undefined

Eg:

export interface Model {
  read_and_write_available_filed: string;
  readonly available_only_for_read?: string;
}

shyamprakash123 · 2023-10-02T08:22:58Z

Ready for the review.

shyamprakash123 · 2023-10-11T17:48:50Z

@shyamprakash123

I am unable to link Abha in the patient creation page, even after the mobile number was given, it is throwing an error, the field can't be empty

CC: @rithviknishad

@nihal467,

Fixed Errors -

unable to link Abha in the patient creation page, even after the mobile number was given, it is throwing an error, the field can't be empty.
Replaced Rdata with Rerror.

CC: @rithviknishad

khavinshankar · 2023-10-12T03:53:12Z

@nihal467 I think the errors are fixed, can you recheck this

cc: @shyamprakash123 @rithviknishad

nihal467 · 2023-10-16T19:26:06Z

@shyamprakash123

in the patient consultation page, once we enter the aadhar number, it is not getting redirected to the otp section

shyamprakash123 · 2023-10-17T16:35:42Z

@shyamprakash123

in the patient consultation page, once we enter the aadhar number, it is not getting redirected to the otp section

@nihal467 I just checked the ABHA Link for the patient consultation page it is working as expected.
You can check the video I recorded while testing the linking of ABHA it is redirecting me to the OTP section.
So, I'm requesting you to once again re-test this PR.
Video link - https://www.loom.com/share/2684ce0ebfa24a18bcea3fc446c9d991
CC: @rithviknishad @khavinshankar

nihal467 · 2023-10-17T17:48:27Z

LGTM

github-actions · 2023-10-18T01:17:06Z

👋 Hi, @shyamprakash123,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

* Replaced useDispatch with useQuery and request. * Removed all relevant no longer used actions from actions.tsx * Replaced Res to Type * Added TBody. * used abha in place of JSON.parse(value). * Fixed mobile otp issue * Replaced Rdata with Rerror * Fixed link care context --------- Co-authored-by: Khavin Shankar <[email protected]>

Replaced useDispatch with useQuery and request.

741fbac

shyamprakash123 requested a review from a team September 25, 2023 15:47

shyamprakash123 requested a review from a team as a code owner September 25, 2023 15:47

shyamprakash123 requested a review from vigneshhari September 25, 2023 15:47

vercel bot temporarily deployed to Preview September 25, 2023 15:47 Inactive

nihal467 requested review from rithviknishad and khavinshankar September 26, 2023 06:39

vercel bot temporarily deployed to Preview September 26, 2023 06:39 Inactive

vercel bot temporarily deployed to Preview September 26, 2023 09:51 Inactive

khavinshankar reviewed Sep 26, 2023

View reviewed changes

rithviknishad requested changes Sep 26, 2023

View reviewed changes

nihal467 added the changes required label Sep 26, 2023

Removed all relevant no longer used actions from actions.tsx

52fc064

shyamprakash123 force-pushed the fix#6330 branch from 5a2c77b to 52fc064 Compare September 26, 2023 15:50

vercel bot temporarily deployed to Preview September 26, 2023 15:52 Inactive

rithviknishad requested changes Sep 27, 2023

View reviewed changes

vercel bot temporarily deployed to Preview September 30, 2023 13:46 Inactive

vercel bot temporarily deployed to Preview September 30, 2023 13:51 Inactive

rithviknishad requested changes Sep 30, 2023

View reviewed changes

shyamprakash123 added 3 commits October 2, 2023 12:15

Merge branch 'develop' into fix#6330

c9b7773

Replaced Res to Type

756ab23

Added TBody.

27d2d7e

shyamprakash123 force-pushed the fix#6330 branch from f49560a to 27d2d7e Compare October 2, 2023 08:18

vercel bot temporarily deployed to Preview October 2, 2023 08:19 Inactive

khavinshankar added needs testing reviewed reviewed by a core member and removed test failed changes required labels Oct 12, 2023

nihal467 added test failed and removed needs testing reviewed reviewed by a core member labels Oct 16, 2023

Fixed link care context

c7ff758

vercel bot temporarily deployed to Preview October 17, 2023 17:33 Inactive

Merged with develop barnch and fixed linking of care context

1cc11f3

vercel bot temporarily deployed to Preview October 17, 2023 17:45 Inactive

nihal467 added tested cypress passed and removed test failed labels Oct 17, 2023

github-actions bot added the merge conflict pull requests with merge conflict label Oct 18, 2023

Merge branch 'develop' into fix#6330

b56daee

vercel bot temporarily deployed to Preview October 18, 2023 01:18 Inactive

shyamprakash123 closed this Oct 18, 2023

shyamprakash123 reopened this Oct 18, 2023

github-actions bot removed the merge conflict pull requests with merge conflict label Oct 18, 2023

khavinshankar approved these changes Oct 18, 2023

View reviewed changes

khavinshankar merged commit d26aba5 into ohcnetwork:develop Oct 18, 2023
50 of 52 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replaced useDispatch with useQuery and request. #6344

Replaced useDispatch with useQuery and request. #6344

shyamprakash123 commented Sep 25, 2023 •

edited

Loading

vercel bot commented Sep 25, 2023 •

edited

Loading

netlify bot commented Sep 25, 2023 •

edited

Loading

khavinshankar left a comment

rithviknishad left a comment •

edited

Loading

rithviknishad left a comment

shyamprakash123 commented Sep 30, 2023

rithviknishad commented Sep 30, 2023

shyamprakash123 commented Sep 30, 2023

rithviknishad left a comment •

edited

Loading

shyamprakash123 commented Oct 2, 2023

shyamprakash123 commented Oct 11, 2023

khavinshankar commented Oct 12, 2023

nihal467 commented Oct 16, 2023 •

edited

Loading

shyamprakash123 commented Oct 17, 2023 •

edited

Loading

nihal467 commented Oct 17, 2023

github-actions bot commented Oct 18, 2023

Replaced useDispatch with useQuery and request. #6344

Replaced useDispatch with useQuery and request. #6344

Conversation

shyamprakash123 commented Sep 25, 2023 • edited Loading

WHAT

🤖 Generated by Copilot at 741fbac

Proposed Changes

Merge Checklist

HOW

🤖 Generated by Copilot at 741fbac

vercel bot commented Sep 25, 2023 • edited Loading

netlify bot commented Sep 25, 2023 • edited Loading

✅ Deploy Preview for care-egov-staging ready!

khavinshankar left a comment

Choose a reason for hiding this comment

rithviknishad left a comment • edited Loading

Choose a reason for hiding this comment

rithviknishad left a comment

Choose a reason for hiding this comment

shyamprakash123 commented Sep 30, 2023

rithviknishad commented Sep 30, 2023

shyamprakash123 commented Sep 30, 2023

rithviknishad left a comment • edited Loading

Choose a reason for hiding this comment

shyamprakash123 commented Oct 2, 2023

shyamprakash123 commented Oct 11, 2023

Fixed Errors -

khavinshankar commented Oct 12, 2023

nihal467 commented Oct 16, 2023 • edited Loading

shyamprakash123 commented Oct 17, 2023 • edited Loading

nihal467 commented Oct 17, 2023

github-actions bot commented Oct 18, 2023

shyamprakash123 commented Sep 25, 2023 •

edited

Loading

`🤖 Generated by Copilot at 741fbac`

`🤖 Generated by Copilot at 741fbac`

vercel bot commented Sep 25, 2023 •

edited

Loading

netlify bot commented Sep 25, 2023 •

edited

Loading

rithviknishad left a comment •

edited

Loading

rithviknishad left a comment •

edited

Loading

nihal467 commented Oct 16, 2023 •

edited

Loading

shyamprakash123 commented Oct 17, 2023 •

edited

Loading