Replace Material UI components in src/Components/Shifting/ListFilter.tsx. Fixes #4996

[JahnabDutta]

WHAT

Replacing of the Material UI CircularProgress present in src/Components/Shifting/ListFilter.tsx with the Care common component CircularProgress.

Proposed Changes

• Fixes Replace Material UI components in src/Components/Shifting/ListFilter.tsx: #4996
• Change MUI CircularProgress Icon to Care common component CircularProgress.
• Video comparison(Top is Care common component and bottom is MUI component)
  comparison.webm

@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

• Remove MUI CircularProgress component
• Import CircularProgress from src/Commom/Components/CircularProgress and replace it where MUI component was used.
• Change size of CircularProgress to be similar to the MUI component.

[vercel]

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	Jun 13, 2023 11:15am

[netlify]

✅ Deploy Preview for care-egov-staging ready!

Name	Link
🔨 Latest commit	65761b2
🔍 Latest deploy log	https://app.netlify.com/sites/care-egov-staging/deploys/64884f85c08c1f0008f0c023
😎 Deploy Preview	https://deploy-preview-5572--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 settings.

[rithviknishad]

You've not changed LegacySelectField to SelectFormField

[JahnabDutta]

Hey, could you let me know where do I have to go to on my localserver website to view the changes being made in the form.

[rithviknishad]

Open the filters in the shifting page.

[JahnabDutta]

I have tried changing the LegacySelectField to SelectFormField. Could you please review again?

[khavinshankar]

@JahnabDutta can you also fix the cypress tests

check this action for the failing tests
https://github.com/coronasafe/care_fe/actions/runs/5142676229/jobs/9263088413?pr=5572

[JahnabDutta]

I tried to modify some functions to match the code in development but it appears that there is some kind of problem with the original code too because of which the filters are not working properly. There are some things which are not clear to me? Some fields have the value "--". Is this a type of valid option or is it just supposed to mean "Show all". The way this has been configured is not clear to me.

[rithviknishad]

Consider refactoring '--' away.
'--' as of now means 'Filter not applied'

You may make the filters behaviour / value consistent with other filters like Patient Filters / Asset Filter / Facility Filter.

[JahnabDutta]

@rithviknishad I have merged #5626 and made the requested changes. I have modified the cypress tests as well. Please review it if possible and let me know if it the changes are okay.
Thanks!!

[JahnabDutta]

Hey @rithviknishad, I've made the requested changes. LMK if there's anything else as well.

[github-actions]

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

[JahnabDutta]

I tried using the following command to rebase-

However, I did not have any success. How do I solve the conflicts?

[rithviknishad]

I do it without rebase.

git merge develop
git checkout <pr-branch>
git merge develop

# Resolve conflicts in editor
# continue merge with merge commit

[rithviknishad]

Its a small conflict so you can just use github's editor itself if you want

[nihal467]

LGTM