insights->filtering (#2243)

epictrack-web/src/components/insights/Work/Tabs/Partners/charts/WorkList.tsx

@@ -38,9 +38,19 @@ const WorkList = () => {
       showNotification("Error fetching works", { type: "error" });
     }
   }, [error]);
-
   const federalInvolvements = useMemo(() => {
-    return Array.from(new Set(works.map((w) => w?.federal_involvement?.name)));
+    return Array.from(
+      new Set(
+        [...works]
+          .sort(
+            (a, b) =>
+              Number(a?.federal_involvement?.sort_order) -
+              Number(b?.federal_involvement?.sort_order)
+          )
+          .filter((p) => p.federal_involvement)
+          .map((w) => w?.federal_involvement?.name)
+      )
+    );
   }, [works]);
 
   const ministries = useMemo(() => {

epictrack-web/src/models/federalInvolvement.ts

@@ -0,0 +1,5 @@
+import { ListType } from "./code";
+
+export type FederalInvolvement = {
+    sort_order?: number;
+} & ListType;

epictrack-web/src/models/work.ts

@@ -1,4 +1,5 @@
 import { ListType } from "./code";
+import { FederalInvolvement } from "./federalInvolvement";
 import { Ministry } from "./ministry";
 import { Staff } from "./staff";
 import { MasterBase } from "./type";
@@ -50,7 +51,7 @@ export interface Work extends MasterBase {
   ministry: Ministry;
   ea_act: ListType;
   eao_team: ListType;
-  federal_involvement: ListType;
+  federal_involvement: FederalInvolvement;
   responsible_epd: Staff;
   work_lead: Staff;
   work_type: ListType;

epictrack-web/src/utils/index.ts

@@ -7,13 +7,13 @@ const sort = (collection: any[], sortField: string) => {
     sensitivity: "base",
   });
   const keys = sortField.split(".");
-  if (keys && keys.length === 0) {
+  if (keys.length > 1) {
     return collection.sort(function (a, b) {
-      return collator.compare(a[sortField], b[sortField]);
+      return collator.compare(a[keys[0]][keys[1]], b[keys[0]][keys[1]]);
     });
   } else {
     return collection.sort(function (a, b) {
-      return collator.compare(a[keys[0]][keys[1]], b[keys[0]][keys[1]]);
+      return collator.compare(a[sortField], b[sortField]);
     });
   }
 };