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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 25 commits into from
Jun 21, 2023
Merged

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

Changes from 7 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
96fcc41
Merge pull request #1 from coronasafe/develop
JahnabDutta May 26, 2023
c348b50
Change MUI components to CARE components in ResultList.tsx
JahnabDutta May 26, 2023
b1fea78
Merge pull request #2 from coronasafe/develop
JahnabDutta May 26, 2023
393e374
Merge pull request #3 from coronasafe/develop
JahnabDutta May 26, 2023
0657d09
Merge branch 'develop' into develop
khavinshankar May 30, 2023
5296973
Merge branch 'coronasafe:develop' into develop
JahnabDutta May 31, 2023
a8eec96
replace MUI components in src/Components/Shifting/ListFilter.tsx
JahnabDutta May 31, 2023
a4c0702
change LegacySelectField to SelectFormField
JahnabDutta May 31, 2023
8ab013c
fix handChange issue
JahnabDutta May 31, 2023
b7c14e0
Merge branch 'develop' into develop
khavinshankar Jun 1, 2023
2cd2d15
Merge branch 'coronasafe:develop' into develop
JahnabDutta Jun 2, 2023
2be8dc5
fix shiftFilter issues
JahnabDutta Jun 2, 2023
ecf8294
add cypress tests
JahnabDutta Jun 2, 2023
f4016fd
Merge branch 'develop' into develop
nihal467 Jun 5, 2023
7b53f44
change DateRangePicker to DateRangeFormField and add cpyress tests
JahnabDutta Jun 5, 2023
ffff958
Merge original repository to develop repository
JahnabDutta Jun 5, 2023
2e4a9c0
CareUI: Adds `UserAutocompleteFormField` and used it in Assigned To f…
rithviknishad Jun 8, 2023
142f5ca
delete unused `UserSelect2`
rithviknishad Jun 8, 2023
eb3baaf
Merge branch 'develop' into tailwind/userautocompleteformfield
nihal467 Jun 9, 2023
b405d68
Merge branch 'develop' into tailwind/userautocompleteformfield
nihal467 Jun 10, 2023
aa9b9df
Merge branch 'coronasafe:develop' into develop
JahnabDutta Jun 11, 2023
2161dbf
change UserSelect to UserAutoCompleteFormField in ListFilter.tsx and …
JahnabDutta Jun 11, 2023
dc602d3
remove unnecessary grid around DateRangeFormField
JahnabDutta Jun 13, 2023
cc5342f
replace FieldLabel with SelectFormField label
JahnabDutta Jun 13, 2023
65761b2
resolve merge confilcts with ListFilter and cypress test
JahnabDutta Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/Components/Shifting/ListFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import {
SHIFTING_CHOICES_WARTIME,
} from "../../Common/constants";
import { getAnyFacility, getUserList } from "../../Redux/actions";

import { CircularProgress } from "@material-ui/core";
import CircularProgress from "../Common/components/CircularProgress";
import { FacilitySelect } from "../Common/FacilitySelect";
import { FieldChangeEvent } from "../Form/FormFields/Utils";
import { FieldLabel } from "../Form/FormFields/FormField";
Expand Down Expand Up @@ -291,7 +290,7 @@ export default function ListFilter(props: any) {
<FieldLabel>{t("origin_facility")}</FieldLabel>
<div className="">
{isOriginLoading ? (
<CircularProgress size={20} />
<CircularProgress className="h-5 w-5" />
) : (
<FacilitySelect
multiple={false}
Expand All @@ -310,7 +309,7 @@ export default function ListFilter(props: any) {
<FieldLabel>{t("shifting_approving_facility")}</FieldLabel>
<div className="">
{isShiftingLoading ? (
<CircularProgress size={20} />
<CircularProgress className="h-5 w-5" />
) : (
<FacilitySelect
multiple={false}
Expand All @@ -331,7 +330,7 @@ export default function ListFilter(props: any) {
<FieldLabel>{t("assigned_facility")}</FieldLabel>
<div className="">
{isAssignedLoading ? (
<CircularProgress size={20} />
<CircularProgress className="h-5 w-5" />
) : (
<FacilitySelect
multiple={false}
Expand All @@ -348,7 +347,7 @@ export default function ListFilter(props: any) {
<div>
<FieldLabel>{t("assigned_to")}</FieldLabel>
{isAssignedUserLoading ? (
<CircularProgress size={20} />
<CircularProgress className="h-5 w-5" />
) : (
<UserSelect
name="assigned_to"
Expand Down