Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Prescriptions: Shrink discontinued prescriptions + Flip MAR t… #6386

Merged
merged 1 commit into from
Oct 3, 2023

Conversation

rithviknishad
Copy link
Member

@rithviknishad rithviknishad commented Oct 3, 2023

…imeline + Freeze primary columns in horizontal scroll (#6282)"

This reverts commit 5009a86.

WHAT

🤖 Generated by Copilot at 3ec4368

This pull request refactors and simplifies the pagination logic and components for the prescription administrations feature. It removes the discontinued prescriptions feature, which was not working as expected, and makes the pagination more consistent and type-safe. It also improves the performance and appearance of the PrescriptionRow component.

Proposed Changes

  • Fixes #issue?
  • Change 1
  • Change 2
  • More?

@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 3ec4368

  • Simplify the interface and logic of the useRangePagination hook by replacing the snapToLatest and reverse props with a single defaultEnd prop (link, link, link, link)
  • Update the PrescriptionAdministrationsTable component to use the new defaultEnd prop of the useRangePagination hook and remove the unnecessary states and logic related to the discontinued prescriptions and the pagination tooltips (link, link, link, link, link, link, link, link, link, link, link)
  • Change the type of the query parameter of the list action in src/Redux/actions.tsx to Partial<Prescription> for better type safety and consistency (link)

…imeline + Freeze primary columns in horizontal scroll (#6282)"

This reverts commit 5009a86.
@rithviknishad rithviknishad requested a review from a team October 3, 2023 06:30
@rithviknishad rithviknishad requested a review from a team as a code owner October 3, 2023 06:30
@vercel
Copy link

vercel bot commented Oct 3, 2023

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 3, 2023 6:31am

@netlify
Copy link

netlify bot commented Oct 3, 2023

Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit 3ec4368
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/651bb51212903300088fe638
😎 Deploy Preview https://deploy-preview-6386--care-egov-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

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

@cypress
Copy link

cypress bot commented Oct 3, 2023

Passing run #1342 ↗︎

0 78 0 0 Flakiness 0

Details:

Revert "Prescriptions: Shrink discontinued prescriptions + Flip MAR t…
Project: CARE Commit: 3ec4368ec0
Status: Passed Duration: 02:57 💡
Started: Oct 3, 2023 6:35 AM Ended: Oct 3, 2023 6:37 AM

Review all test suite changes for PR #6386 ↗︎

@nihal467
Copy link
Member

nihal467 commented Oct 3, 2023

LGTM

@nihal467 nihal467 added the tested label Oct 3, 2023
@khavinshankar khavinshankar merged commit b7fc53c into develop Oct 3, 2023
57 of 58 checks passed
@khavinshankar khavinshankar deleted the revert-flip-admin branch October 3, 2023 06:45
@github-actions
Copy link

github-actions bot commented Oct 3, 2023

@rithviknishad 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 🙌.

Ashesh3 pushed a commit that referenced this pull request Oct 4, 2023
…imeline + Freeze primary columns in horizontal scroll (#6282)" (#6386)

This reverts commit 5009a86.
khavinshankar pushed a commit that referenced this pull request Oct 17, 2023
* Middleware override feature in asset location

* Fix tooltip clipping

* Fix Flaky Cypress test in Facility Module  (#6384)

* fix random facility page failure

* fix random facility page failure

* Revert "Prescriptions: Shrink discontinued prescriptions + Flip MAR timeline + Freeze primary columns in horizontal scroll (#6282)" (#6386)

This reverts commit 5009a86.

* Refactor Asset Model Import Formatting (#6388)

* Refactor Asset Model Import Formatting

* fixes to warranty_amc_end_of_validity

* Fix asset import file for cypress

* Refactor: replaced Dispatch to useQuery/Request of src/Components/Auth/log… (#6333)

* Refactor: replaced useDispatch to useQuery of src/Components/Auth/login.tsx

* fix:useQuery changed to Request

* feat: replaced dispatch with request

* fix: types and added pathparams

* fix: request body error

* Update Login.tsx

* change:Tres to Tbody

* fixes: response type change

* Update package-lock.json

* fix hover height (#6352)

* Split routes of App Router (#6363)

* Prescription: show prescribed on & by and discontinued date in detail card (#6365)

* Fixed bug in location picker in update facility page (#6377)

* add all cases for map rendering

* implement location pointer on searched location

* Added cam auto reset in asset config page (#6375)

* 💊 Adds support for editing prescriptions +  Adds `useSlug` hook (#6369)

* Adds hook: `useSlug`

* bug fix: NumericWithUnits field not showing intial value

* Form: support for showing global errors

* Adds support for editing prescriptions (fixes #6340)

* Fix cypress

* fix cypress

* Improve design

---------

Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <mail@rithviknishad.dev>
Co-authored-by: Aaron Jevil Nazareth <93522968+jevil25@users.noreply.github.com>
Co-authored-by: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com>
Co-authored-by: Gampa Sri Harsh <114745442+sriharsh05@users.noreply.github.com>
Co-authored-by: Tasnimul H. Tauhid <thtauhid.71@gmail.com>
rithviknishad added a commit that referenced this pull request Oct 17, 2023
* Middleware override feature in asset location

* Fix tooltip clipping

* Fix Flaky Cypress test in Facility Module  (#6384)

* fix random facility page failure

* fix random facility page failure

* Revert "Prescriptions: Shrink discontinued prescriptions + Flip MAR timeline + Freeze primary columns in horizontal scroll (#6282)" (#6386)

This reverts commit 5009a86.

* Refactor Asset Model Import Formatting (#6388)

* Refactor Asset Model Import Formatting

* fixes to warranty_amc_end_of_validity

* Fix asset import file for cypress

* Refactor: replaced Dispatch to useQuery/Request of src/Components/Auth/log… (#6333)

* Refactor: replaced useDispatch to useQuery of src/Components/Auth/login.tsx

* fix:useQuery changed to Request

* feat: replaced dispatch with request

* fix: types and added pathparams

* fix: request body error

* Update Login.tsx

* change:Tres to Tbody

* fixes: response type change

* Update package-lock.json

* fix hover height (#6352)

* Split routes of App Router (#6363)

* Prescription: show prescribed on & by and discontinued date in detail card (#6365)

* Fixed bug in location picker in update facility page (#6377)

* add all cases for map rendering

* implement location pointer on searched location

* Added cam auto reset in asset config page (#6375)

* 💊 Adds support for editing prescriptions +  Adds `useSlug` hook (#6369)

* Adds hook: `useSlug`

* bug fix: NumericWithUnits field not showing intial value

* Form: support for showing global errors

* Adds support for editing prescriptions (fixes #6340)

* Fix cypress

* fix cypress

* Improve design

---------

Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <mail@rithviknishad.dev>
Co-authored-by: Aaron Jevil Nazareth <93522968+jevil25@users.noreply.github.com>
Co-authored-by: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com>
Co-authored-by: Gampa Sri Harsh <114745442+sriharsh05@users.noreply.github.com>
Co-authored-by: Tasnimul H. Tauhid <thtauhid.71@gmail.com>
Ashesh3 added a commit that referenced this pull request Oct 20, 2023
* Middleware override feature in asset location

* Fix tooltip clipping

* Fix Flaky Cypress test in Facility Module  (#6384)

* fix random facility page failure

* fix random facility page failure

* Revert "Prescriptions: Shrink discontinued prescriptions + Flip MAR timeline + Freeze primary columns in horizontal scroll (#6282)" (#6386)

This reverts commit 5009a86.

* Refactor Asset Model Import Formatting (#6388)

* Refactor Asset Model Import Formatting

* fixes to warranty_amc_end_of_validity

* Fix asset import file for cypress

* Refactor: replaced Dispatch to useQuery/Request of src/Components/Auth/log… (#6333)

* Refactor: replaced useDispatch to useQuery of src/Components/Auth/login.tsx

* fix:useQuery changed to Request

* feat: replaced dispatch with request

* fix: types and added pathparams

* fix: request body error

* Update Login.tsx

* change:Tres to Tbody

* fixes: response type change

* Update package-lock.json

* fix hover height (#6352)

* Split routes of App Router (#6363)

* Prescription: show prescribed on & by and discontinued date in detail card (#6365)

* Fixed bug in location picker in update facility page (#6377)

* add all cases for map rendering

* implement location pointer on searched location

* Added cam auto reset in asset config page (#6375)

* 💊 Adds support for editing prescriptions +  Adds `useSlug` hook (#6369)

* Adds hook: `useSlug`

* bug fix: NumericWithUnits field not showing intial value

* Form: support for showing global errors

* Adds support for editing prescriptions (fixes #6340)

* Fix cypress

* fix cypress

* Improve design

---------

Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <mail@rithviknishad.dev>
Co-authored-by: Aaron Jevil Nazareth <93522968+jevil25@users.noreply.github.com>
Co-authored-by: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com>
Co-authored-by: Gampa Sri Harsh <114745442+sriharsh05@users.noreply.github.com>
Co-authored-by: Tasnimul H. Tauhid <thtauhid.71@gmail.com>
Ashesh3 added a commit that referenced this pull request Oct 23, 2023
* Middleware override feature in asset location

* Fix tooltip clipping

* Fix Flaky Cypress test in Facility Module  (#6384)

* fix random facility page failure

* fix random facility page failure

* Revert "Prescriptions: Shrink discontinued prescriptions + Flip MAR timeline + Freeze primary columns in horizontal scroll (#6282)" (#6386)

This reverts commit 5009a86.

* Refactor Asset Model Import Formatting (#6388)

* Refactor Asset Model Import Formatting

* fixes to warranty_amc_end_of_validity

* Fix asset import file for cypress

* Refactor: replaced Dispatch to useQuery/Request of src/Components/Auth/log… (#6333)

* Refactor: replaced useDispatch to useQuery of src/Components/Auth/login.tsx

* fix:useQuery changed to Request

* feat: replaced dispatch with request

* fix: types and added pathparams

* fix: request body error

* Update Login.tsx

* change:Tres to Tbody

* fixes: response type change

* Update package-lock.json

* fix hover height (#6352)

* Split routes of App Router (#6363)

* Prescription: show prescribed on & by and discontinued date in detail card (#6365)

* Fixed bug in location picker in update facility page (#6377)

* add all cases for map rendering

* implement location pointer on searched location

* Added cam auto reset in asset config page (#6375)

* 💊 Adds support for editing prescriptions +  Adds `useSlug` hook (#6369)

* Adds hook: `useSlug`

* bug fix: NumericWithUnits field not showing intial value

* Form: support for showing global errors

* Adds support for editing prescriptions (fixes #6340)

* Fix cypress

* fix cypress

* Improve design

---------

Co-authored-by: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <mail@rithviknishad.dev>
Co-authored-by: Aaron Jevil Nazareth <93522968+jevil25@users.noreply.github.com>
Co-authored-by: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com>
Co-authored-by: Gampa Sri Harsh <114745442+sriharsh05@users.noreply.github.com>
Co-authored-by: Tasnimul H. Tauhid <thtauhid.71@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants