Replaced dispatch with useQuery and request in Asset module #6374

kshitijv256 · 2023-09-29T19:43:21Z

WHAT

`🤖 Generated by Copilot at 08d6244`

The pull request refactors the codebase for managing assets and asset services 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 also adds type annotations and validations for the asset-related API routes using runtypes. It improves the code quality, performance, and readability by removing unnecessary imports, variables, and dependencies.

Proposed Changes

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

vercel · 2023-09-29T19:43:25Z

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 17, 2023 3:29am

netlify · 2023-09-29T19:43:27Z

✅ Deploy Preview for care-egov-staging ready!

Name	Link
🔨 Latest commit	`fc2e15e`
🔍 Latest deploy log	https://app.netlify.com/sites/care-egov-staging/deploys/652dff670a06250008658890
😎 Deploy Preview	https://deploy-preview-6374--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.

src/Components/Assets/AssetTypes.tsx

src/Components/Assets/AssetFilter.tsx

rithviknishad

Remove all additional useState's used to store the response data as this is already achieved by useQuery itself and you can access the data directly instead of again creating another useState

src/Components/Assets/AssetManage.tsx

src/Components/Assets/configure/MonitorConfigure.tsx

nihal467 · 2023-10-10T21:29:34Z

@kshitijv256 https://deploy-preview-6374--care-net.netlify.app/facility/9447524f-6d2b-4b24-87dc-e30f68c6642c/assets/1ce11cbf-2398-4f9b-8828-6d416250bf15

we are having multiple asset with name "test-camera" under the facility test-oct-firstweek.

When we create a new asset with the name test-camera, the transaction history details are getting manipulated

kshitijv256 · 2023-10-11T04:20:26Z

@nihal467 fixed the problem please check. transaction filter was being passed incorrectly in request and all transaction data was shown in all assets

kshitijv256 · 2023-10-12T12:42:12Z

all the changes requested has been done

nihal467 · 2023-10-16T20:21:43Z

LGTM

github-actions · 2023-10-17T01:01:12Z

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

khavinshankar · 2023-10-17T01:06:25Z

@kshitijv256 resolve the merge conflicts

src/Components/Assets/AssetManage.tsx

* changed to request in HL7monitor.tsx * replaced dispatch in assetTypes * changed dispatch in filteer, import files * changed all dispatch requests with useQuery and request in asset module * added TBody to various endpoints * fixed assetfilter page * fixed asset import modal page * made requested changes * made requested changes * reverted to assetBedModel * fixed delete asset function * fixed after delete redirection * removed extra setstates * updated failing cypress tests for asset module * removed useEffects * removed changes from cypress files * fixed merge issues * fixed transactions issue * remove console logs ---------- Co-authored-by: Rithvik Nishad <[email protected]>

Ashesh3 · 2023-10-25T07:13:17Z

src/Components/Assets/AssetImportModal.tsx

@@ -43,18 +42,14 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
    setSelectedFile(undefined);
    onClose && onClose();
  };
