Replaced useDipatch with useQuery/request in FacilityCreate and HospitalList files #6591

sriharsh05 · 2023-11-13T07:18:25Z

WHAT

`🤖 Generated by Copilot at 1aefc25`

Refactored some components in the Facility module to use the request function and the useQuery hook for making and fetching API calls. Added and used some types to ensure type safety and consistency for the data from the backend. Removed some unnecessary code and fixed some minor issues.

The pull request partially refactors the codebase for managing facility module in the frontend. It replaces the redux actions and states with the custom request function and the useQuery hook for data fetching and updating. It improves the code quality, performance, and readability by removing unnecessary imports, variables, and dependencies.

This pull request makes the required changes to only 2 files and does not close the entire issue.

Proposed Changes

Fixes 🛠️ Replace useDispatch w. useQuery/request: Facility (Part 2, E-H) (src/Components/Facility/[E-H]*.tsx) #6391
Replaced useDispatch with useQuery and request in HospitalList
Replaced useDispatch with useQuery and request in FacilityCreate

@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 1aefc25`

Refactored the FacilityCreate component to use the request function and the useQuery hook for fetching data from the API and removed the useAbortableEffect hook and the dispatchAction function (link, link, link, link, link, link, link, link, link, link, link, link, link)
Updated the data variable in the FacilityCreate component to match the API schema and removed the unnecessary properties (link, link)
Added a type check for the district property in the fetchedDistricts array in the FacilityCreate component to avoid errors (link)
Converted the id variable to a string before setting it as the createdFacilityId state in the FacilityCreate component (link)
Removed the error handling logic from the FacilityCreate component as it was handled by the request function internally (link)
Refactored the HospitalList component to use the useQuery hook for fetching data from the API and removed the useAbortableEffect hook, the dispatchAction function and the totalCount variable (link, link, link, link, link, link, link, link)
Replaced the stateName, districtName and localbodyName variables with the stateData, districtData and localBodyData variables in the HospitalList component to display the state, district and local body names from the data returned by the useQuery hook (link)
Added the IStateListResponse type to the ./models file to define the type of the response returned by the API for listing the states (link)
Imported the FacilityModel, CapacityModal, DoctorModal, DistrictModel, LocalBodyModel, StateModel and IStateListResponse types from ./models to use in the routes object in the ./api file (link, link)
Added the TRes property to the createFacility, updateFacility, getCapacity, listDoctor, statesList, getState, getDistrict, getDistrictByState and getLocalBody routes in the routes object in the ./api file to define the type of the response returned by the API for each endpoint (link, link, link, link, link, link, link)

…talList files

vercel · 2023-11-13T07:18:30Z

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	Dec 27, 2023 6:29am

netlify · 2023-11-13T07:18:31Z

✅ Deploy Preview for care-egov-staging ready!

Name	Link
🔨 Latest commit	`2f2c19d`
🔍 Latest deploy log	https://app.netlify.com/sites/care-egov-staging/deploys/658bc406f580f40008e81d8a
😎 Deploy Preview	https://deploy-preview-6591--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.

sriharsh05 · 2023-11-13T16:59:53Z

@rithviknishad
Please review this PR.

github-actions · 2023-11-14T05:06:45Z

👋 Hi, @sriharsh05,
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.

rithviknishad · 2023-11-14T08:44:28Z

@sriharsh05 the cypress is failing

rithviknishad · 2023-11-16T03:32:33Z

@sriharsh05

sriharsh05 · 2023-11-16T03:38:55Z

@sriharsh05

I'll look into it @rithviknishad

sriharsh05 · 2023-11-16T07:11:14Z

@rithviknishad Please review the code.

src/Components/Facility/FacilityCreate.tsx

rithviknishad · 2023-11-16T07:19:44Z

@sriharsh05 cypress tests are still failing

github-actions · 2023-11-22T03:41:23Z

👋 Hi, @sriharsh05,
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.

…to fix#6391-2

github-actions · 2023-12-20T14:55:50Z

👋 Hi, @sriharsh05,
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.

nihal467 · 2023-12-20T15:17:47Z

@sriharsh05 can you clear the merge conflict

…to fix#6391-2

sriharsh05 · 2023-12-20T16:48:35Z

@rithviknishad
Please review the changes.

nihal467 · 2023-12-26T13:59:33Z

the above screenshot is the deploy preview

the above screenshot is the current staging
@sriharsh05 As you can see, in the deploy preview the facility homepage is not loaded properly as the total facility card loading state is missing, fix the issue

…to fix#6391-2

github-actions · 2023-12-28T01:24:20Z

@sriharsh05 We truly appreciate your efforts. Thank you for taking the time to contribute; this is a very valuable contribution to us 🥇. We always welcome your contribution 🙂, so feel free to contribute to anything anytime, and never lose that spirit of innovation 🙌.

…talList files (#6591) * Replaced useDipatch with useQuery/request in FacilityCreate and HospitalList files * fix failing api calls * replace function with request calls with useQuery * remove useState variables and used variables from useQuery * fix facility pincode issue * fix longitude and latitude for facility and optimized code * Fixed ward list bug * fix auto fill for pincode bug * remove duplicate request * fix total facility card loading state * fix clear filter badges bug

Replaced useDipatch with useQuery/request in FacilityCreate and Hospi…

1aefc25

…talList files

sriharsh05 requested a review from a team November 13, 2023 07:18

sriharsh05 requested a review from a team as a code owner November 13, 2023 07:18

sriharsh05 requested a review from gigincg November 13, 2023 07:18

vercel bot temporarily deployed to Preview November 13, 2023 07:19 Inactive

github-actions bot added the merge conflict pull requests with merge conflict label Nov 14, 2023

merge develop into fix#6391-2

f04ee87

vercel bot temporarily deployed to Preview November 14, 2023 05:34 Inactive

rithviknishad added cypress failed pull request with cypress test failure and removed merge conflict pull requests with merge conflict labels Nov 14, 2023

fix failing api calls

198ada2

vercel bot temporarily deployed to Preview November 16, 2023 06:42 Inactive

Merge branch 'develop' into fix#6391-2

0b2b44c

vercel bot temporarily deployed to Preview November 16, 2023 06:43 Inactive

rithviknishad requested changes Nov 16, 2023

View reviewed changes

github-actions bot added the merge conflict pull requests with merge conflict label Nov 22, 2023

sriharsh05 added 4 commits November 25, 2023 10:56

replace function with request calls with useQuery

e32f172

remove useState variables and used variables from useQuery

45eeff3

Merge branch 'fix#6391-2' of https://github.com/sriharsh05/care_fe in…

b9ce3be

…to fix#6391-2

fix facility pincode issue

a4f87ed

github-actions bot added the merge conflict pull requests with merge conflict label Dec 20, 2023

sriharsh05 added 2 commits December 20, 2023 22:13

resolve merge conflicts

ab28e8e

Merge branch 'fix#6391-2' of https://github.com/sriharsh05/care_fe in…

c2e93ab

…to fix#6391-2

vercel bot temporarily deployed to Preview December 20, 2023 16:45 Inactive

rithviknishad approved these changes Dec 21, 2023

View reviewed changes

rithviknishad added needs testing and removed changes required merge conflict pull requests with merge conflict labels Dec 21, 2023

Merge branch 'develop' into fix#6391-2

4383e29

vercel bot temporarily deployed to Preview December 26, 2023 13:47 Inactive

nihal467 added test failed and removed needs testing labels Dec 26, 2023

sriharsh05 added 2 commits December 26, 2023 20:01

fix total facility card loading state

dcee768

Merge branch 'fix#6391-2' of https://github.com/sriharsh05/care_fe in…

cf226f7

…to fix#6391-2

vercel bot temporarily deployed to Preview December 26, 2023 14:34 Inactive

rithviknishad approved these changes Dec 27, 2023

View reviewed changes

rithviknishad added needs testing and removed test failed labels Dec 27, 2023

fix clear filter badges bug

2f2c19d

vercel bot temporarily deployed to Preview December 27, 2023 06:29 Inactive

nihal467 added tested and removed needs testing labels Dec 27, 2023

khavinshankar approved these changes Dec 28, 2023

View reviewed changes

khavinshankar merged commit 3c008b2 into ohcnetwork:develop Dec 28, 2023
24 of 26 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replaced useDipatch with useQuery/request in FacilityCreate and HospitalList files #6591

Replaced useDipatch with useQuery/request in FacilityCreate and HospitalList files #6591

sriharsh05 commented Nov 13, 2023 •

edited by ghost

Loading

vercel bot commented Nov 13, 2023 •

edited

Loading

netlify bot commented Nov 13, 2023 •

edited

Loading

sriharsh05 commented Nov 13, 2023

github-actions bot commented Nov 14, 2023

rithviknishad commented Nov 14, 2023

rithviknishad commented Nov 16, 2023

sriharsh05 commented Nov 16, 2023

sriharsh05 commented Nov 16, 2023

rithviknishad commented Nov 16, 2023

github-actions bot commented Nov 22, 2023

github-actions bot commented Dec 20, 2023

nihal467 commented Dec 20, 2023

sriharsh05 commented Dec 20, 2023

nihal467 commented Dec 26, 2023 •

edited

Loading

github-actions bot commented Dec 28, 2023

Replaced useDipatch with useQuery/request in FacilityCreate and HospitalList files #6591

Replaced useDipatch with useQuery/request in FacilityCreate and HospitalList files #6591

Conversation

sriharsh05 commented Nov 13, 2023 • edited by ghost Loading

WHAT

🤖 Generated by Copilot at 1aefc25

Proposed Changes

Merge Checklist

HOW

🤖 Generated by Copilot at 1aefc25

vercel bot commented Nov 13, 2023 • edited Loading

netlify bot commented Nov 13, 2023 • edited Loading

✅ Deploy Preview for care-egov-staging ready!

sriharsh05 commented Nov 13, 2023

github-actions bot commented Nov 14, 2023

rithviknishad commented Nov 14, 2023

rithviknishad commented Nov 16, 2023

sriharsh05 commented Nov 16, 2023

sriharsh05 commented Nov 16, 2023

rithviknishad commented Nov 16, 2023

github-actions bot commented Nov 22, 2023

github-actions bot commented Dec 20, 2023

nihal467 commented Dec 20, 2023

sriharsh05 commented Dec 20, 2023

nihal467 commented Dec 26, 2023 • edited Loading

github-actions bot commented Dec 28, 2023

sriharsh05 commented Nov 13, 2023 •

edited by ghost

Loading

`🤖 Generated by Copilot at 1aefc25`

`🤖 Generated by Copilot at 1aefc25`

vercel bot commented Nov 13, 2023 •

edited

Loading

netlify bot commented Nov 13, 2023 •

edited

Loading

nihal467 commented Dec 26, 2023 •

edited

Loading