feat: Filter jobs on name

superstreamerapp · Aug 29, 2024 · f699140 · f699140
1 parent 8126829
commit f699140
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 31 deletions.
diff --git a/packages/dashboard/src/components/JobsFilter.tsx b/packages/dashboard/src/components/JobsFilter.tsx
@@ -5,11 +5,9 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
+import { filterJobs } from "@/lib/jobs-filter";
 import type { JobDto } from "@/tsr";
 import type { JobsFilterData } from "./types";
-import { Button } from "@/components/ui/button";
-import { X } from "lucide-react";
-import { filterJobs } from "@/lib/jobs-filter";
 
 type JobsFilterProps = {
   jobs: JobDto[];
@@ -25,38 +23,65 @@ export function JobsFilter({ jobs, filter, onChange }: JobsFilterProps) {
     return acc;
   }, []);
 
+  const names = jobs.reduce<string[]>((acc, job) => {
+    if (!acc.includes(job.name)) {
+      acc.push(job.name);
+    }
+    return acc;
+  }, []);
+
   const filteredJobs = filterJobs(jobs, filter);
 
+  let tagValue = filter.tag;
+  if (tagValue === null) {
+    tagValue = "all";
+  }
+
+  const onTagChange = (value: string) => {
+    const tag = value === "all" ? null : value;
+    onChange({ tag });
+  };
+
+  let nameValue = filter.name;
+  if (nameValue === null) {
+    nameValue = "all";
+  }
+
+  const onNameChange = (value: string) => {
+    const name = value === "all" ? null : value;
+    onChange({ name });
+  };
+
   return (
     <div className="flex gap-2">
       <div className="grow flex items-center">{filteredJobs.length} jobs</div>
-      <div className="flex">
-        {filter.tag ? (
-          <div className="h-10 flex items-center">
-            {filter.tag}
-            <Button
-              variant="secondary"
-              className="ml-2"
-              size="icon"
-              onClick={() => onChange({ tag: null })}
-            >
-              <X className="w-4 h-4" />
-            </Button>
-          </div>
-        ) : (
-          <Select onValueChange={(tag) => onChange({ tag })}>
-            <SelectTrigger className="w-[180px]">
-              <SelectValue placeholder="Select tag" />
-            </SelectTrigger>
-            <SelectContent>
-              {tags.map((tag) => (
-                <SelectItem key={tag} value={tag}>
-                  {tag}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-        )}
+      <div className="flex gap-2">
+        <Select value={nameValue} onValueChange={onNameChange}>
+          <SelectTrigger className="w-[180px]">
+            <SelectValue placeholder="Select tag" />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="all">name: all</SelectItem>
+            {names.map((name) => (
+              <SelectItem key={name} value={name}>
+                name: {name}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+        <Select value={tagValue} onValueChange={onTagChange}>
+          <SelectTrigger className="w-[180px]">
+            <SelectValue placeholder="Select tag" />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="all">tag: all</SelectItem>
+            {tags.map((tag) => (
+              <SelectItem key={tag} value={tag}>
+                tag: {tag}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
       </div>
     </div>
   );

diff --git a/packages/dashboard/src/components/types.ts b/packages/dashboard/src/components/types.ts
@@ -1,3 +1,4 @@
 export type JobsFilterData = {
   tag: string | null;
+  name: string | null;
 };
diff --git a/packages/dashboard/src/lib/jobs-filter.ts b/packages/dashboard/src/lib/jobs-filter.ts
@@ -6,5 +6,9 @@ export function filterJobs(jobs: JobDto[], filter: JobsFilterData) {
     jobs = jobs.filter((job) => job.tag === filter.tag);
   }
 
+  if (filter.name) {
+    jobs = jobs.filter((job) => job.name === filter.name);
+  }
+
   return jobs;
 }
diff --git a/packages/dashboard/src/pages/JobPage.tsx b/packages/dashboard/src/pages/JobPage.tsx
@@ -15,7 +15,7 @@ export function JobPage() {
   const { job, rootTree } = data.body;
 
   return (
-    <div className="flex flex-col grow bg-white">
+    <div className="min-h-full flex flex-col grow bg-white">
       <div className="p-2 border-b border-border">
         <Button asChild variant="ghost">
           <Link to="/jobs">Jobs</Link>

diff --git a/packages/dashboard/src/pages/JobsPage.tsx b/packages/dashboard/src/pages/JobsPage.tsx
@@ -13,6 +13,7 @@ export function JobsPage() {
 
   const [filter, setFilter] = useQueryParams<JobsFilterData>({
     tag: null,
+    name: null,
   });
 
   return (