fix(ui): Filter when not defined sourcePath and case insensitive

pando85 · Jan 23, 2024 · 872e7e9 · 872e7e9
1 parent e4fe0d8
commit 872e7e9
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/server/web/ui/src/JobTable.tsx b/server/web/ui/src/JobTable.tsx
@@ -223,19 +223,23 @@ const JobTable: React.FC<JobTableProps> = ({ token, setShowJobTable }) => {
       }
     };
 
-    jobs.forEach((job) => fetchJobDetails(job.id));
-    const statusFilteredJobs = selectedStatusFilter.length > 0
-      ? jobs.filter((job) => selectedStatusFilter.includes(job.status))
-      : jobs;
-
-    const dateFilteredJobs = selectedDateFilter ? statusFilteredJobs.filter(
-      (job) => job.last_update >= getDateFromFilterOption(selectedDateFilter))
-      : statusFilteredJobs
-
-    const filteredJobs = nameFilter
-      ? dateFilteredJobs.filter((job) => job.sourcePath.includes(nameFilter))
-      : dateFilteredJobs;
-    setFilteredJobs(filteredJobs);
+    const filterJobs = async () => {
+      await jobs.forEach((job) => fetchJobDetails(job.id));
+      const statusFilteredJobs = selectedStatusFilter.length > 0
+        ? jobs.filter((job) => selectedStatusFilter.includes(job.status))
+        : jobs;
+
+      const dateFilteredJobs = selectedDateFilter ? statusFilteredJobs.filter(
+        (job) => job.last_update >= getDateFromFilterOption(selectedDateFilter))
+        : statusFilteredJobs
+
+      const filteredJobs = nameFilter
+        ? dateFilteredJobs.filter((job) => job.sourcePath ? job.sourcePath.toLowerCase().includes(nameFilter.toLowerCase()) : false)
+        : dateFilteredJobs;
+      setFilteredJobs(filteredJobs);
+    };
+
+    filterJobs();
   }, [token, jobs, fetchedDetails, selectedStatusFilter, selectedDateFilter, nameFilter, isSmallScreen]);
 
   const deleteJobDetail = (jobId: string) => {