-
-  useEffect(() => {
-    setLocationsLoading(true);


Why was this removed? The loader for when the locations are still being fetched does not work anymore.. setLocationsLoading

kshitijv256 and others added 9 commits September 26, 2023 18:01

changed to request in HL7monitor.tsx

6f5a27b

replaced dispatch in assetTypes

ebc21e1

changed dispatch in filteer, import files

a355fc6

changed all dispatch requests with useQuery and request in asset module

4f06879

Merge branch 'coronasafe:develop' into assets_update

aae1541

added TBody to various endpoints

79fa2ff

fixed assetfilter page

d90b17a

fixed asset import modal page

dd887bc

made requested changes

08d6244

kshitijv256 requested a review from a team September 29, 2023 19:43

kshitijv256 requested a review from a team as a code owner September 29, 2023 19:43

kshitijv256 requested a review from mathew-alex September 29, 2023 19:43

vercel bot temporarily deployed to Preview September 29, 2023 19:44 Inactive

kshitijv256 changed the title ~~changed to request in HL7monitor.tsx~~ Replaced dispatch wiith useQuery and request in Asset module Sep 29, 2023

kshitijv256 mentioned this pull request Sep 29, 2023

changed all dispatch requests with useQuery and request in asset module #6370

Closed

rithviknishad requested changes Sep 30, 2023

View reviewed changes

src/Components/Assets/AssetTypes.tsx Outdated Show resolved Hide resolved

src/Components/Assets/AssetFilter.tsx Outdated Show resolved Hide resolved

src/Components/Assets/AssetFilter.tsx Outdated Show resolved Hide resolved

made requested changes

8d3222a

vercel bot temporarily deployed to Preview September 30, 2023 20:33 Inactive

kshitijv256 requested a review from rithviknishad October 1, 2023 13:50

rithviknishad requested changes Oct 1, 2023

View reviewed changes

src/Components/Assets/AssetManage.tsx Outdated Show resolved Hide resolved

src/Components/Assets/configure/MonitorConfigure.tsx Outdated Show resolved Hide resolved

kshitijv256 added 2 commits October 1, 2023 19:47

reverted to assetBedModel

ab9824e

fixed delete asset function

f31aeaa

vercel bot temporarily deployed to Preview October 1, 2023 14:43 Inactive

fixed after delete redirection

bcd97ff

vercel bot temporarily deployed to Preview October 1, 2023 14:44 Inactive

removed extra setstates

056a0d3

vercel bot temporarily deployed to Preview October 1, 2023 15:37 Inactive

kshitijv256 changed the title ~~Replaced dispatch wiith useQuery and request in Asset module~~ Replaced dispatch with useQuery and request in Asset module Oct 1, 2023

nihal467 added needs testing and removed cypress failed pull request with cypress test failure labels Oct 10, 2023

fixed transactions issue

77ba690

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

Merge branch 'develop' into asset_changes

983a242

vercel bot temporarily deployed to Preview October 11, 2023 04:22 Inactive

nihal467 added tested and removed needs testing labels Oct 16, 2023

nihal467 approved these changes Oct 16, 2023

View reviewed changes

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

Merge branch 'develop' into asset_changes

9344abe

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

rithviknishad removed the merge conflict pull requests with merge conflict label Oct 17, 2023

rithviknishad reviewed Oct 17, 2023

View reviewed changes

src/Components/Assets/AssetManage.tsx Outdated Show resolved Hide resolved

rithviknishad approved these changes Oct 17, 2023

View reviewed changes

remove console logs

fc2e15e

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

khavinshankar approved these changes Oct 18, 2023

View reviewed changes

khavinshankar merged commit 9b362c1 into ohcnetwork:develop Oct 18, 2023
28 checks passed

Ashesh3 reviewed Oct 25, 2023

View reviewed changes

Ashesh3 mentioned this pull request Oct 25, 2023

Show loading state for fetching asset locations in Asset Import #6489

Closed

kshitijv256 deleted the asset_changes branch December 4, 2023 16:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replaced dispatch with useQuery and request in Asset module #6374

Replaced dispatch with useQuery and request in Asset module #6374

kshitijv256 commented Sep 29, 2023 •

edited by ghost

Loading

vercel bot commented Sep 29, 2023 •

edited

Loading

netlify bot commented Sep 29, 2023 •

edited

Loading

rithviknishad left a comment •

edited

Loading

nihal467 commented Oct 10, 2023 •

edited

Loading

kshitijv256 commented Oct 11, 2023

kshitijv256 commented Oct 12, 2023

nihal467 commented Oct 16, 2023

github-actions bot commented Oct 17, 2023

khavinshankar commented Oct 17, 2023

Ashesh3 Oct 25, 2023

Replaced dispatch with useQuery and request in Asset module #6374

Replaced dispatch with useQuery and request in Asset module #6374

Conversation

kshitijv256 commented Sep 29, 2023 • edited by ghost Loading

WHAT

🤖 Generated by Copilot at 08d6244

Proposed Changes

vercel bot commented Sep 29, 2023 • edited Loading

netlify bot commented Sep 29, 2023 • edited Loading

✅ Deploy Preview for care-egov-staging ready!

rithviknishad left a comment • edited Loading

Choose a reason for hiding this comment

nihal467 commented Oct 10, 2023 • edited Loading

kshitijv256 commented Oct 11, 2023

kshitijv256 commented Oct 12, 2023

nihal467 commented Oct 16, 2023

github-actions bot commented Oct 17, 2023

khavinshankar commented Oct 17, 2023

Ashesh3 Oct 25, 2023

Choose a reason for hiding this comment

kshitijv256 commented Sep 29, 2023 •

edited by ghost

Loading

`🤖 Generated by Copilot at 08d6244`

vercel bot commented Sep 29, 2023 •

edited

Loading

netlify bot commented Sep 29, 2023 •

edited

Loading

rithviknishad left a comment •

edited

Loading

nihal467 commented Oct 10, 2023 •

edited

Loading