Skip to content

Commit 8642629

Browse files
authored
[Comp-840]compliant and inspection set default filter to status open (#758)
1 parent db45f6c commit 8642629

File tree

3 files changed

+16
-17
lines changed

3 files changed

+16
-17
lines changed

compliance-web/src/components/App/Inspections/InspectionsGrid/InspectionsGridUtils.tsx

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import { Inspection } from "@/models/Inspection";
99
import { Initiation } from "@/models/Initiation";
1010
import { IRProgress } from "@/models/IRProgress";
1111
import { Project } from "@/models/Project";
12-
import { IRStatus } from "@/models/IRStatus";
12+
import { InspectionStatusEnum } from "@/utils/constants";
1313

1414
// Types for the data dependencies
1515
export interface InspectionsGridDataDependencies {
1616
projectList?: Project[];
1717
initiationList?: Initiation[];
1818
irProgressList?: IRProgress[];
1919
staffUserList?: StaffUser[];
20-
inspectionStatusList?: IRStatus[];
20+
inspectionStatusListOptions?: { text: string; value: string }[];
2121
}
2222

2323
// Convert column filters to API query parameters
@@ -107,9 +107,10 @@ export const useInspectionsGridColumns = (
107107
initiationList,
108108
irProgressList,
109109
staffUserList,
110-
inspectionStatusList,
110+
inspectionStatusListOptions,
111111
} = dataDependencies;
112112

113+
113114
return useMemo<MRT_ColumnDef<Inspection>[]>(
114115
() => [
115116
{
@@ -186,7 +187,7 @@ export const useInspectionsGridColumns = (
186187
<Chip
187188
label={row.original.inspection_status}
188189
color={
189-
row.original.inspection_status?.toLowerCase() === "open"
190+
row.original.inspection_status === InspectionStatusEnum.OPEN
190191
? "success"
191192
: "error"
192193
}
@@ -198,11 +199,7 @@ export const useInspectionsGridColumns = (
198199
);
199200
},
200201
filterVariant: "multi-select",
201-
filterSelectOptions:
202-
inspectionStatusList?.map((inspectionStatus) => ({
203-
text: inspectionStatus.name,
204-
value: inspectionStatus.id.toString(),
205-
})) ?? [],
202+
filterSelectOptions: inspectionStatusListOptions,
206203
size: 80,
207204
},
208205
{
@@ -220,6 +217,6 @@ export const useInspectionsGridColumns = (
220217
),
221218
},
222219
],
223-
[projectList, initiationList, irProgressList, staffUserList, inspectionStatusList]
220+
[projectList, initiationList, irProgressList, staffUserList, inspectionStatusListOptions]
224221
);
225222
};

compliance-web/src/routes/_authenticated/ce-database/complaints/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import ComplaintsGridExport from "@/components/App/Complaints/ComplaintsGrid/Com
3232
import ShowOnlyMyComplaintsSwitch from "@/components/App/Complaints/ComplaintsGrid/ShowOnlyMyComplaintsSwitch";
3333
import { AppConfig } from "@/utils/config";
3434
import { StaffUser } from "@/models/Staff";
35-
import { STAFF_USER_POSITION } from "@/utils/constants";
35+
import { ComplaintStatusEnum, STAFF_USER_POSITION } from "@/utils/constants";
3636

3737
export const Route = createFileRoute("/_authenticated/ce-database/complaints/")(
3838
{ component: Complaints }
@@ -59,6 +59,7 @@ const createDefaultFilters = (staffId: string, defaultMyChecked: boolean): {
5959
primary_officer_ids: [staffId],
6060
},
6161
columnFilters: [
62+
{ id: "status", value: [ComplaintStatusEnum.OPEN] },
6263
{
6364
id: "primary_officer_ids",
6465
value: [staffId],
@@ -68,7 +69,7 @@ const createDefaultFilters = (staffId: string, defaultMyChecked: boolean): {
6869
}
6970
return {
7071
externalFilters: {},
71-
columnFilters: [],
72+
columnFilters: [{ id: "status", value: [ComplaintStatusEnum.OPEN] }],
7273
};
7374
}
7475

compliance-web/src/routes/_authenticated/ce-database/inspections/index.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ const createDefaultFilters = (staffId: string, defaultMyChecked: boolean): {
5555
primary_officer_ids: [staffId],
5656
},
5757
columnFilters: [
58+
{ id: "status", value: [InspectionStatusEnum.OPEN] },
5859
{
5960
id: "primary_officer",
6061
value: [staffId],
@@ -64,7 +65,7 @@ const createDefaultFilters = (staffId: string, defaultMyChecked: boolean): {
6465
}
6566
return {
6667
externalFilters: {},
67-
columnFilters: [],
68+
columnFilters: [{ id: "status", value: [InspectionStatusEnum.OPEN] }],
6869
};
6970
}
7071

@@ -85,9 +86,9 @@ export function Inspections() {
8586

8687
const inspectionStatusOptions = useMemo(
8788
() =>
88-
Object.entries(InspectionStatusEnum).map(([id, name]) => ({
89-
id,
90-
name,
89+
Object.entries(InspectionStatusEnum).map(([, value]) => ({
90+
text: value,
91+
value,
9192
})),
9293
[]
9394
);
@@ -334,7 +335,7 @@ export function Inspections() {
334335
initiationList: initiations,
335336
irProgressList: irProgressOptions,
336337
staffUserList: staffList,
337-
inspectionStatusList: inspectionStatusOptions,
338+
inspectionStatusListOptions: inspectionStatusOptions,
338339
});
339340

340341
// Show loading state during initialization

0 commit comments

Comments
 (0)