Added custom filter to scan overview

src/components/cards/CardsOverview.svelte

@@ -23,6 +23,7 @@
   import CardStatus from "./CardStatus.svelte";
   import CardRunner from "./CardRunner.svelte";
   import { onMount } from "svelte";
+  import { runnerFilter } from "../shared/tablefilters";
 
   export let edit_modal_open = false;
   export let runner = {};
@@ -47,11 +48,11 @@
     },
     {
       accessorKey: "runner",
-      header: () => $_("name"),
+      header: () => $_("runner"),
       cell: (info) => {
         return renderComponent(CardRunner, { runner: info.getValue() });
       },
-      filterFn: `includesString`,
+      filterFn: `runner`,
     },
     {
       accessorKey: "enabled",
@@ -96,6 +97,9 @@
         pageSize: 50,
       },
     },
+    filterFns: {
+      runner: runnerFilter,
+    },
     enableRowSelection: true,
     getCoreRowModel: getCoreRowModel(),
     getFilteredRowModel: getFilteredRowModel(),

src/components/scans/ScansOverview.svelte

@@ -19,6 +19,7 @@
   import ScansEmptyState from "./ScansEmptyState.svelte";
   import InputElement from "../shared/InputElement.svelte";
   import TableActions from "../shared/TableActions.svelte";
+  import { runnerFilter } from "../shared/tablefilters";
 
   $: selectedScans =
     $table?.getSelectedRowModel().rows.map((row) => row.original) || [];
@@ -75,6 +76,7 @@
         const runner = info.getValue();
         return `#${runner.id} - ${runner.firstname} ${runner.lastname}`;
       },
+      filterFn: `runner`,
       enableColumnFilter: true,
     },
     {
@@ -133,6 +135,9 @@
         pageSize: 50,
       },
     },
+    filterFns: {
+      runner: runnerFilter,
+    },
     enableRowSelection: true,
     getCoreRowModel: getCoreRowModel(),
     getFilteredRowModel: getFilteredRowModel(),

src/components/shared/tablefilters.js

@@ -12,4 +12,18 @@ export const groupFilter = (row, columnId, value) => {
             group.parentGroup.name.toLowerCase().includes(value.toLowerCase())
         );
     }
+};
+export const runnerFilter = (row, columnId, value) => {
+    const runner = row.getValue(columnId);
+    if(!runner && value == "blanko"){return true}
+    if(!runner){return false}
+
+    if(value.startsWith("#")){
+        return runner.id == value.replace("#","")
+    }
+
+    if(runner.middlename){
+        return `${runner.firstname} ${runner.middlename} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase())
+    }
+    return `${runner.firstname} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase())
 };