From aa34fe7838a2e7b4332f0bfc1bb2370ce49dc9a7 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Fri, 17 Apr 2026 15:23:11 -0500
Subject: [PATCH 01/13] fix being able to accept multiple times by invite code

---
 src/invites/mutations/acceptInvite.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/invites/mutations/acceptInvite.ts b/src/invites/mutations/acceptInvite.ts
index bd1f9744..02ad9064 100644
--- a/src/invites/mutations/acceptInvite.ts
+++ b/src/invites/mutations/acceptInvite.ts
@@ -226,12 +226,9 @@ export default resolver.pipe(
       ctx
     )
 
-    // Delete invitation(s) for that email and project Id
-    await db.invitation.deleteMany({
-      where: {
-        email: invite.email,
-        projectId: invite.projectId,
-      },
+    // Delete this specific invitation by id so it can only be used once
+    await db.invitation.delete({
+      where: { id: invite.id },
     })
 
     return project

From d7216e93110e7424fda38b103a87fdcd2923b6a6 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Fri, 17 Apr 2026 15:48:49 -0500
Subject: [PATCH 02/13] fix task refresh on window tab switching

---
 src/blitz-client.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/blitz-client.ts b/src/blitz-client.ts
index db1b392d..33833cd8 100644
--- a/src/blitz-client.ts
+++ b/src/blitz-client.ts
@@ -7,5 +7,14 @@ export const authConfig = {
 }
 
 export const { withBlitz } = setupBlitzClient({
-  plugins: [AuthClientPlugin(authConfig), BlitzRpcPlugin({})],
+  plugins: [
+    AuthClientPlugin(authConfig),
+    BlitzRpcPlugin({
+      reactQueryOptions: {
+        queries: {
+          refetchOnWindowFocus: false,
+        },
+      },
+    }),
+  ],
 })

From 67a8fbd43b84214b569e96482cde4668cf9d2fa1 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Fri, 17 Apr 2026 15:48:57 -0500
Subject: [PATCH 03/13] fix issue with new task flashing

---
 src/pages/projects/[projectId]/tasks/new.tsx | 264 +++++++++----------
 1 file changed, 129 insertions(+), 135 deletions(-)

diff --git a/src/pages/projects/[projectId]/tasks/new.tsx b/src/pages/projects/[projectId]/tasks/new.tsx
index bc3ecc2b..d9bcf401 100644
--- a/src/pages/projects/[projectId]/tasks/new.tsx
+++ b/src/pages/projects/[projectId]/tasks/new.tsx
@@ -15,6 +15,135 @@ import Link from "next/link"
 import { InformationCircleIcon } from "@heroicons/react/24/outline"
 import { Tooltip } from "react-tooltip"
 
+const mapTaskToInitialValues = (task: any) => {
+  if (!task) return undefined
+
+  const initial: any = {}
+
+  // Only copy simple text/date/ids
+  if (typeof task.name === "string" && task.name.trim()) initial.name = `${task.name} (Copy)`
+  if ("description" in task) initial.description = task.description ?? null
+  if ("milestoneId" in task) initial.milestoneId = task.milestoneId ?? null
+  if ("deadline" in task && task.deadline) initial.deadline = new Date(task.deadline)
+  if ("formVersionId" in task) initial.formVersionId = task.formVersionId ?? null
+  if ("startDate" in task && task.startDate) initial.startDate = new Date(task.startDate)
+  if ("containerId" in task) initial.containerId = task.containerId ?? null
+  if ("anonymous" in task) initial.anonymous = task.anonymous ?? false
+
+  // Map contributors/teams from assignedMembers if present (kept minimal)
+  if (Array.isArray((task as any).assignedMembers)) {
+    const assigned = (task as any).assignedMembers as any[]
+    const contributors: number[] = []
+    const teams: number[] = []
+    for (const m of assigned) {
+      const id = typeof m?.id === "number" ? m.id : undefined
+      const usersLen = Array.isArray(m?.users) ? m.users.length : 0
+      if (typeof id === "number") {
+        if (usersLen > 1) teams.push(id)
+        else contributors.push(id)
+      }
+    }
+    if (contributors.length) initial.projectMembersId = contributors
+    if (teams.length) initial.teamsId = teams
+  }
+
+  // Map roles if included
+  if (Array.isArray((task as any).roles)) {
+    const rids = (task as any).roles
+      .map((r: any) => (typeof r?.id === "number" ? r.id : undefined))
+      .filter((n: any) => typeof n === "number")
+    if (rids.length) initial.rolesId = rids
+  }
+
+  // Copy simple numeric ID arrays (no relation includes)
+  const toNumArray = (arr: any) =>
+    Array.isArray(arr)
+      ? arr
+          .map((v) => (v == null ? v : Number(v)))
+          .filter((v) => typeof v === "number" && !Number.isNaN(v))
+      : undefined
+
+  const roleIds = toNumArray((task as any).rolesId)
+  if (roleIds && roleIds.length) initial.rolesId = roleIds
+
+  const memberIds = toNumArray((task as any).projectMembersId)
+  if (memberIds && memberIds.length) initial.projectMembersId = memberIds
+
+  const teamIds = toNumArray((task as any).teamsId)
+  if (teamIds && teamIds.length) initial.teamsId = teamIds
+
+  // Copy tags in UI shape expected by the tag input ({ id, text })
+  if (Array.isArray((task as any).tags)) {
+    const src = (task as any).tags as any[]
+    const uiTags = src
+      .map((t) => {
+        if (!t) return undefined
+        if (typeof t === "object") {
+          if ("id" in t && "text" in t && typeof t.id === "string" && typeof t.text === "string") {
+            return { id: t.id, text: t.text }
+          }
+          if (
+            "key" in t &&
+            "value" in t &&
+            typeof (t as any).key === "string" &&
+            typeof (t as any).value === "string"
+          ) {
+            return { id: (t as any).key, text: (t as any).value }
+          }
+        }
+        if (typeof t === "string") return { id: t, text: t }
+        return undefined
+      })
+      .filter(Boolean)
+    if (uiTags.length) initial.tags = uiTags as { id: string; text: string }[]
+  }
+
+  return initial
+}
+
+const TaskFormWrapper = ({ projectId, onSubmit, onCancel, schema }: any) => {
+  const router = useRouter()
+  const copyFromTaskIdParam = router.query.copyFromTaskId
+  const copyFromTaskId =
+    typeof copyFromTaskIdParam === "string"
+      ? parseInt(copyFromTaskIdParam, 10)
+      : Array.isArray(copyFromTaskIdParam)
+      ? parseInt(copyFromTaskIdParam[0]!, 10)
+      : undefined
+
+  const [sourceTask] = useQuery(
+    getTask,
+    {
+      where: { id: copyFromTaskId ?? -1 },
+      include: {
+        assignedMembers: { include: { users: { select: { id: true } } } },
+        roles: { select: { id: true } },
+      },
+    },
+    {
+      enabled: Boolean(copyFromTaskId),
+      suspense: false,
+      refetchOnWindowFocus: false,
+      refetchOnReconnect: false,
+    }
+  )
+
+  const initialValues = mapTaskToInitialValues(sourceTask)
+
+  return (
+    <TaskForm
+      className="flex flex-col"
+      projectId={projectId}
+      submitText="Create Task"
+      schema={schema}
+      onSubmit={onSubmit}
+      onCancel={onCancel}
+      cancelText="Cancel"
+      {...(initialValues ? { initialValues } : {})}
+    />
+  )
+}
+
 const NewTaskPage = () => {
   const router = useRouter()
   const [createTaskMutation] = useMutation(createTask)
@@ -61,141 +190,6 @@ const NewTaskPage = () => {
     }
   }
 
-  const mapTaskToInitialValues = (task: any) => {
-    if (!task) return undefined
-
-    const initial: any = {}
-
-    // Only copy simple text/date/ids
-    if (typeof task.name === "string" && task.name.trim()) initial.name = `${task.name} (Copy)`
-    if ("description" in task) initial.description = task.description ?? null
-    if ("milestoneId" in task) initial.milestoneId = task.milestoneId ?? null
-    if ("deadline" in task && task.deadline) initial.deadline = new Date(task.deadline)
-    if ("formVersionId" in task) initial.formVersionId = task.formVersionId ?? null
-    if ("startDate" in task && task.startDate) initial.startDate = new Date(task.startDate)
-    if ("containerId" in task) initial.containerId = task.containerId ?? null
-    if ("anonymous" in task) initial.anonymous = task.anonymous ?? false
-
-    // Map contributors/teams from assignedMembers if present (kept minimal)
-    if (Array.isArray((task as any).assignedMembers)) {
-      const assigned = (task as any).assignedMembers as any[]
-      const contributors: number[] = []
-      const teams: number[] = []
-      for (const m of assigned) {
-        const id = typeof m?.id === "number" ? m.id : undefined
-        const usersLen = Array.isArray(m?.users) ? m.users.length : 0
-        if (typeof id === "number") {
-          if (usersLen > 1) teams.push(id)
-          else contributors.push(id)
-        }
-      }
-      if (contributors.length) initial.projectMembersId = contributors
-      if (teams.length) initial.teamsId = teams
-    }
-
-    // Map roles if included
-    if (Array.isArray((task as any).roles)) {
-      const rids = (task as any).roles
-        .map((r: any) => (typeof r?.id === "number" ? r.id : undefined))
-        .filter((n: any) => typeof n === "number")
-      if (rids.length) initial.rolesId = rids
-    }
-
-    // Copy simple numeric ID arrays (no relation includes)
-    const toNumArray = (arr: any) =>
-      Array.isArray(arr)
-        ? arr
-            .map((v) => (v == null ? v : Number(v)))
-            .filter((v) => typeof v === "number" && !Number.isNaN(v))
-        : undefined
-
-    const roleIds = toNumArray((task as any).rolesId)
-    if (roleIds && roleIds.length) initial.rolesId = roleIds
-
-    const memberIds = toNumArray((task as any).projectMembersId)
-    if (memberIds && memberIds.length) initial.projectMembersId = memberIds
-
-    const teamIds = toNumArray((task as any).teamsId)
-    if (teamIds && teamIds.length) initial.teamsId = teamIds
-
-    // Copy tags in UI shape expected by the tag input ({ id, text })
-    if (Array.isArray((task as any).tags)) {
-      const src = (task as any).tags as any[]
-      const uiTags = src
-        .map((t) => {
-          if (!t) return undefined
-          if (typeof t === "object") {
-            if (
-              "id" in t &&
-              "text" in t &&
-              typeof t.id === "string" &&
-              typeof t.text === "string"
-            ) {
-              return { id: t.id, text: t.text }
-            }
-            if (
-              "key" in t &&
-              "value" in t &&
-              typeof (t as any).key === "string" &&
-              typeof (t as any).value === "string"
-            ) {
-              return { id: (t as any).key, text: (t as any).value }
-            }
-          }
-          if (typeof t === "string") return { id: t, text: t }
-          return undefined
-        })
-        .filter(Boolean)
-      if (uiTags.length) initial.tags = uiTags as { id: string; text: string }[]
-    }
-
-    return initial
-  }
-
-  // Wrapper to handle copyFromTaskId and fetch the source task if needed
-  const TaskFormWrapper = ({ projectId, onSubmit, onCancel, schema }: any) => {
-    const router = useRouter()
-    const copyFromTaskIdParam = router.query.copyFromTaskId
-    const copyFromTaskId =
-      typeof copyFromTaskIdParam === "string"
-        ? parseInt(copyFromTaskIdParam, 10)
-        : Array.isArray(copyFromTaskIdParam)
-        ? parseInt(copyFromTaskIdParam[0]!, 10)
-        : undefined
-
-    const [sourceTask] = useQuery(
-      getTask,
-      {
-        where: { id: copyFromTaskId ?? -1 },
-        include: {
-          assignedMembers: { include: { users: { select: { id: true } } } },
-          roles: { select: { id: true } },
-        },
-      },
-      {
-        enabled: Boolean(copyFromTaskId),
-        suspense: false,
-        refetchOnWindowFocus: false,
-        refetchOnReconnect: false,
-      }
-    )
-
-    const initialValues = mapTaskToInitialValues(sourceTask)
-
-    return (
-      <TaskForm
-        className="flex flex-col"
-        projectId={projectId}
-        submitText="Create Task"
-        schema={schema}
-        onSubmit={onSubmit}
-        onCancel={onCancel}
-        cancelText="Cancel"
-        {...(initialValues ? { initialValues } : {})}
-      />
-    )
-  }
-
   return (
     // @ts-expect-error children are clearly passed below
     <Layout title="Create New Task">

From f7709661f7540e8dbe2babcd9ac999a6a226d1db Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Sat, 18 Apr 2026 11:49:44 -0500
Subject: [PATCH 04/13] adding in global search across pages

---
 src/core/components/Table.tsx                 | 22 +++++++++++++++----
 src/forms/components/FormsList.tsx            |  3 +++
 src/pages/forms/index.tsx                     |  8 +++++++
 src/pages/notifications/index.tsx             | 18 ++++++++++++++-
 .../[projectId]/notifications/index.tsx       | 18 ++++++++++++++-
 .../projects/[projectId]/teams/index.tsx      |  9 +++++++-
 src/pages/roles/index.tsx                     | 19 +++++++++++++++-
 src/roles/components/AllRolesList.tsx         |  3 +++
 src/roles/components/ContributorsTab.tsx      | 22 ++++++++++++++++---
 src/roles/components/RoleContributorTable.tsx |  3 +++
 src/tasks/components/AllTaskList.tsx          | 15 +++++++++++++
 src/tasks/components/ProjectTasksList.tsx     |  9 +++++++-
 src/tasks/hooks/useProjectTasksListData.ts    | 10 ++++++---
 13 files changed, 144 insertions(+), 15 deletions(-)

diff --git a/src/core/components/Table.tsx b/src/core/components/Table.tsx
index 6ee0d6f5..2fe2d10d 100644
--- a/src/core/components/Table.tsx
+++ b/src/core/components/Table.tsx
@@ -138,6 +138,7 @@ type TableProps<TData> = {
   onPaginationChange?: OnChangeFn<PaginationState>
   pageCount?: number
   pageSizeOptions?: number[]
+  onGlobalFilterChange?: (filter: string) => void
   classNames?: {
     table?: string
     thead?: string
@@ -191,6 +192,7 @@ const Table = <TData,>({
   onPaginationChange,
   pageCount: controlledPageCount,
   pageSizeOptions = [5, 10, 20, 30, 40, 50],
+  onGlobalFilterChange,
 }: TableProps<TData>) => {
   const [sorting, setSorting] = React.useState([])
   const [globalFilter, setGlobalFilter] = React.useState("")
@@ -239,15 +241,27 @@ const Table = <TData,>({
   const globalSearchTooltipId = React.useId()
 
   React.useEffect(() => {
-    if (!addPagination) {
-      return
-    }
-
+    if (!addPagination) return
     if (!manualPagination && pageCount > 0 && pageIndex >= pageCount) {
       table.setPageIndex(0)
     }
   }, [addPagination, pageCount, pageIndex, table, manualPagination])
 
+  const isFirstFilterRender = React.useRef(true)
+  React.useEffect(() => {
+    if (isFirstFilterRender.current) {
+      isFirstFilterRender.current = false
+      return
+    }
+    if (!addPagination) return
+    if (manualPagination) {
+      onGlobalFilterChange?.(globalFilter)
+    } else {
+      table.setPageIndex(0)
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [globalFilter])
+
   return (
     <>
       {enableGlobalSearch && (
diff --git a/src/forms/components/FormsList.tsx b/src/forms/components/FormsList.tsx
index 76ff6cce..5b9cf44e 100644
--- a/src/forms/components/FormsList.tsx
+++ b/src/forms/components/FormsList.tsx
@@ -11,6 +11,7 @@ type FormsListProps = {
   onPaginationChange?: OnChangeFn<PaginationState>
   pageCount?: number
   pageSizeOptions?: number[]
+  onGlobalFilterChange?: (filter: string) => void
 }
 
 export const FormsList = ({
@@ -20,6 +21,7 @@ export const FormsList = ({
   onPaginationChange,
   pageCount,
   pageSizeOptions,
+  onGlobalFilterChange,
 }: FormsListProps) => {
   const formsTableData = processForms(forms)
 
@@ -34,6 +36,7 @@ export const FormsList = ({
         onPaginationChange={onPaginationChange}
         pageCount={pageCount}
         pageSizeOptions={pageSizeOptions}
+        onGlobalFilterChange={onGlobalFilterChange}
       />
     </main>
   )
diff --git a/src/pages/forms/index.tsx b/src/pages/forms/index.tsx
index 6fcb3d18..380afc9a 100644
--- a/src/pages/forms/index.tsx
+++ b/src/pages/forms/index.tsx
@@ -25,6 +25,7 @@ const AllFormsPage = () => {
     pageIndex: 0,
     pageSize: 10,
   })
+  const [search, setSearch] = useState("")
 
   const paginationArgs = useMemo(
     () => ({
@@ -39,6 +40,7 @@ const AllFormsPage = () => {
     where: {
       user: { id: currentUser?.id },
       archived: false,
+      ...(search ? { name: { contains: search, mode: "insensitive" } } : {}),
     },
     orderBy: { id: "desc" },
     ...paginationArgs,
@@ -52,6 +54,11 @@ const AllFormsPage = () => {
     setPagination((prev) => (typeof updater === "function" ? updater(prev) : updater))
   }
 
+  const handleGlobalFilterChange = (filter: string) => {
+    setSearch(filter)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+  }
+
   return (
     // @ts-expect-error children are clearly passed below
     <Layout title="Forms">
@@ -91,6 +98,7 @@ const AllFormsPage = () => {
               onPaginationChange={handlePaginationChange}
               pageCount={pageCount}
               pageSizeOptions={[10, 25, 50, 100]}
+              onGlobalFilterChange={handleGlobalFilterChange}
             />
           </Card>
         </Suspense>
diff --git a/src/pages/notifications/index.tsx b/src/pages/notifications/index.tsx
index af240f53..035ce713 100644
--- a/src/pages/notifications/index.tsx
+++ b/src/pages/notifications/index.tsx
@@ -31,6 +31,7 @@ const NotificationContent = () => {
     pageIndex: 0,
     pageSize: 10,
   })
+  const [search, setSearch] = useState("")
 
   const baseWhere = useMemo<Prisma.NotificationWhereInput>(
     () => ({
@@ -51,8 +52,16 @@ const NotificationContent = () => {
           },
         },
       },
+      ...(search
+        ? {
+            OR: [
+              { type: { contains: search, mode: "insensitive" } },
+              { project: { name: { contains: search, mode: "insensitive" } } },
+            ],
+          }
+        : {}),
     }),
-    [currentUser]
+    [currentUser, search]
   )
 
   const paginationArgs = useMemo(
@@ -103,6 +112,12 @@ const NotificationContent = () => {
     disableGlobalSelection()
   }
 
+  const handleGlobalFilterChange = (filter: string) => {
+    setSearch(filter)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+    disableGlobalSelection()
+  }
+
   const handleActionCompleted = async () => {
     await refetch()
     resetSelection()
@@ -169,6 +184,7 @@ const NotificationContent = () => {
           onPaginationChange={handlePaginationChange}
           pageCount={pageCount}
           pageSizeOptions={[10, 25, 50, 100]}
+          onGlobalFilterChange={handleGlobalFilterChange}
         />
       </Card>
     </main>
diff --git a/src/pages/projects/[projectId]/notifications/index.tsx b/src/pages/projects/[projectId]/notifications/index.tsx
index f1a22586..117e6b3b 100644
--- a/src/pages/projects/[projectId]/notifications/index.tsx
+++ b/src/pages/projects/[projectId]/notifications/index.tsx
@@ -31,6 +31,7 @@ const NotificationContent = () => {
     pageIndex: 0,
     pageSize: 10,
   })
+  const [search, setSearch] = useState("")
 
   const baseWhere = useMemo<Prisma.NotificationWhereInput>(
     () => ({
@@ -40,8 +41,16 @@ const NotificationContent = () => {
         },
       },
       projectId: projectId ?? undefined,
+      ...(search
+        ? {
+            OR: [
+              { type: { contains: search, mode: "insensitive" } },
+              { project: { name: { contains: search, mode: "insensitive" } } },
+            ],
+          }
+        : {}),
     }),
-    [currentUser, projectId]
+    [currentUser, projectId, search]
   )
 
   const paginationArgs = useMemo(
@@ -93,6 +102,12 @@ const NotificationContent = () => {
     disableGlobalSelection()
   }
 
+  const handleGlobalFilterChange = (filter: string) => {
+    setSearch(filter)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+    disableGlobalSelection()
+  }
+
   const handleActionCompleted = async () => {
     await refetch()
     resetSelection()
@@ -158,6 +173,7 @@ const NotificationContent = () => {
           onPaginationChange={handlePaginationChange}
           pageCount={pageCount}
           pageSizeOptions={[10, 25, 50, 100]}
+          onGlobalFilterChange={handleGlobalFilterChange}
         />
       </Card>
     </main>
diff --git a/src/pages/projects/[projectId]/teams/index.tsx b/src/pages/projects/[projectId]/teams/index.tsx
index 9139ac00..2f4f9d9e 100644
--- a/src/pages/projects/[projectId]/teams/index.tsx
+++ b/src/pages/projects/[projectId]/teams/index.tsx
@@ -29,11 +29,12 @@ export const AllTeamList = ({ privilege, projectId }: AllTeamListProps) => {
     pageIndex: 0,
     pageSize: 10,
   })
+  const [search, setSearch] = useState("")
 
   const [{ projectMembers, count }] = usePaginatedQuery(getProjectMembers, {
     where: {
       projectId: projectId,
-      name: { not: null }, // Ensures the name in ProjectMember is non-null
+      name: { not: null, ...(search ? { contains: search, mode: "insensitive" } : {}) },
       users: {
         some: { id: { not: undefined } }, // Ensures there's at least one user
       },
@@ -67,6 +68,11 @@ export const AllTeamList = ({ privilege, projectId }: AllTeamListProps) => {
     setPagination((prev) => (typeof updater === "function" ? updater(prev) : updater))
   }
 
+  const handleGlobalFilterChange = (filter: string) => {
+    setSearch(filter)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+  }
+
   return (
     <div>
       <Table
@@ -78,6 +84,7 @@ export const AllTeamList = ({ privilege, projectId }: AllTeamListProps) => {
         onPaginationChange={handlePaginationChange}
         pageCount={pageCount}
         pageSizeOptions={[10, 25, 50, 100]}
+        onGlobalFilterChange={handleGlobalFilterChange}
       />
     </div>
   )
diff --git a/src/pages/roles/index.tsx b/src/pages/roles/index.tsx
index 40102354..cce02c64 100644
--- a/src/pages/roles/index.tsx
+++ b/src/pages/roles/index.tsx
@@ -17,6 +17,7 @@ const RoleBuilderPage = () => {
     pageIndex: 0,
     pageSize: 10,
   })
+  const [search, setSearch] = useState("")
 
   const paginationArgs = useMemo(
     () => ({
@@ -27,7 +28,17 @@ const RoleBuilderPage = () => {
   )
 
   const [{ roles, count }, { refetch: refetchPagedRoles }] = usePaginatedQuery(getRoles, {
-    where: { user: { id: currentUser?.id } },
+    where: {
+      user: { id: currentUser?.id },
+      ...(search
+        ? {
+            OR: [
+              { name: { contains: search, mode: "insensitive" } },
+              { taxonomy: { contains: search, mode: "insensitive" } },
+            ],
+          }
+        : {}),
+    },
     orderBy: { id: "asc" },
     ...paginationArgs,
   })
@@ -59,6 +70,11 @@ const RoleBuilderPage = () => {
     setPagination((prev) => (typeof updater === "function" ? updater(prev) : updater))
   }
 
+  const handleGlobalFilterChange = (filter: string) => {
+    setSearch(filter)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+  }
+
   return (
     // @ts-expect-error children are clearly passed below
     <Layout title="Contribution Roles">
@@ -91,6 +107,7 @@ const RoleBuilderPage = () => {
               onPaginationChange={handlePaginationChange}
               pageCount={pageCount}
               pageSizeOptions={[10, 25, 50, 100]}
+              onGlobalFilterChange={handleGlobalFilterChange}
             />
           </Suspense>
         </Card>
diff --git a/src/roles/components/AllRolesList.tsx b/src/roles/components/AllRolesList.tsx
index 91461668..79471190 100644
--- a/src/roles/components/AllRolesList.tsx
+++ b/src/roles/components/AllRolesList.tsx
@@ -13,6 +13,7 @@ interface AllRolesListProps {
   onPaginationChange?: OnChangeFn<PaginationState>
   pageCount?: number
   pageSizeOptions?: number[]
+  onGlobalFilterChange?: (filter: string) => void
 }
 
 export const AllRolesList = ({
@@ -24,6 +25,7 @@ export const AllRolesList = ({
   onPaginationChange,
   pageCount,
   pageSizeOptions,
+  onGlobalFilterChange,
 }: AllRolesListProps) => {
   // Process table data
   const roleTableData = processRoleTableData(roles, onRolesChanged, taxonomyList)
@@ -39,6 +41,7 @@ export const AllRolesList = ({
         onPaginationChange={onPaginationChange}
         pageCount={pageCount}
         pageSizeOptions={pageSizeOptions}
+        onGlobalFilterChange={onGlobalFilterChange}
       />
     </main>
   )
diff --git a/src/roles/components/ContributorsTab.tsx b/src/roles/components/ContributorsTab.tsx
index bb8ebbd2..d0966545 100644
--- a/src/roles/components/ContributorsTab.tsx
+++ b/src/roles/components/ContributorsTab.tsx
@@ -13,6 +13,7 @@ import { PaginationState } from "@tanstack/react-table"
 const ContributorsTab = () => {
   const projectId = useParam("projectId", "number")
   const [pagination, setPagination] = useState<PaginationState>({ pageIndex: 0, pageSize: 10 })
+  const [search, setSearch] = useState("")
 
   const [{ projectMembers: contributors, count }, { refetch }] = usePaginatedQuery(
     getProjectMembers,
@@ -20,9 +21,18 @@ const ContributorsTab = () => {
       where: {
         projectId: projectId,
         users: {
-          every: {
-            id: { not: undefined }, // Ensures there's at least one user
-          },
+          every: { id: { not: undefined } }, // Ensures there's at least one user
+          ...(search
+            ? {
+                some: {
+                  OR: [
+                    { username: { contains: search, mode: "insensitive" } },
+                    { firstName: { contains: search, mode: "insensitive" } },
+                    { lastName: { contains: search, mode: "insensitive" } },
+                  ],
+                },
+              }
+            : {}),
         },
         deleted: undefined,
         name: { equals: null }, // Ensures ProjectMember is contributor and not team
@@ -42,6 +52,11 @@ const ContributorsTab = () => {
     setPagination((prev) => (typeof updater === "function" ? updater(prev) : updater))
   }
 
+  const handleGlobalFilterChange = (filter: string) => {
+    setSearch(filter)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+  }
+
   return (
     <main className="flex flex-col mx-auto w-full">
       <MultiSelectProvider>
@@ -54,6 +69,7 @@ const ContributorsTab = () => {
               onPaginationChange={handlePaginationChange}
               pageCount={pageCount}
               pageSizeOptions={[10, 25, 50, 100]}
+              onGlobalFilterChange={handleGlobalFilterChange}
             />
             <div className="modal-action flex justify-between mt-4">
               <Link
diff --git a/src/roles/components/RoleContributorTable.tsx b/src/roles/components/RoleContributorTable.tsx
index 1c8348c1..73a4905b 100644
--- a/src/roles/components/RoleContributorTable.tsx
+++ b/src/roles/components/RoleContributorTable.tsx
@@ -9,6 +9,7 @@ type RoleContributorTableProps = {
   onPaginationChange?: OnChangeFn<PaginationState>
   pageCount?: number
   pageSizeOptions?: number[]
+  onGlobalFilterChange?: (filter: string) => void
 }
 
 export const RoleContributorTable = ({
@@ -18,6 +19,7 @@ export const RoleContributorTable = ({
   onPaginationChange,
   pageCount,
   pageSizeOptions,
+  onGlobalFilterChange,
 }: RoleContributorTableProps) => {
   const processedData = contributors.map((contributor) => ({
     username: contributor.users[0].username,
@@ -39,6 +41,7 @@ export const RoleContributorTable = ({
       onPaginationChange={onPaginationChange}
       pageCount={pageCount}
       pageSizeOptions={pageSizeOptions}
+      onGlobalFilterChange={onGlobalFilterChange}
     />
   )
 }
diff --git a/src/tasks/components/AllTaskList.tsx b/src/tasks/components/AllTaskList.tsx
index e3158fbe..4f1d42c3 100644
--- a/src/tasks/components/AllTaskList.tsx
+++ b/src/tasks/components/AllTaskList.tsx
@@ -20,6 +20,7 @@ export const AllTasksList = () => {
     pageIndex: 0,
     pageSize: 10,
   })
+  const [search, setSearch] = useState("")
 
   const [{ tasks, count }] = usePaginatedQuery(getTasks, {
     where: {
@@ -32,6 +33,14 @@ export const AllTasksList = () => {
           },
         },
       },
+      ...(search
+        ? {
+            OR: [
+              { name: { contains: search, mode: "insensitive" } },
+              { project: { name: { contains: search, mode: "insensitive" } } },
+            ],
+          }
+        : {}),
     },
     include: {
       project: true,
@@ -93,6 +102,11 @@ export const AllTasksList = () => {
     setPagination((prev) => (typeof updater === "function" ? updater(prev) : updater))
   }
 
+  const handleGlobalFilterChange = (filter: string) => {
+    setSearch(filter)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+  }
+
   return (
     <Card title="">
       <div className="overflow-y-auto">
@@ -105,6 +119,7 @@ export const AllTasksList = () => {
           onPaginationChange={handlePaginationChange}
           pageCount={pageCount}
           pageSizeOptions={[10, 25, 50, 100]}
+          onGlobalFilterChange={handleGlobalFilterChange}
         />
         <span className="italic">
           Note: This list only shows comment notifications for tasks that are explicitly assigned to
diff --git a/src/tasks/components/ProjectTasksList.tsx b/src/tasks/components/ProjectTasksList.tsx
index ea959fb6..f80d270b 100644
--- a/src/tasks/components/ProjectTasksList.tsx
+++ b/src/tasks/components/ProjectTasksList.tsx
@@ -11,8 +11,9 @@ export const ProjectTasksList = () => {
     pageIndex: 0,
     pageSize: 10,
   })
+  const [search, setSearch] = useState("")
 
-  const { tasks, count } = useProjecTasksListData(projectId, pagination)
+  const { tasks, count } = useProjecTasksListData(projectId, pagination, search)
   const pageCount = Math.max(1, Math.ceil((count ?? 0) / pagination.pageSize))
 
   const handlePaginationChange = (
@@ -21,6 +22,11 @@ export const ProjectTasksList = () => {
     setPagination((prev) => (typeof updater === "function" ? updater(prev) : updater))
   }
 
+  const handleGlobalFilterChange = (filter: string) => {
+    setSearch(filter)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+  }
+
   return (
     <div className="rounded-b-box rounded-tr-box bg-base-300 p-4">
       <div className="overflow-x-auto">
@@ -33,6 +39,7 @@ export const ProjectTasksList = () => {
           onPaginationChange={handlePaginationChange}
           pageCount={pageCount}
           pageSizeOptions={[10, 25, 50, 100]}
+          onGlobalFilterChange={handleGlobalFilterChange}
         />
       </div>
     </div>
diff --git a/src/tasks/hooks/useProjectTasksListData.ts b/src/tasks/hooks/useProjectTasksListData.ts
index 0bb616d5..8d267e0e 100644
--- a/src/tasks/hooks/useProjectTasksListData.ts
+++ b/src/tasks/hooks/useProjectTasksListData.ts
@@ -10,7 +10,8 @@ import { PaginationState } from "@tanstack/react-table"
 
 export default function useProjectTasksListData(
   projectId: number | undefined,
-  pagination: PaginationState
+  pagination: PaginationState,
+  search: string = ""
 ) {
   const currentUser = useCurrentUser()
   const { privilege } = useMemberPrivileges()
@@ -24,7 +25,10 @@ export default function useProjectTasksListData(
     if (!privilege || !currentUser || !projectId) return
 
     let baseParams: GetTasksInput = {
-      where: { project: { id: projectId } },
+      where: {
+        project: { id: projectId },
+        ...(search ? { name: { contains: search, mode: "insensitive" } } : {}),
+      },
       orderBy: [{ id: "asc" }],
       include: {
         container: {
@@ -104,7 +108,7 @@ export default function useProjectTasksListData(
     }
 
     setQueryParams(baseParams)
-  }, [privilege, currentUser, projectId, userMemberIds])
+  }, [privilege, currentUser, projectId, userMemberIds, search])
 
   const queryInput = useMemo(() => {
     const base = queryParams ?? {

From 8559f638b7d8f8fc62d23df98060f30d4905afb6 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Sat, 18 Apr 2026 20:14:45 -0500
Subject: [PATCH 05/13] update table search for filtering columns

---
 src/core/components/Table.tsx                 | 20 +++++++
 src/pages/notifications/index.tsx             | 59 ++++++++++++-------
 .../[projectId]/notifications/index.tsx       | 48 ++++++++++-----
 src/roles/components/ContributorsTab.tsx      | 16 ++++-
 src/roles/components/RoleContributorTable.tsx |  5 +-
 src/tasks/components/AllTaskList.tsx          | 16 ++++-
 src/tasks/components/ProjectTasksList.tsx     | 11 +++-
 src/tasks/hooks/useProjectTasksListData.ts    | 20 +++++--
 8 files changed, 148 insertions(+), 47 deletions(-)

diff --git a/src/core/components/Table.tsx b/src/core/components/Table.tsx
index 2fe2d10d..33ddfac4 100644
--- a/src/core/components/Table.tsx
+++ b/src/core/components/Table.tsx
@@ -1,5 +1,6 @@
 import {
   ColumnDef,
+  ColumnFiltersState,
   FilterFn,
   flexRender,
   getCoreRowModel,
@@ -139,6 +140,7 @@ type TableProps<TData> = {
   pageCount?: number
   pageSizeOptions?: number[]
   onGlobalFilterChange?: (filter: string) => void
+  onColumnFiltersChange?: (filters: ColumnFiltersState) => void
   classNames?: {
     table?: string
     thead?: string
@@ -193,9 +195,11 @@ const Table = <TData,>({
   pageCount: controlledPageCount,
   pageSizeOptions = [5, 10, 20, 30, 40, 50],
   onGlobalFilterChange,
+  onColumnFiltersChange,
 }: TableProps<TData>) => {
   const [sorting, setSorting] = React.useState([])
   const [globalFilter, setGlobalFilter] = React.useState("")
+  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
   const [internalPagination, setInternalPagination] = React.useState<PaginationState>({
     pageIndex: 0,
     pageSize: 5,
@@ -224,10 +228,12 @@ const Table = <TData,>({
     pageCount: manualPagination ? controlledPageCount : undefined,
     state: {
       sorting: sorting,
+      columnFilters: columnFilters,
       globalFilter: globalFilter,
       pagination: resolvedPaginationState,
     },
     onSortingChange: setSorting,
+    onColumnFiltersChange: setColumnFilters,
     onGlobalFilterChange: setGlobalFilter,
     onPaginationChange: handlePaginationChange,
     globalFilterFn: defaultGlobalFilterFn,
@@ -262,6 +268,20 @@ const Table = <TData,>({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [globalFilter])
 
+  const isFirstColumnFilterRender = React.useRef(true)
+  React.useEffect(() => {
+    if (isFirstColumnFilterRender.current) {
+      isFirstColumnFilterRender.current = false
+      return
+    }
+    if (!addPagination) return
+    if (manualPagination) {
+      onColumnFiltersChange?.(columnFilters)
+    }
+    table.setPageIndex(0)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [columnFilters])
+
   return (
     <>
       {enableGlobalSearch && (
diff --git a/src/pages/notifications/index.tsx b/src/pages/notifications/index.tsx
index 035ce713..e1e2b0cb 100644
--- a/src/pages/notifications/index.tsx
+++ b/src/pages/notifications/index.tsx
@@ -15,7 +15,7 @@ import { MultiReadToggleButton } from "src/notifications/components/MultiReadTog
 import { InformationCircleIcon } from "@heroicons/react/24/outline"
 import { Tooltip } from "react-tooltip"
 import Card from "src/core/components/Card"
-import { PaginationState } from "@tanstack/react-table"
+import { ColumnFiltersState, PaginationState } from "@tanstack/react-table"
 import { Prisma } from "db"
 
 const NotificationContent = () => {
@@ -32,38 +32,46 @@ const NotificationContent = () => {
     pageSize: 10,
   })
   const [search, setSearch] = useState("")
+  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
 
-  const baseWhere = useMemo<Prisma.NotificationWhereInput>(
+  const coreWhere = useMemo<Prisma.NotificationWhereInput>(
     () => ({
-      recipients: {
-        some: {
-          id: currentUser!.id,
-        },
-      },
-      // Only include notifications for projects where the contributor is not deleted
+      recipients: { some: { id: currentUser!.id } },
       project: {
         projectMembers: {
           some: {
-            users: {
-              some: { id: currentUser!.id },
-            },
-            name: null, // Contributor (indicating it's not a team)
-            deleted: false, // Only include undeleted project members
+            users: { some: { id: currentUser!.id } },
+            name: null,
+            deleted: false,
           },
         },
       },
-      ...(search
-        ? {
-            OR: [
-              { type: { contains: search, mode: "insensitive" } },
-              { project: { name: { contains: search, mode: "insensitive" } } },
-            ],
-          }
-        : {}),
     }),
-    [currentUser, search]
+    [currentUser]
   )
 
+  const baseWhere = useMemo<Prisma.NotificationWhereInput>(() => {
+    const conditions: Prisma.NotificationWhereInput[] = [coreWhere]
+    if (search) {
+      conditions.push({
+        OR: [
+          { message: { contains: search, mode: "insensitive" } },
+          { project: { name: { contains: search, mode: "insensitive" } } },
+        ],
+      })
+    }
+    for (const filter of columnFilters) {
+      const value = String(filter.value ?? "").trim()
+      if (!value) continue
+      if (filter.id === "readStatus") {
+        conditions.push({ read: value === "Read" })
+      } else if (filter.id === "projectName") {
+        conditions.push({ project: { name: { contains: value, mode: "insensitive" } } })
+      }
+    }
+    return conditions.length === 1 ? conditions[0]! : { AND: conditions }
+  }, [coreWhere, search, columnFilters])
+
   const paginationArgs = useMemo(
     () => ({
       skip: pagination.pageIndex * pagination.pageSize,
@@ -118,6 +126,12 @@ const NotificationContent = () => {
     disableGlobalSelection()
   }
 
+  const handleColumnFiltersChange = (filters: ColumnFiltersState) => {
+    setColumnFilters(filters)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+    disableGlobalSelection()
+  }
+
   const handleActionCompleted = async () => {
     await refetch()
     resetSelection()
@@ -185,6 +199,7 @@ const NotificationContent = () => {
           pageCount={pageCount}
           pageSizeOptions={[10, 25, 50, 100]}
           onGlobalFilterChange={handleGlobalFilterChange}
+          onColumnFiltersChange={handleColumnFiltersChange}
         />
       </Card>
     </main>
diff --git a/src/pages/projects/[projectId]/notifications/index.tsx b/src/pages/projects/[projectId]/notifications/index.tsx
index 117e6b3b..76c0c46f 100644
--- a/src/pages/projects/[projectId]/notifications/index.tsx
+++ b/src/pages/projects/[projectId]/notifications/index.tsx
@@ -14,7 +14,7 @@ import { MultiReadToggleButton } from "src/notifications/components/MultiReadTog
 import Card from "src/core/components/Card"
 import { InformationCircleIcon } from "@heroicons/react/24/outline"
 import { Tooltip } from "react-tooltip"
-import { PaginationState } from "@tanstack/react-table"
+import { ColumnFiltersState, PaginationState } from "@tanstack/react-table"
 import { Prisma } from "db"
 
 const NotificationContent = () => {
@@ -32,27 +32,36 @@ const NotificationContent = () => {
     pageSize: 10,
   })
   const [search, setSearch] = useState("")
+  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
 
-  const baseWhere = useMemo<Prisma.NotificationWhereInput>(
+  const coreWhere = useMemo<Prisma.NotificationWhereInput>(
     () => ({
-      recipients: {
-        some: {
-          id: currentUser!.id,
-        },
-      },
+      recipients: { some: { id: currentUser!.id } },
       projectId: projectId ?? undefined,
-      ...(search
-        ? {
-            OR: [
-              { type: { contains: search, mode: "insensitive" } },
-              { project: { name: { contains: search, mode: "insensitive" } } },
-            ],
-          }
-        : {}),
     }),
-    [currentUser, projectId, search]
+    [currentUser, projectId]
   )
 
+  const baseWhere = useMemo<Prisma.NotificationWhereInput>(() => {
+    const conditions: Prisma.NotificationWhereInput[] = [coreWhere]
+    if (search) {
+      conditions.push({
+        OR: [
+          { message: { contains: search, mode: "insensitive" } },
+          { project: { name: { contains: search, mode: "insensitive" } } },
+        ],
+      })
+    }
+    for (const filter of columnFilters) {
+      const value = String(filter.value ?? "").trim()
+      if (!value) continue
+      if (filter.id === "readStatus") {
+        conditions.push({ read: value === "Read" })
+      }
+    }
+    return conditions.length === 1 ? conditions[0]! : { AND: conditions }
+  }, [coreWhere, search, columnFilters])
+
   const paginationArgs = useMemo(
     () => ({
       skip: pagination.pageIndex * pagination.pageSize,
@@ -108,6 +117,12 @@ const NotificationContent = () => {
     disableGlobalSelection()
   }
 
+  const handleColumnFiltersChange = (filters: ColumnFiltersState) => {
+    setColumnFilters(filters)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+    disableGlobalSelection()
+  }
+
   const handleActionCompleted = async () => {
     await refetch()
     resetSelection()
@@ -174,6 +189,7 @@ const NotificationContent = () => {
           pageCount={pageCount}
           pageSizeOptions={[10, 25, 50, 100]}
           onGlobalFilterChange={handleGlobalFilterChange}
+          onColumnFiltersChange={handleColumnFiltersChange}
         />
       </Card>
     </main>
diff --git a/src/roles/components/ContributorsTab.tsx b/src/roles/components/ContributorsTab.tsx
index d0966545..abec5c24 100644
--- a/src/roles/components/ContributorsTab.tsx
+++ b/src/roles/components/ContributorsTab.tsx
@@ -8,12 +8,17 @@ import { AddRoleModal } from "./AddRoleModal"
 import { ProjectMemberWithUsersAndRoles } from "src/core/types"
 import Link from "next/link"
 import { Tooltip } from "react-tooltip"
-import { PaginationState } from "@tanstack/react-table"
+import { ColumnFiltersState, PaginationState } from "@tanstack/react-table"
 
 const ContributorsTab = () => {
   const projectId = useParam("projectId", "number")
   const [pagination, setPagination] = useState<PaginationState>({ pageIndex: 0, pageSize: 10 })
   const [search, setSearch] = useState("")
+  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
+
+  const roleNameFilter = columnFilters.find((f) => f.id === "roleNames")?.value as
+    | string
+    | undefined
 
   const [{ projectMembers: contributors, count }, { refetch }] = usePaginatedQuery(
     getProjectMembers,
@@ -34,6 +39,9 @@ const ContributorsTab = () => {
               }
             : {}),
         },
+        ...(roleNameFilter
+          ? { roles: { some: { name: { contains: roleNameFilter, mode: "insensitive" } } } }
+          : {}),
         deleted: undefined,
         name: { equals: null }, // Ensures ProjectMember is contributor and not team
       },
@@ -57,6 +65,11 @@ const ContributorsTab = () => {
     setPagination((prev) => ({ ...prev, pageIndex: 0 }))
   }
 
+  const handleColumnFiltersChange = (filters: ColumnFiltersState) => {
+    setColumnFilters(filters)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+  }
+
   return (
     <main className="flex flex-col mx-auto w-full">
       <MultiSelectProvider>
@@ -70,6 +83,7 @@ const ContributorsTab = () => {
               pageCount={pageCount}
               pageSizeOptions={[10, 25, 50, 100]}
               onGlobalFilterChange={handleGlobalFilterChange}
+              onColumnFiltersChange={handleColumnFiltersChange}
             />
             <div className="modal-action flex justify-between mt-4">
               <Link
diff --git a/src/roles/components/RoleContributorTable.tsx b/src/roles/components/RoleContributorTable.tsx
index 73a4905b..56e01286 100644
--- a/src/roles/components/RoleContributorTable.tsx
+++ b/src/roles/components/RoleContributorTable.tsx
@@ -1,6 +1,6 @@
 import Table from "src/core/components/Table"
 import { useRoleContributorTableColumns } from "../tables/columns/RoleContributorTableColumns"
-import { PaginationState, OnChangeFn } from "@tanstack/react-table"
+import { ColumnFiltersState, PaginationState, OnChangeFn } from "@tanstack/react-table"
 
 type RoleContributorTableProps = {
   contributors: any[]
@@ -10,6 +10,7 @@ type RoleContributorTableProps = {
   pageCount?: number
   pageSizeOptions?: number[]
   onGlobalFilterChange?: (filter: string) => void
+  onColumnFiltersChange?: (filters: ColumnFiltersState) => void
 }
 
 export const RoleContributorTable = ({
@@ -20,6 +21,7 @@ export const RoleContributorTable = ({
   pageCount,
   pageSizeOptions,
   onGlobalFilterChange,
+  onColumnFiltersChange,
 }: RoleContributorTableProps) => {
   const processedData = contributors.map((contributor) => ({
     username: contributor.users[0].username,
@@ -42,6 +44,7 @@ export const RoleContributorTable = ({
       pageCount={pageCount}
       pageSizeOptions={pageSizeOptions}
       onGlobalFilterChange={onGlobalFilterChange}
+      onColumnFiltersChange={onColumnFiltersChange}
     />
   )
 }
diff --git a/src/tasks/components/AllTaskList.tsx b/src/tasks/components/AllTaskList.tsx
index 4f1d42c3..9503fd83 100644
--- a/src/tasks/components/AllTaskList.tsx
+++ b/src/tasks/components/AllTaskList.tsx
@@ -8,7 +8,7 @@ import { AllTasksColumns } from "../tables/columns/AllTasksColumns"
 import { TaskLogWithTaskProjectAndComments } from "src/core/types"
 import Card from "src/core/components/Card"
 import { useState } from "react"
-import { PaginationState } from "@tanstack/react-table"
+import { ColumnFiltersState, PaginationState } from "@tanstack/react-table"
 
 type TaskWithLogs = TaskLogWithTaskProjectAndComments["task"] & {
   taskLogs: TaskLogWithTaskProjectAndComments[]
@@ -21,6 +21,12 @@ export const AllTasksList = () => {
     pageSize: 10,
   })
   const [search, setSearch] = useState("")
+  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
+
+  const nameFilter = columnFilters.find((f) => f.id === "name")?.value as string | undefined
+  const projectNameFilter = columnFilters.find((f) => f.id === "projectName")?.value as
+    | string
+    | undefined
 
   const [{ tasks, count }] = usePaginatedQuery(getTasks, {
     where: {
@@ -41,6 +47,8 @@ export const AllTasksList = () => {
             ],
           }
         : {}),
+      ...(nameFilter ? { name: { contains: nameFilter, mode: "insensitive" } } : {}),
+      ...(projectNameFilter ? { project: { name: projectNameFilter } } : {}),
     },
     include: {
       project: true,
@@ -107,6 +115,11 @@ export const AllTasksList = () => {
     setPagination((prev) => ({ ...prev, pageIndex: 0 }))
   }
 
+  const handleColumnFiltersChange = (filters: ColumnFiltersState) => {
+    setColumnFilters(filters)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+  }
+
   return (
     <Card title="">
       <div className="overflow-y-auto">
@@ -120,6 +133,7 @@ export const AllTasksList = () => {
           pageCount={pageCount}
           pageSizeOptions={[10, 25, 50, 100]}
           onGlobalFilterChange={handleGlobalFilterChange}
+          onColumnFiltersChange={handleColumnFiltersChange}
         />
         <span className="italic">
           Note: This list only shows comment notifications for tasks that are explicitly assigned to
diff --git a/src/tasks/components/ProjectTasksList.tsx b/src/tasks/components/ProjectTasksList.tsx
index f80d270b..b7859674 100644
--- a/src/tasks/components/ProjectTasksList.tsx
+++ b/src/tasks/components/ProjectTasksList.tsx
@@ -3,7 +3,7 @@ import { ProjectTasksColumns } from "src/tasks/tables/columns/ProjectTasksColumn
 import Table from "src/core/components/Table"
 import useProjecTasksListData from "../hooks/useProjectTasksListData"
 import { useState } from "react"
-import { PaginationState } from "@tanstack/react-table"
+import { ColumnFiltersState, PaginationState } from "@tanstack/react-table"
 
 export const ProjectTasksList = () => {
   const projectId = useParam("projectId", "number")
@@ -12,8 +12,9 @@ export const ProjectTasksList = () => {
     pageSize: 10,
   })
   const [search, setSearch] = useState("")
+  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
 
-  const { tasks, count } = useProjecTasksListData(projectId, pagination, search)
+  const { tasks, count } = useProjecTasksListData(projectId, pagination, search, columnFilters)
   const pageCount = Math.max(1, Math.ceil((count ?? 0) / pagination.pageSize))
 
   const handlePaginationChange = (
@@ -27,6 +28,11 @@ export const ProjectTasksList = () => {
     setPagination((prev) => ({ ...prev, pageIndex: 0 }))
   }
 
+  const handleColumnFiltersChange = (filters: ColumnFiltersState) => {
+    setColumnFilters(filters)
+    setPagination((prev) => ({ ...prev, pageIndex: 0 }))
+  }
+
   return (
     <div className="rounded-b-box rounded-tr-box bg-base-300 p-4">
       <div className="overflow-x-auto">
@@ -40,6 +46,7 @@ export const ProjectTasksList = () => {
           pageCount={pageCount}
           pageSizeOptions={[10, 25, 50, 100]}
           onGlobalFilterChange={handleGlobalFilterChange}
+          onColumnFiltersChange={handleColumnFiltersChange}
         />
       </div>
     </div>
diff --git a/src/tasks/hooks/useProjectTasksListData.ts b/src/tasks/hooks/useProjectTasksListData.ts
index 8d267e0e..72d61950 100644
--- a/src/tasks/hooks/useProjectTasksListData.ts
+++ b/src/tasks/hooks/useProjectTasksListData.ts
@@ -2,16 +2,17 @@ import { useEffect, useMemo, useState } from "react"
 import { usePaginatedQuery, useQuery } from "@blitzjs/rpc"
 import { useCurrentUser } from "src/users/hooks/useCurrentUser"
 import getTasks, { GetTasksInput } from "../queries/getTasks"
-import { MemberPrivileges } from "@prisma/client"
+import { MemberPrivileges, Status } from "@prisma/client"
 import { useMemberPrivileges } from "src/projectprivileges/components/MemberPrivilegesContext"
 import { processProjectTasks } from "../tables/processing/processProjectTasks"
 import getUserProjectMemberIds from "src/tasks/queries/getUserProjectMemberIds"
-import { PaginationState } from "@tanstack/react-table"
+import { ColumnFiltersState, PaginationState } from "@tanstack/react-table"
 
 export default function useProjectTasksListData(
   projectId: number | undefined,
   pagination: PaginationState,
-  search: string = ""
+  search: string = "",
+  columnFilters: ColumnFiltersState = []
 ) {
   const currentUser = useCurrentUser()
   const { privilege } = useMemberPrivileges()
@@ -24,10 +25,21 @@ export default function useProjectTasksListData(
   useEffect(() => {
     if (!privilege || !currentUser || !projectId) return
 
+    const nameFilter = columnFilters.find((f) => f.id === "name")?.value as string | undefined
+    const containerFilter = columnFilters.find((f) => f.id === "container")?.value as
+      | string
+      | undefined
+    const statusFilter = columnFilters.find((f) => f.id === "status")?.value as string | undefined
+
     let baseParams: GetTasksInput = {
       where: {
         project: { id: projectId },
         ...(search ? { name: { contains: search, mode: "insensitive" } } : {}),
+        ...(nameFilter ? { name: { contains: nameFilter, mode: "insensitive" } } : {}),
+        ...(containerFilter ? { container: { name: containerFilter } } : {}),
+        ...(statusFilter
+          ? { status: statusFilter === "Completed" ? Status.COMPLETED : Status.NOT_COMPLETED }
+          : {}),
       },
       orderBy: [{ id: "asc" }],
       include: {
@@ -108,7 +120,7 @@ export default function useProjectTasksListData(
     }
 
     setQueryParams(baseParams)
-  }, [privilege, currentUser, projectId, userMemberIds, search])
+  }, [privilege, currentUser, projectId, userMemberIds, search, columnFilters])
 
   const queryInput = useMemo(() => {
     const base = queryParams ?? {

From 6a7c8c34f310d3a9769075de11a32a25d37da7de Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Tue, 26 May 2026 20:51:51 -0500
Subject: [PATCH 06/13] fix table bouncing reseting

---
 src/core/components/Filter.tsx | 6 ++++--
 src/core/components/Table.tsx  | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/core/components/Filter.tsx b/src/core/components/Filter.tsx
index 8463e25c..9425fc7a 100644
--- a/src/core/components/Filter.tsx
+++ b/src/core/components/Filter.tsx
@@ -154,6 +154,8 @@ function DebouncedInput({
   debounce?: number
 } & Omit<React.InputHTMLAttributes<HTMLInputElement>, "onChange">) {
   const [value, setValue] = React.useState(initialValue)
+  const onChangeRef = React.useRef(onChange)
+  onChangeRef.current = onChange
 
   React.useEffect(() => {
     setValue(initialValue)
@@ -161,11 +163,11 @@ function DebouncedInput({
 
   React.useEffect(() => {
     const timeout = setTimeout(() => {
-      onChange(value)
+      onChangeRef.current(value)
     }, debounce)
 
     return () => clearTimeout(timeout)
-  }, [value, debounce, onChange])
+  }, [value, debounce])
 
   return <input {...props} value={value} onChange={(e) => setValue(e.target.value)} />
 }
diff --git a/src/core/components/Table.tsx b/src/core/components/Table.tsx
index 33ddfac4..d5fa2be6 100644
--- a/src/core/components/Table.tsx
+++ b/src/core/components/Table.tsx
@@ -277,8 +277,9 @@ const Table = <TData,>({
     if (!addPagination) return
     if (manualPagination) {
       onColumnFiltersChange?.(columnFilters)
+    } else {
+      table.setPageIndex(0)
     }
-    table.setPageIndex(0)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [columnFilters])
 

From 296ec8fb66c8756e7de058d11badf018bc312777 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Tue, 26 May 2026 20:58:36 -0500
Subject: [PATCH 07/13] make description a markdown!

---
 src/formBuilder/FormBuilder.tsx | 61 +++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/src/formBuilder/FormBuilder.tsx b/src/formBuilder/FormBuilder.tsx
index 76343a4b..2bb1c58c 100644
--- a/src/formBuilder/FormBuilder.tsx
+++ b/src/formBuilder/FormBuilder.tsx
@@ -1,6 +1,9 @@
 import React, { ReactElement, useEffect, useState } from "react"
 import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd"
 import { Alert, Input } from "reactstrap"
+import ReactMarkdown from "react-markdown"
+import remarkGfm from "remark-gfm"
+import remarkBreaks from "remark-breaks"
 import Card from "./Card"
 import Section from "./Section"
 import Add from "./Add"
@@ -20,6 +23,55 @@ import {
 import DEFAULT_FORM_INPUTS from "./defaults/defaultFormInputs"
 import type { Mods, InitParameters, AddFormObjectParametersType } from "./types"
 
+function MarkdownDescriptionInput({
+  value,
+  onChange,
+}: {
+  value: string
+  onChange: (v: string) => void
+}) {
+  const [mode, setMode] = useState<"edit" | "preview">("edit")
+
+  return (
+    <div>
+      <div className="flex items-center gap-2 mb-1">
+        <div className="join">
+          <button
+            type="button"
+            className={`btn btn-sm join-item ${mode === "edit" ? "btn-primary" : "btn-ghost"}`}
+            onClick={() => setMode("edit")}
+          >
+            Edit
+          </button>
+          <button
+            type="button"
+            className={`btn btn-sm join-item ${mode === "preview" ? "btn-primary" : "btn-ghost"}`}
+            onClick={() => setMode("preview")}
+          >
+            Preview
+          </button>
+        </div>
+        <span className="text-sm opacity-60 italic">Supports Markdown</span>
+      </div>
+      {mode === "edit" ? (
+        <textarea
+          value={value}
+          placeholder="Description"
+          rows={4}
+          className="form-description w-full"
+          onChange={(ev) => onChange(ev.target.value)}
+        />
+      ) : (
+        <div className="markdown-display prose max-w-none dark:prose-invert p-2 bg-base-200 rounded border border-base-300 min-h-[6rem]">
+          <ReactMarkdown remarkPlugins={[remarkGfm, remarkBreaks]}>
+            {value || "_Nothing to preview yet…_"}
+          </ReactMarkdown>
+        </div>
+      )}
+    </div>
+  )
+}
+
 export default function FormBuilder({
   schema,
   uischema,
@@ -129,20 +181,17 @@ export default function FormBuilder({
                 ? mods.labels.formDescriptionLabel
                 : "Form Description"}
             </h5>
-            <Input
+            <MarkdownDescriptionInput
               value={schemaData.description || ""}
-              placeholder="Description"
-              type="text"
-              onChange={(ev) =>
+              onChange={(val) =>
                 onChange(
                   stringify({
                     ...schemaData,
-                    description: ev.target.value,
+                    description: val,
                   }),
                   uischema
                 )
               }
-              className="form-description"
             />
           </div>
         </div>

From 1f82c223372f3d60c9df611d30a8d07affe803b4 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Tue, 26 May 2026 21:09:50 -0500
Subject: [PATCH 08/13] add markdown to description

---
 src/core/styles/index.css       | 43 +++++++++++++++++++++++++++------
 src/formBuilder/FormBuilder.tsx |  4 +--
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/core/styles/index.css b/src/core/styles/index.css
index 7e33b8de..6f5e7654 100644
--- a/src/core/styles/index.css
+++ b/src/core/styles/index.css
@@ -52,13 +52,15 @@
   width: 100%;
   border: none;
   margin: 0 auto;
-  display: block;
-  padding: 10px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 16px;
   border-radius: 12px;
   background-color: oklch(var(--b3));
   color: oklch(var(--bc));
   font-size: 16px;
-  text-align: center;
+  text-align: left;
 }
 
 /* form overall header */
@@ -69,11 +71,10 @@
   font-family: inherit;
 }
 
-.formHead-wrapper [class^="formHead"] div {
-  width: 30%;
-  display: inline-block;
-  text-align: left;
-  padding: 10px;
+.formHead-wrapper [class^="formHead"] > div {
+  width: 100%;
+  display: block;
+  padding: 0;
 }
 
 .move-icon {
@@ -117,6 +118,32 @@
   height: 48px;
 }
 
+/* markdown description wrapper — nested divs must not inherit the formHead > div reset */
+.formHead-wrapper .form-description-wrapper > div {
+  display: block;
+  width: 100%;
+  padding: 0;
+}
+
+.formHead-wrapper .form-description-wrapper .form-desc-toolbar {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  margin-bottom: 0.25rem;
+}
+
+.formHead-wrapper .form-description-wrapper .join,
+.formHead-wrapper .form-description-wrapper .join > * {
+  display: inline-flex;
+  width: auto;
+}
+
+.formHead-wrapper textarea.form-description {
+  height: auto !important;
+  min-height: 8rem;
+  resize: vertical;
+}
+
 .formHead-wrapper .card-modal-select {
   background-color: oklch(var(--pc)) !important;
 }
diff --git a/src/formBuilder/FormBuilder.tsx b/src/formBuilder/FormBuilder.tsx
index 2bb1c58c..10dc9fc2 100644
--- a/src/formBuilder/FormBuilder.tsx
+++ b/src/formBuilder/FormBuilder.tsx
@@ -33,8 +33,8 @@ function MarkdownDescriptionInput({
   const [mode, setMode] = useState<"edit" | "preview">("edit")
 
   return (
-    <div>
-      <div className="flex items-center gap-2 mb-1">
+    <div className="form-description-wrapper">
+      <div className="form-desc-toolbar flex items-center gap-2 mb-1">
         <div className="join">
           <button
             type="button"

From 6ae31260291e35fe2e255bcf34bd43357130c1f2 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Tue, 26 May 2026 21:11:02 -0500
Subject: [PATCH 09/13] make descriptions markdown

---
 src/core/components/DaisyTheme.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/core/components/DaisyTheme.tsx b/src/core/components/DaisyTheme.tsx
index df61b1fd..2f6748e6 100644
--- a/src/core/components/DaisyTheme.tsx
+++ b/src/core/components/DaisyTheme.tsx
@@ -16,6 +16,9 @@ import {
   getSubmitButtonOptions,
   SubmitButtonProps,
 } from "@rjsf/utils"
+import ReactMarkdown from "react-markdown"
+import remarkGfm from "remark-gfm"
+import remarkBreaks from "remark-breaks"
 
 import { ThemeProps } from "@rjsf/core"
 
@@ -74,9 +77,12 @@ function MyDescriptionField<
   }
   if (typeof description === "string") {
     return (
-      <p id={id} className="text-md italic">
-        {description}
-      </p>
+      <div
+        id={id}
+        className="markdown-display prose max-w-none dark:prose-invert text-md italic mb-2"
+      >
+        <ReactMarkdown remarkPlugins={[remarkGfm, remarkBreaks]}>{description}</ReactMarkdown>
+      </div>
     )
   } else {
     return (

From 7e367fb0ef8e9585ea00364fbf376185f30d241c Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Tue, 26 May 2026 21:16:12 -0500
Subject: [PATCH 10/13] update to use markdown!

---
 .../CardGeneralParameterInputs.tsx            | 18 ++-----
 src/formBuilder/FormBuilder.tsx               | 53 +------------------
 src/formBuilder/MarkdownDescriptionInput.tsx  | 53 +++++++++++++++++++
 src/formBuilder/Section.tsx                   | 16 ++----
 4 files changed, 62 insertions(+), 78 deletions(-)
 create mode 100644 src/formBuilder/MarkdownDescriptionInput.tsx

diff --git a/src/formBuilder/CardGeneralParameterInputs.tsx b/src/formBuilder/CardGeneralParameterInputs.tsx
index 2615242f..f1147c85 100644
--- a/src/formBuilder/CardGeneralParameterInputs.tsx
+++ b/src/formBuilder/CardGeneralParameterInputs.tsx
@@ -2,6 +2,7 @@ import React, { ReactElement } from "react"
 import { Input, FormGroup, FormFeedback } from "reactstrap"
 import classnames from "classnames"
 import GeneralParameterInputs from "./GeneralParameterInputs"
+import MarkdownDescriptionInput from "./MarkdownDescriptionInput"
 import SelectField from "src/core/components/fields/SelectField"
 import {
   defaultUiProps,
@@ -31,7 +32,6 @@ export default function CardGeneralParameterInputs({
   const [keyState, setKeyState] = React.useState(parameters.name)
   const [keyError, setKeyError] = React.useState<null | string>(null)
   const [titleState, setTitleState] = React.useState(parameters.title)
-  const [descriptionState, setDescriptionState] = React.useState(parameters.description)
   const [elementId] = React.useState(getRandomId())
   const categoryMap = categoryToNameMap(allFormInputs)
 
@@ -168,18 +168,10 @@ export default function CardGeneralParameterInputs({
               type="help"
             />
           </h5>
-          <FormGroup>
-            <Input
-              value={descriptionState || ""}
-              placeholder="Description"
-              type="text"
-              onChange={(ev) => setDescriptionState(ev.target.value)}
-              onBlur={(ev) => {
-                onChange({ ...parameters, description: ev.target.value })
-              }}
-              className="card-text"
-            />
-          </FormGroup>
+          <MarkdownDescriptionInput
+            value={parameters.description || ""}
+            onChange={(val) => onChange({ ...parameters, description: val })}
+          />
         </div>
         <div
           className={classnames("card-entry", {
diff --git a/src/formBuilder/FormBuilder.tsx b/src/formBuilder/FormBuilder.tsx
index 10dc9fc2..0a380405 100644
--- a/src/formBuilder/FormBuilder.tsx
+++ b/src/formBuilder/FormBuilder.tsx
@@ -1,12 +1,10 @@
 import React, { ReactElement, useEffect, useState } from "react"
 import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd"
 import { Alert, Input } from "reactstrap"
-import ReactMarkdown from "react-markdown"
-import remarkGfm from "remark-gfm"
-import remarkBreaks from "remark-breaks"
 import Card from "./Card"
 import Section from "./Section"
 import Add from "./Add"
+import MarkdownDescriptionInput from "./MarkdownDescriptionInput"
 import {
   parse,
   stringify,
@@ -23,55 +21,6 @@ import {
 import DEFAULT_FORM_INPUTS from "./defaults/defaultFormInputs"
 import type { Mods, InitParameters, AddFormObjectParametersType } from "./types"
 
-function MarkdownDescriptionInput({
-  value,
-  onChange,
-}: {
-  value: string
-  onChange: (v: string) => void
-}) {
-  const [mode, setMode] = useState<"edit" | "preview">("edit")
-
-  return (
-    <div className="form-description-wrapper">
-      <div className="form-desc-toolbar flex items-center gap-2 mb-1">
-        <div className="join">
-          <button
-            type="button"
-            className={`btn btn-sm join-item ${mode === "edit" ? "btn-primary" : "btn-ghost"}`}
-            onClick={() => setMode("edit")}
-          >
-            Edit
-          </button>
-          <button
-            type="button"
-            className={`btn btn-sm join-item ${mode === "preview" ? "btn-primary" : "btn-ghost"}`}
-            onClick={() => setMode("preview")}
-          >
-            Preview
-          </button>
-        </div>
-        <span className="text-sm opacity-60 italic">Supports Markdown</span>
-      </div>
-      {mode === "edit" ? (
-        <textarea
-          value={value}
-          placeholder="Description"
-          rows={4}
-          className="form-description w-full"
-          onChange={(ev) => onChange(ev.target.value)}
-        />
-      ) : (
-        <div className="markdown-display prose max-w-none dark:prose-invert p-2 bg-base-200 rounded border border-base-300 min-h-[6rem]">
-          <ReactMarkdown remarkPlugins={[remarkGfm, remarkBreaks]}>
-            {value || "_Nothing to preview yet…_"}
-          </ReactMarkdown>
-        </div>
-      )}
-    </div>
-  )
-}
-
 export default function FormBuilder({
   schema,
   uischema,
diff --git a/src/formBuilder/MarkdownDescriptionInput.tsx b/src/formBuilder/MarkdownDescriptionInput.tsx
new file mode 100644
index 00000000..30180243
--- /dev/null
+++ b/src/formBuilder/MarkdownDescriptionInput.tsx
@@ -0,0 +1,53 @@
+import { useState } from "react"
+import ReactMarkdown from "react-markdown"
+import remarkGfm from "remark-gfm"
+import remarkBreaks from "remark-breaks"
+
+export default function MarkdownDescriptionInput({
+  value,
+  onChange,
+}: {
+  value: string
+  onChange: (v: string) => void
+}) {
+  const [mode, setMode] = useState<"edit" | "preview">("edit")
+
+  return (
+    <div className="form-description-wrapper">
+      <div className="form-desc-toolbar flex items-center gap-2 mb-1">
+        <div className="join">
+          <button
+            type="button"
+            className={`btn btn-sm join-item ${mode === "edit" ? "btn-primary" : "btn-ghost"}`}
+            onClick={() => setMode("edit")}
+          >
+            Edit
+          </button>
+          <button
+            type="button"
+            className={`btn btn-sm join-item ${mode === "preview" ? "btn-primary" : "btn-ghost"}`}
+            onClick={() => setMode("preview")}
+          >
+            Preview
+          </button>
+        </div>
+        <span className="text-sm opacity-60 italic">Supports Markdown</span>
+      </div>
+      {mode === "edit" ? (
+        <textarea
+          value={value}
+          placeholder="Description"
+          rows={4}
+          className="form-description w-full"
+          onChange={(ev) => onChange(ev.target.value)}
+        />
+      ) : (
+        <div className="markdown-display prose max-w-none dark:prose-invert p-2 bg-base-200 rounded border border-base-300 min-h-[6rem]">
+          <ReactMarkdown remarkPlugins={[remarkGfm, remarkBreaks]}>
+            {value || "_Nothing to preview yet…_"}
+          </ReactMarkdown>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/src/formBuilder/Section.tsx b/src/formBuilder/Section.tsx
index f485893b..7f9204da 100644
--- a/src/formBuilder/Section.tsx
+++ b/src/formBuilder/Section.tsx
@@ -2,6 +2,7 @@ import React, { ReactElement } from "react"
 import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd"
 import SelectField from "src/core/components/fields/SelectField"
 import { Alert, Input, UncontrolledTooltip, FormGroup, FormFeedback } from "reactstrap"
+import MarkdownDescriptionInput from "./MarkdownDescriptionInput"
 import FBCheckbox from "./checkbox/FBCheckbox"
 import Collapse from "./Collapse/Collapse"
 import CardModal from "./CardModal"
@@ -223,20 +224,9 @@ export default function Section({
                   type="help"
                 />
               </h5>
-              <Input
+              <MarkdownDescriptionInput
                 value={schemaData.description || ""}
-                placeholder="Description"
-                type="text"
-                onChange={(ev) =>
-                  onChange(
-                    {
-                      ...schema,
-                      description: ev.target.value,
-                    },
-                    uischema
-                  )
-                }
-                className="card-text"
+                onChange={(val) => onChange({ ...schema, description: val }, uischema)}
               />
             </div>
             <Alert

From 614a0d55e01a83b852d182e6f1b7b3523fb3c24a Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Tue, 26 May 2026 21:21:35 -0500
Subject: [PATCH 11/13] issue #506 fix checkboxes

---
 src/core/styles/index.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/styles/index.css b/src/core/styles/index.css
index 6f5e7654..e0acf6a3 100644
--- a/src/core/styles/index.css
+++ b/src/core/styles/index.css
@@ -234,19 +234,20 @@
 /* form visual checkboxes */
 .rjsf .checkbox {
   display: flex;
-  align-items: center;
-  width: 100%; /* Ensures the container takes up the full width */
+  flex-direction: column;
+  width: 100%;
 }
 
 /* form visual checkboxes */
 .rjsf .checkbox label {
-  flex: 1; /* Allows the label to expand to fit the content */
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
 }
 
 /* form visual checkboxes */
 .rjsf .checkbox span {
-  flex: 1; /* Allows the span to take up more space */
-  white-space: normal; /* Allows text to wrap if needed */
+  white-space: normal;
 }
 
 /* form visual focus block */

From 5c0fbb87879ee7e511614a21b3034c762e32a89e Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Tue, 26 May 2026 21:29:19 -0500
Subject: [PATCH 12/13] update visual themes

---
 src/core/components/DaisyTheme.tsx | 59 ++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/src/core/components/DaisyTheme.tsx b/src/core/components/DaisyTheme.tsx
index 2f6748e6..d98cd0e9 100644
--- a/src/core/components/DaisyTheme.tsx
+++ b/src/core/components/DaisyTheme.tsx
@@ -15,6 +15,9 @@ import {
   getUiOptions,
   getSubmitButtonOptions,
   SubmitButtonProps,
+  schemaRequiresTrueValue,
+  descriptionId,
+  ariaDescribedByIds,
 } from "@rjsf/utils"
 import ReactMarkdown from "react-markdown"
 import remarkGfm from "remark-gfm"
@@ -192,6 +195,61 @@ const MyEmailWidget = (props: WidgetProps) => {
   )
 }
 
+const MyCheckboxWidget = (props: WidgetProps) => {
+  const {
+    id,
+    value,
+    disabled,
+    readonly,
+    label,
+    hideLabel,
+    onChange,
+    onBlur,
+    onFocus,
+    options,
+    schema,
+    uiSchema,
+    registry,
+  } = props
+  const DescriptionFieldTemplate = getTemplate("DescriptionFieldTemplate", registry, options)
+  const description = options.description ?? schema.description
+  const required = schemaRequiresTrueValue(schema)
+
+  return (
+    <div className="field-checkbox">
+      {!hideLabel && label && (
+        <label className="text-lg font-bold block mb-1" htmlFor={id}>
+          {label}
+          {required && <span className="italic">{REQUIRED_FIELD_SYMBOL}</span>}
+        </label>
+      )}
+      {!hideLabel && !!description && (
+        <DescriptionFieldTemplate
+          id={descriptionId(id)}
+          description={description}
+          schema={schema}
+          uiSchema={uiSchema}
+          registry={registry}
+        />
+      )}
+      <label className="flex items-center gap-2 mt-1 cursor-pointer">
+        <input
+          type="checkbox"
+          id={id}
+          name={id}
+          checked={typeof value === "undefined" ? false : value}
+          required={required}
+          disabled={disabled || readonly}
+          aria-describedby={ariaDescribedByIds(id)}
+          onChange={(e) => onChange(e.target.checked)}
+          onBlur={(e) => onBlur(id, e.target.checked)}
+          onFocus={(e) => onFocus(id, e.target.checked)}
+        />
+      </label>
+    </div>
+  )
+}
+
 // create Registry information
 // templates
 const myTemplates: Partial<TemplatesType> = {
@@ -223,6 +281,7 @@ const myTemplates: Partial<TemplatesType> = {
 const myWidgets: RegistryWidgetsType = {
   TextWidget: MyTextWidget,
   EmailWidget: MyEmailWidget,
+  CheckboxWidget: MyCheckboxWidget,
 }
 
 // create the overall theme to use on the other page

From e63d3feb3d373fa95cd5abe914c6fc33ad041017 Mon Sep 17 00:00:00 2001
From: The Doom Lab <buchananlab@gmail.com>
Date: Tue, 26 May 2026 21:33:09 -0500
Subject: [PATCH 13/13] add multiselect check box

---
 src/core/components/DaisyTheme.tsx            | 63 +++++++++++++++++
 src/core/styles/index.css                     | 17 +++++
 .../CardGeneralParameterInputs.tsx            |  1 +
 src/formBuilder/defaults/defaultInputs.tsx    | 70 ++++++++++++++++++-
 4 files changed, 149 insertions(+), 2 deletions(-)

diff --git a/src/core/components/DaisyTheme.tsx b/src/core/components/DaisyTheme.tsx
index d98cd0e9..f5533986 100644
--- a/src/core/components/DaisyTheme.tsx
+++ b/src/core/components/DaisyTheme.tsx
@@ -18,6 +18,11 @@ import {
   schemaRequiresTrueValue,
   descriptionId,
   ariaDescribedByIds,
+  enumOptionsIsSelected,
+  enumOptionsSelectValue,
+  enumOptionsDeselectValue,
+  enumOptionsValueForIndex,
+  optionId,
 } from "@rjsf/utils"
 import ReactMarkdown from "react-markdown"
 import remarkGfm from "remark-gfm"
@@ -250,6 +255,63 @@ const MyCheckboxWidget = (props: WidgetProps) => {
   )
 }
 
+const MyCheckboxesWidget = (props: WidgetProps) => {
+  const {
+    id,
+    disabled,
+    options,
+    value,
+    readonly,
+    onChange,
+    onBlur,
+    onFocus,
+    autofocus = false,
+  } = props
+  const { enumOptions, enumDisabled, emptyValue } = options
+  const checkboxesValues = Array.isArray(value) ? value : [value]
+
+  return (
+    <div className="checkboxes-group" id={id}>
+      {Array.isArray(enumOptions) &&
+        enumOptions.map((option, index) => {
+          const checked = enumOptionsIsSelected(option.value, checkboxesValues)
+          const itemDisabled =
+            Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1
+          const disabledCls = disabled || itemDisabled || readonly ? "disabled" : ""
+
+          return (
+            <label key={index} className={`checkboxes-option ${disabledCls}`}>
+              <input
+                type="checkbox"
+                id={optionId(id, index)}
+                name={id}
+                checked={checked}
+                value={String(index)}
+                disabled={disabled || itemDisabled || readonly}
+                autoFocus={autofocus && index === 0}
+                onChange={(event) => {
+                  if (event.target.checked) {
+                    onChange(enumOptionsSelectValue(index, checkboxesValues, enumOptions))
+                  } else {
+                    onChange(enumOptionsDeselectValue(index, checkboxesValues, enumOptions))
+                  }
+                }}
+                onBlur={({ target: { value: v } }) =>
+                  onBlur(id, enumOptionsValueForIndex(v, enumOptions, emptyValue))
+                }
+                onFocus={({ target: { value: v } }) =>
+                  onFocus(id, enumOptionsValueForIndex(v, enumOptions, emptyValue))
+                }
+                aria-describedby={ariaDescribedByIds(id)}
+              />
+              <span>{option.label}</span>
+            </label>
+          )
+        })}
+    </div>
+  )
+}
+
 // create Registry information
 // templates
 const myTemplates: Partial<TemplatesType> = {
@@ -282,6 +344,7 @@ const myWidgets: RegistryWidgetsType = {
   TextWidget: MyTextWidget,
   EmailWidget: MyEmailWidget,
   CheckboxWidget: MyCheckboxWidget,
+  CheckboxesWidget: MyCheckboxesWidget,
 }
 
 // create the overall theme to use on the other page
diff --git a/src/core/styles/index.css b/src/core/styles/index.css
index e0acf6a3..b40c230b 100644
--- a/src/core/styles/index.css
+++ b/src/core/styles/index.css
@@ -702,6 +702,23 @@ span.arrow.tooltip-arrow {
   margin-left: 30px;
 }
 
+.rjsf .checkboxes-group {
+  width: 100%;
+}
+
+.rjsf .checkboxes-option {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  padding: 4px 0;
+  cursor: pointer;
+}
+
+.rjsf .checkboxes-option.disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
 .tooltip {
   z-index: 9999; /* A higher value than the modal */
 }
diff --git a/src/formBuilder/CardGeneralParameterInputs.tsx b/src/formBuilder/CardGeneralParameterInputs.tsx
index f1147c85..6e9d7efc 100644
--- a/src/formBuilder/CardGeneralParameterInputs.tsx
+++ b/src/formBuilder/CardGeneralParameterInputs.tsx
@@ -59,6 +59,7 @@ export default function CardGeneralParameterInputs({
       "date",
       "time",
       "checkbox",
+      "checkboxes",
       "radio",
       "dropdown",
       "shortAnswer",
diff --git a/src/formBuilder/defaults/defaultInputs.tsx b/src/formBuilder/defaults/defaultInputs.tsx
index ddf2755a..bd57b6cb 100644
--- a/src/formBuilder/defaults/defaultInputs.tsx
+++ b/src/formBuilder/defaults/defaultInputs.tsx
@@ -145,6 +145,53 @@ function MultipleChoice({
   )
 }
 
+function MultipleChoiceArray({
+  parameters,
+  onChange,
+}: {
+  parameters: CardComponentPropsType
+  onChange: (newParams: CardComponentPropsType) => void
+}) {
+  const items = (parameters.items as any) || {}
+  const enumArray = Array.isArray(items.enum) ? items.enum : []
+  const [elementId] = React.useState(getRandomId())
+
+  return (
+    <div className="card-enum">
+      <h5>Options</h5>
+      <FBCheckbox
+        onChangeValue={() => {
+          const hasNames = Array.isArray(items.enumNames)
+          onChange({
+            ...parameters,
+            items: {
+              ...items,
+              enumNames: hasNames ? null : enumArray.map((val: any) => `${val}`),
+            },
+          })
+        }}
+        isChecked={Array.isArray(items.enumNames)}
+        label="Display different text label than the stored value"
+        id={`${elementId}_different`}
+      />
+      <CardEnumOptions
+        initialValues={enumArray}
+        names={
+          Array.isArray(items.enumNames) ? items.enumNames.map((val: any) => `${val}`) : undefined
+        }
+        showNames={Array.isArray(items.enumNames)}
+        onChange={(newEnum, newEnumNames) =>
+          onChange({
+            ...parameters,
+            items: { ...items, enum: newEnum, enumNames: newEnumNames },
+          })
+        }
+        type="string"
+      />
+    </div>
+  )
+}
+
 const defaultInputs: { [key: string]: FormInput } = {
   dateTime: {
     displayName: "Date-Time",
@@ -195,7 +242,7 @@ const defaultInputs: { [key: string]: FormInput } = {
     modalBody: CardDefaultParameterInputs,
   },
   checkbox: {
-    displayName: "Checkbox",
+    displayName: "Yes / No",
     matchIf: [
       {
         types: ["boolean"],
@@ -207,8 +254,27 @@ const defaultInputs: { [key: string]: FormInput } = {
     cardBody: Checkbox,
     modalBody: CardDefaultParameterInputs,
   },
+  checkboxes: {
+    displayName: "Checkboxes (Multi-select)",
+    matchIf: [
+      {
+        types: ["array"],
+        widget: "checkboxes",
+      },
+    ],
+    defaultDataSchema: {
+      items: { type: "string", enum: [] },
+      uniqueItems: true,
+    },
+    defaultUiSchema: {
+      "ui:widget": "checkboxes",
+    },
+    type: "array",
+    cardBody: MultipleChoiceArray,
+    modalBody: CardDefaultParameterInputs,
+  },
   radio: {
-    displayName: "Radio",
+    displayName: "Radio (Single-select)",
     matchIf: [
       {
         types: ["string", "number", "integer", "array", "boolean", "null"],