feat(datatable): adapt input fields for filter values

Loxeris · Aug 30, 2024 · 3b47ea7 · 3b47ea7
1 parent aea2f06
commit 3b47ea7
Show file tree

Hide file tree

Showing 8 changed files with 301 additions and 69 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/diracx-web-components/components/JobMonitor/JobDataTable.tsx b/packages/diracx-web-components/components/JobMonitor/JobDataTable.tsx
@@ -82,17 +82,39 @@ const renderStatusCell = (status: string) => {
  * The head cells for the data grid (desktop version)
  */
 const headCells: Column[] = [
-  { id: "JobID", label: "Job ID" },
+  { id: "JobID", label: "Job ID", type: "number" },
   { id: "JobName", label: "Job Name" },
   { id: "Site", label: "Site" },
-  { id: "Status", label: "Status", render: renderStatusCell },
+  {
+    id: "Status",
+    label: "Status",
+    render: renderStatusCell,
+    type: [
+      "Submitting",
+      "Received",
+      "Checking",
+      "Staging",
+      "Waiting",
+      "Matched",
+      "Running",
+      "Rescheduled",
+      "Completing",
+      "Completed",
+      "Done",
+      "Failed",
+      "Stalled",
+      "Killed",
+      "Deleted",
+    ].sort(),
+  },
   {
     id: "MinorStatus",
     label: "Minor Status",
   },
   {
     id: "SubmissionTime",
     label: "Submission Time",
+    type: "DateTime",
   },
 ];
 

diff --git a/packages/diracx-web-components/components/shared/DataTable.tsx b/packages/diracx-web-components/components/shared/DataTable.tsx
@@ -363,6 +363,7 @@ export function DataTable(props: DataTableProps) {
       parameter: filter.column,
       operator: filter.operator,
       value: filter.value,
+      values: filter.values,
     }));
     setSearchBody({ search: jsonFilters });
     setPage(0);
@@ -386,18 +387,12 @@ export function DataTable(props: DataTableProps) {
     if (SectionItem?.data?.filters) {
       setFilters(SectionItem.data.filters);
       setAppliedFilters(SectionItem.data.filters);
-      const jsonFilters = SectionItem.data.filters.map(
-        (filter: {
-          id: number;
-          column: string;
-          operator: string;
-          value: string;
-        }) => ({
-          parameter: filter.column,
-          operator: filter.operator,
-          value: filter.value,
-        }),
-      );
+      const jsonFilters = SectionItem.data.filters.map((filter: Filter) => ({
+        parameter: filter.column,
+        operator: filter.operator,
+        value: filter.value,
+        values: filter.values,
+      }));
       setSearchBody({ search: jsonFilters });
     } else {
       setFilters([]);