From d31ba9f1df31476ecfb4e6f5dd67b62c17a630ba Mon Sep 17 00:00:00 2001
From: BradyMitch <braden.jr.mitch@gmail.com>
Date: Thu, 12 Mar 2026 13:42:49 -0700
Subject: [PATCH 1/4] updates

---
 .vscode/extensions.json                       |  1 -
 .../migration.sql                             |  2 +
 prisma/models/app/enums/role.prisma           |  1 +
 prisma/seed.ts                                | 86 ++++++++++++++++++
 src/app/api/auth/login/route.ts               |  9 +-
 src/app/api/protected/route.ts                |  2 +-
 src/app/protected/settings/users/page.tsx     | 19 ++--
 .../ConfirmArchiveLocationModal.tsx           | 29 ++++--
 .../CreateLocationModal.tsx                   |  1 +
 .../EditLocationModal/EditLocationModal.tsx   |  1 +
 .../ConfirmArchiveServiceCategoryModal.tsx    | 70 +++++++++------
 .../CreateServiceCategoryModal.tsx            |  1 +
 .../EditServiceCategoryModal.tsx              |  1 +
 .../ConfirmArchiveServiceModal.tsx            | 27 ++++--
 .../CreateServiceModal/CreateServiceModal.tsx |  1 +
 .../EditServiceModal/EditServiceModal.tsx     |  1 +
 .../ConfirmArchiveUserModal.tsx               | 32 ++++---
 .../EditStaffUserModal/EditStaffUserModal.tsx | 38 ++++----
 .../users/StaffUserTable/StaffUserTable.tsx   | 55 +++++++++++-
 .../settings/users/StaffUserTable/columns.tsx | 14 ++-
 src/hooks/index.ts                            |  1 -
 src/hooks/useEditableRoles/index.ts           |  1 -
 .../useEditableRoles/useEditableRoles.test.ts | 88 -------------------
 .../useEditableRoles/useEditableRoles.ts      | 34 -------
 src/lib/prisma/staff_user/getAllStaffUsers.ts |  8 +-
 .../staff_user/getStaffUserBySub.test.ts      | 17 ++--
 .../prisma/staff_user/getStaffUserBySub.ts    | 11 ++-
 .../prisma/staff_user/insertStaffUser.test.ts | 50 +++++++++--
 src/lib/prisma/staff_user/insertStaffUser.ts  | 12 ++-
 src/lib/prisma/staff_user/types.ts            |  5 ++
 .../prisma/staff_user/updateStaffUser.test.ts | 29 +++++-
 src/lib/prisma/staff_user/updateStaffUser.ts  | 25 ++++--
 src/middleware/README.md                      | 28 ++++--
 src/middleware/auth.ts                        |  7 +-
 src/utils/auth/README.md                      |  2 +-
 src/utils/auth/getAuthContext.test.ts         | 51 +++++------
 src/utils/auth/getAuthContext.ts              | 13 ++-
 src/utils/policies/policies.ts                |  5 +-
 src/utils/policies/resources/staff_user.ts    | 39 ++++++++
 src/utils/policies/types.ts                   | 11 ++-
 src/utils/user/assignNewRoleFromCSR.test.ts   | 15 +++-
 src/utils/user/assignNewRoleFromCSR.ts        |  3 +-
 src/utils/user/updateUserOnLogin.ts           |  2 +-
 43 files changed, 557 insertions(+), 291 deletions(-)
 create mode 100644 prisma/migrations/20260311163820_new_authenticated_role/migration.sql
 delete mode 100644 src/hooks/useEditableRoles/index.ts
 delete mode 100644 src/hooks/useEditableRoles/useEditableRoles.test.ts
 delete mode 100644 src/hooks/useEditableRoles/useEditableRoles.ts
 create mode 100644 src/lib/prisma/staff_user/types.ts
 create mode 100644 src/utils/policies/resources/staff_user.ts

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 78d5c9ce..72331b8f 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -2,7 +2,6 @@
   "recommendations": [
     "biomejs.biome",
     "prisma.prisma",
-    "GitHub.copilot",
     "GitHub.copilot-chat",
     "github.vscode-github-actions",
     "github.vscode-pull-request-github",
diff --git a/prisma/migrations/20260311163820_new_authenticated_role/migration.sql b/prisma/migrations/20260311163820_new_authenticated_role/migration.sql
new file mode 100644
index 00000000..c94ecc8b
--- /dev/null
+++ b/prisma/migrations/20260311163820_new_authenticated_role/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "app"."Role" ADD VALUE 'Authenticated';
diff --git a/prisma/models/app/enums/role.prisma b/prisma/models/app/enums/role.prisma
index 165c94b6..4e761077 100644
--- a/prisma/models/app/enums/role.prisma
+++ b/prisma/models/app/enums/role.prisma
@@ -1,4 +1,5 @@
 enum Role {
+  Authenticated
   CSR
   SCSR
   SDM
diff --git a/prisma/seed.ts b/prisma/seed.ts
index 45b03b06..c08405a7 100644
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -162,6 +162,92 @@ async function main() {
         data: { categories: { connect: { id: categoryIdentity.id } } },
       })
     }
+
+    // --- Mock test staff users for each role ---
+    const testLocation = await prisma.location.findUnique({
+      where: { legacyOfficeNumber: 999 },
+    })
+
+    if (testLocation) {
+      // Authenticated role
+      await prisma.staffUser.upsert({
+        where: { sub: "test-authenticated@idir" },
+        update: {},
+        create: {
+          guid: "11111111-1111-1111-1111-111111111111",
+          sub: "test-authenticated@idir",
+          username: "sarah.chen",
+          displayName: "Sarah Chen",
+          role: "Authenticated",
+          isActive: false,
+          locationCode: testLocation.code,
+          counterId: counter.id,
+        },
+      })
+
+      // CSR role
+      await prisma.staffUser.upsert({
+        where: { sub: "test-csr@idir" },
+        update: {},
+        create: {
+          guid: "22222222-2222-2222-2222-222222222222",
+          sub: "test-csr@idir",
+          username: "michael.rodriguez",
+          displayName: "Michael Rodriguez",
+          role: "CSR",
+          isActive: false,
+          locationCode: testLocation.code,
+          counterId: counter.id,
+        },
+      })
+
+      // SCSR role
+      await prisma.staffUser.upsert({
+        where: { sub: "test-scsr@idir" },
+        update: {},
+        create: {
+          guid: "33333333-3333-3333-3333-333333333333",
+          sub: "test-scsr@idir",
+          username: "jennifer.smith",
+          displayName: "Jennifer Smith",
+          role: "SCSR",
+          isActive: false,
+          locationCode: testLocation.code,
+          counterId: reception.id,
+        },
+      })
+
+      // SDM role
+      await prisma.staffUser.upsert({
+        where: { sub: "test-sdm@idir" },
+        update: {},
+        create: {
+          guid: "44444444-4444-4444-4444-444444444444",
+          sub: "test-sdm@idir",
+          username: "robert.taylor",
+          displayName: "Robert Taylor",
+          role: "SDM",
+          isActive: false,
+          locationCode: testLocation.code,
+          isOfficeManager: true,
+        },
+      })
+
+      // Administrator role
+      await prisma.staffUser.upsert({
+        where: { sub: "test-admin@idir" },
+        update: {},
+        create: {
+          guid: "55555555-5555-5555-5555-555555555555",
+          sub: "test-admin@idir",
+          username: "patricia.williams",
+          displayName: "Patricia Williams",
+          role: "Administrator",
+          isActive: false,
+          locationCode: testLocation.code,
+        },
+      })
+    }
   } catch (error) {
 
     console.error("❌ Seeding database failed:", error)
diff --git a/src/app/api/auth/login/route.ts b/src/app/api/auth/login/route.ts
index 0513f5de..aa08b42e 100644
--- a/src/app/api/auth/login/route.ts
+++ b/src/app/api/auth/login/route.ts
@@ -30,7 +30,14 @@ export async function GET(_request: NextRequest) {
     })
 
     // Redirect the user to the SSO login page
-    return NextResponse.redirect(redirectURL)
+    const response = NextResponse.redirect(redirectURL)
+
+    // Prevent caching of redirect responses to avoid stale maintenance page redirects
+    response.headers.set("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate")
+    response.headers.set("Pragma", "no-cache")
+    response.headers.set("Expires", "0")
+
+    return response
   } catch (error) {
     console.error("Error in login route:", error)
     return NextResponse.json({ error: "Failed to generate login URL" }, { status: 500 })
diff --git a/src/app/api/protected/route.ts b/src/app/api/protected/route.ts
index 9568890a..509c3933 100644
--- a/src/app/api/protected/route.ts
+++ b/src/app/api/protected/route.ts
@@ -4,7 +4,7 @@ import { getAuthContext } from "@/utils/auth/getAuthContext"
 
 export async function GET(request: NextRequest) {
   try {
-    const authContext = getAuthContext(request)
+    const authContext = getAuthContext(request.headers)
 
     if (!authContext) {
       return NextResponse.json(
diff --git a/src/app/protected/settings/users/page.tsx b/src/app/protected/settings/users/page.tsx
index 695e0520..71a2faf0 100644
--- a/src/app/protected/settings/users/page.tsx
+++ b/src/app/protected/settings/users/page.tsx
@@ -1,25 +1,34 @@
 import { revalidatePath } from "next/cache"
+import { headers } from "next/headers"
 import { StaffUserTable } from "@/components/settings/users/StaffUserTable"
 import { getAllLocations } from "@/lib/prisma/location/getAllLocations"
 import { getAllStaffUsers } from "@/lib/prisma/staff_user/getAllStaffUsers"
+import { getStaffUserBySub } from "@/lib/prisma/staff_user/getStaffUserBySub"
 import { updateStaffUser } from "@/lib/prisma/staff_user/updateStaffUser"
+import { getAuthContext } from "@/utils/auth/getAuthContext"
 
 // This page should always be rendered dynamically to ensure fresh data
 export const dynamic = "force-dynamic"
 
+const revalidateTable = async () => {
+  "use server"
+  revalidatePath("/protected/settings/users")
+}
+
 export default async function Page() {
+  const headersList = await headers()
+  const authContext = getAuthContext(headersList)
+  const user = authContext?.user
+
+  const currentUser = await getStaffUserBySub(user?.sub ?? "")
   const users = await getAllStaffUsers()
   const locations = await getAllLocations()
 
-  const revalidateTable = async () => {
-    "use server"
-    revalidatePath("/protected/settings/users")
-  }
-
   return (
     <div className="space-y-sm">
       <h2>Users</h2>
       <StaffUserTable
+        currentUser={currentUser}
         users={users}
         locations={locations}
         updateStaffUser={updateStaffUser}
diff --git a/src/components/settings/locations/ConfirmArchiveLocationModal/ConfirmArchiveLocationModal.tsx b/src/components/settings/locations/ConfirmArchiveLocationModal/ConfirmArchiveLocationModal.tsx
index 5ddd63ea..e0b4c201 100644
--- a/src/components/settings/locations/ConfirmArchiveLocationModal/ConfirmArchiveLocationModal.tsx
+++ b/src/components/settings/locations/ConfirmArchiveLocationModal/ConfirmArchiveLocationModal.tsx
@@ -29,6 +29,7 @@ export const ConfirmArchiveLocationModal = ({
   updateLocation,
   revalidateTable,
 }: ConfirmArchiveLocationModalProps) => {
+  const [error, setError] = useState<string | null>(null)
   const [formData, setFormData] = useState<LocationWithRelations | null>(null)
   const [previousLocation, setPreviousLocation] = useState<LocationWithRelations | null>(null)
   const [archiveConfirmation, setArchiveConfirmation] = useState("")
@@ -45,14 +46,20 @@ export const ConfirmArchiveLocationModal = ({
   if (!location || !formData || !previousLocation) return null
 
   const handleSave = async () => {
-    if (formData) {
-      await updateLocation(
-        { ...formData, deletedAt: isArchived ? null : new Date() },
-        previousLocation
-      )
-      await revalidateTable()
-      setArchiveConfirmation("")
-      onClose()
+    try {
+      if (formData) {
+        await updateLocation({ deletedAt: isArchived ? null : new Date() }, previousLocation)
+        await revalidateTable()
+        setArchiveConfirmation("")
+        onClose()
+        window.location.href = "/protected/settings/locations"
+      }
+    } catch (e: unknown) {
+      if (e instanceof Error) {
+        setError(e.message)
+      } else {
+        setError("An unknown error occurred")
+      }
     }
   }
 
@@ -66,6 +73,12 @@ export const ConfirmArchiveLocationModal = ({
 
       <DialogBody>
         <form className="space-y-5">
+          {error && (
+            <div className="flex flex-col gap-1 rounded-md border-l-4 border-l-red-600 bg-red-50 p-4">
+              <p className="text-sm font-medium text-red-800">{error}</p>
+            </div>
+          )}
+
           <div>
             <label
               htmlFor="archive-location"
diff --git a/src/components/settings/locations/CreateLocationModal/CreateLocationModal.tsx b/src/components/settings/locations/CreateLocationModal/CreateLocationModal.tsx
index d813013b..3705fda4 100644
--- a/src/components/settings/locations/CreateLocationModal/CreateLocationModal.tsx
+++ b/src/components/settings/locations/CreateLocationModal/CreateLocationModal.tsx
@@ -145,6 +145,7 @@ export const CreateLocationModal = ({
         await revalidateTable()
         onClose()
         setIsSaving(false)
+        window.location.href = "/protected/settings/locations"
       } catch (e: unknown) {
         if (e instanceof Error) {
           setError(e.message)
diff --git a/src/components/settings/locations/EditLocationModal/EditLocationModal.tsx b/src/components/settings/locations/EditLocationModal/EditLocationModal.tsx
index 7f6686ac..db16eed9 100644
--- a/src/components/settings/locations/EditLocationModal/EditLocationModal.tsx
+++ b/src/components/settings/locations/EditLocationModal/EditLocationModal.tsx
@@ -141,6 +141,7 @@ export const EditLocationModal = ({
         await revalidateTable()
         onClose()
         setIsSaving(false)
+        window.location.href = "/protected/settings/locations"
       } catch (e: unknown) {
         if (e instanceof Error) {
           setError(e.message)
diff --git a/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.tsx b/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.tsx
index 0d0ed45c..eddb0a4d 100644
--- a/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.tsx
+++ b/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.tsx
@@ -31,6 +31,7 @@ export const ConfirmArchiveServiceCategoryModal = ({
   updateServiceCategory,
   revalidateTable,
 }: ConfirmArchiveServiceCategoryModalProps) => {
+  const [error, setError] = useState<string | null>(null)
   const [formData, setFormData] = useState<ServiceCategoryWithRelations | null>(null)
   const [previousServiceCategory, setPreviousServiceCategory] =
     useState<ServiceCategoryWithRelations | null>(null)
@@ -54,37 +55,46 @@ export const ConfirmArchiveServiceCategoryModal = ({
   if (!serviceCategory || !formData || !previousServiceCategory) return null
 
   const handleSave = async () => {
-    if (formData) {
-      if (!isArchived && hasServices) {
-        if (serviceAction === "remove") {
-          // Detach services
-          await updateServiceCategory({ ...formData, deletedAt: new Date(), services: [] })
-        } else if (serviceAction === "reassign" && newCategoryId) {
-          // Reassign services to the new category
-          const newCategory = serviceCategories.find((c) => c.id === newCategoryId)
-          if (newCategory) {
-            const mergedServices = [
-              ...(newCategory.services || []),
-              ...(serviceCategory.services || []),
-            ]
-            // Deduplicate services by code
-            const uniqueServices = Array.from(
-              new Map(mergedServices.map((s) => [s.code, s])).values()
-            )
-
-            // Update the new category to include the transferred services
-            await updateServiceCategory({ id: newCategoryId, services: uniqueServices })
+    try {
+      if (formData) {
+        if (!isArchived && hasServices) {
+          if (serviceAction === "remove") {
+            // Detach services
+            await updateServiceCategory({ deletedAt: new Date(), services: [] })
+          } else if (serviceAction === "reassign" && newCategoryId) {
+            // Reassign services to the new category
+            const newCategory = serviceCategories.find((c) => c.id === newCategoryId)
+            if (newCategory) {
+              const mergedServices = [
+                ...(newCategory.services || []),
+                ...(serviceCategory.services || []),
+              ]
+              // Deduplicate services by code
+              const uniqueServices = Array.from(
+                new Map(mergedServices.map((s) => [s.code, s])).values()
+              )
+
+              // Update the new category to include the transferred services
+              await updateServiceCategory({ id: newCategoryId, services: uniqueServices })
+            }
+            // Now archive the current category and detach its services
+            await updateServiceCategory({ deletedAt: new Date(), services: [] })
           }
-          // Now archive the current category and detach its services
-          await updateServiceCategory({ ...formData, deletedAt: new Date(), services: [] })
+        } else {
+          await updateServiceCategory({ deletedAt: isArchived ? null : new Date() })
         }
+
+        await revalidateTable()
+        setArchiveConfirmation("")
+        onClose()
+        window.location.href = "/protected/settings/service-categories"
+      }
+    } catch (e: unknown) {
+      if (e instanceof Error) {
+        setError(e.message)
       } else {
-        await updateServiceCategory({ ...formData, deletedAt: isArchived ? null : new Date() })
+        setError("An unknown error occurred")
       }
-
-      await revalidateTable()
-      setArchiveConfirmation("")
-      onClose()
     }
   }
 
@@ -103,6 +113,12 @@ export const ConfirmArchiveServiceCategoryModal = ({
 
       <DialogBody>
         <form className="space-y-5">
+          {error && (
+            <div className="flex flex-col gap-1 rounded-md border-l-4 border-l-red-600 bg-red-50 p-4">
+              <p className="text-sm font-medium text-red-800">{error}</p>
+            </div>
+          )}
+
           {!isArchived && hasServices && (
             <div className="space-y-4">
               <p className="text-sm font-medium text-typography-primary">
diff --git a/src/components/settings/service_categories/CreateServiceCategoryModal/CreateServiceCategoryModal.tsx b/src/components/settings/service_categories/CreateServiceCategoryModal/CreateServiceCategoryModal.tsx
index 7b845463..07b28442 100644
--- a/src/components/settings/service_categories/CreateServiceCategoryModal/CreateServiceCategoryModal.tsx
+++ b/src/components/settings/service_categories/CreateServiceCategoryModal/CreateServiceCategoryModal.tsx
@@ -98,6 +98,7 @@ export const CreateServiceCategoryModal = ({
         await revalidateTable()
         onClose()
         setIsSaving(false)
+        window.location.href = "/protected/settings"
       } catch (e: unknown) {
         if (e instanceof Error) {
           setError(e.message)
diff --git a/src/components/settings/service_categories/EditServiceCategoryModal/EditServiceCategoryModal.tsx b/src/components/settings/service_categories/EditServiceCategoryModal/EditServiceCategoryModal.tsx
index e3e76bb9..6820abf2 100644
--- a/src/components/settings/service_categories/EditServiceCategoryModal/EditServiceCategoryModal.tsx
+++ b/src/components/settings/service_categories/EditServiceCategoryModal/EditServiceCategoryModal.tsx
@@ -98,6 +98,7 @@ export const EditServiceCategoryModal = ({
         await revalidateTable()
         onClose()
         setIsSaving(false)
+        window.location.href = "/protected/settings"
       } catch (e: unknown) {
         if (e instanceof Error) {
           setError(e.message)
diff --git a/src/components/settings/services/ConfirmArchiveServiceModal/ConfirmArchiveServiceModal.tsx b/src/components/settings/services/ConfirmArchiveServiceModal/ConfirmArchiveServiceModal.tsx
index 5abcc033..2b2c8cc8 100644
--- a/src/components/settings/services/ConfirmArchiveServiceModal/ConfirmArchiveServiceModal.tsx
+++ b/src/components/settings/services/ConfirmArchiveServiceModal/ConfirmArchiveServiceModal.tsx
@@ -29,6 +29,7 @@ export const ConfirmArchiveServiceModal = ({
   updateService,
   revalidateTable,
 }: ConfirmArchiveServiceModalProps) => {
+  const [error, setError] = useState<string | null>(null)
   const [formData, setFormData] = useState<ServiceWithRelations | null>(null)
   const [previousService, setPreviousService] = useState<ServiceWithRelations | null>(null)
   const [archiveConfirmation, setArchiveConfirmation] = useState("")
@@ -46,13 +47,19 @@ export const ConfirmArchiveServiceModal = ({
 
   const handleSave = async () => {
     if (formData) {
-      await updateService(
-        { ...formData, deletedAt: isArchived ? null : new Date() },
-        previousService
-      )
-      await revalidateTable()
-      setArchiveConfirmation("")
-      onClose()
+      try {
+        await updateService({ deletedAt: isArchived ? null : new Date() }, previousService)
+        await revalidateTable()
+        setArchiveConfirmation("")
+        onClose()
+        window.location.href = "/protected/settings/services"
+      } catch (e: unknown) {
+        if (e instanceof Error) {
+          setError(e.message)
+        } else {
+          setError("An unknown error occurred")
+        }
+      }
     }
   }
 
@@ -66,6 +73,12 @@ export const ConfirmArchiveServiceModal = ({
 
       <DialogBody>
         <form className="space-y-5">
+          {error && (
+            <div className="flex flex-col gap-1 rounded-md border-l-4 border-l-red-600 bg-red-50 p-4">
+              <p className="text-sm font-medium text-red-800">{error}</p>
+            </div>
+          )}
+
           <div>
             <label
               htmlFor="archive-service"
diff --git a/src/components/settings/services/CreateServiceModal/CreateServiceModal.tsx b/src/components/settings/services/CreateServiceModal/CreateServiceModal.tsx
index b0e23262..5821a4d7 100644
--- a/src/components/settings/services/CreateServiceModal/CreateServiceModal.tsx
+++ b/src/components/settings/services/CreateServiceModal/CreateServiceModal.tsx
@@ -122,6 +122,7 @@ export const CreateServiceModal = ({
         await revalidateTable()
         onClose()
         setIsSaving(false)
+        window.location.href = "/protected/settings/services"
       } catch (e: unknown) {
         if (e instanceof Error) {
           setError(e.message)
diff --git a/src/components/settings/services/EditServiceModal/EditServiceModal.tsx b/src/components/settings/services/EditServiceModal/EditServiceModal.tsx
index f6185d1a..b6a984c3 100644
--- a/src/components/settings/services/EditServiceModal/EditServiceModal.tsx
+++ b/src/components/settings/services/EditServiceModal/EditServiceModal.tsx
@@ -122,6 +122,7 @@ export const EditServiceModal = ({
         await revalidateTable()
         onClose()
         setIsSaving(false)
+        window.location.href = "/protected/settings/services"
       } catch (e: unknown) {
         if (e instanceof Error) {
           setError(e.message)
diff --git a/src/components/settings/users/ConfirmArchiveUserModal/ConfirmArchiveUserModal.tsx b/src/components/settings/users/ConfirmArchiveUserModal/ConfirmArchiveUserModal.tsx
index bbe9d573..eabc2c3c 100644
--- a/src/components/settings/users/ConfirmArchiveUserModal/ConfirmArchiveUserModal.tsx
+++ b/src/components/settings/users/ConfirmArchiveUserModal/ConfirmArchiveUserModal.tsx
@@ -10,7 +10,6 @@ import {
   Modal,
 } from "@/components/common/dialog"
 import type { Role, StaffUser } from "@/generated/prisma/client"
-import { useEditableRoles } from "@/hooks/useEditableRoles"
 
 type ConfirmArchiveUserModalProps = {
   open: boolean
@@ -19,7 +18,7 @@ type ConfirmArchiveUserModalProps = {
   updateStaffUser: (
     user: Partial<StaffUser>,
     prevUser: Partial<StaffUser>,
-    availableRoles: Role[]
+    availableRoles?: Role[]
   ) => Promise<StaffUser | null>
   revalidateTable: () => Promise<void>
 }
@@ -31,10 +30,10 @@ export const ConfirmArchiveUserModal = ({
   updateStaffUser,
   revalidateTable,
 }: ConfirmArchiveUserModalProps) => {
+  const [error, setError] = useState<string | null>(null)
   const [formData, setFormData] = useState<StaffUser | null>(null)
   const [previousUser, setPreviousUser] = useState<StaffUser | null>(null)
   const [archiveConfirmation, setArchiveConfirmation] = useState("")
-  const editableRoles = useEditableRoles()
 
   const isArchived = user?.deletedAt !== null
 
@@ -49,14 +48,19 @@ export const ConfirmArchiveUserModal = ({
 
   const handleSave = async () => {
     if (formData) {
-      await updateStaffUser(
-        { ...formData, deletedAt: isArchived ? null : new Date() },
-        previousUser,
-        editableRoles
-      )
-      await revalidateTable()
-      setArchiveConfirmation("")
-      onClose()
+      try {
+        await updateStaffUser({ deletedAt: isArchived ? null : new Date() }, previousUser)
+        await revalidateTable()
+        setArchiveConfirmation("")
+        onClose()
+        window.location.href = "/protected/settings/users"
+      } catch (e: unknown) {
+        if (e instanceof Error) {
+          setError(e.message)
+        } else {
+          setError("An unknown error occurred.")
+        }
+      }
     }
   }
 
@@ -70,6 +74,12 @@ export const ConfirmArchiveUserModal = ({
 
       <DialogBody>
         <form className="space-y-5">
+          {error && (
+            <div className="flex flex-col gap-1 rounded-md border-l-4 border-l-red-600 bg-red-50 p-4">
+              <p className="text-sm font-medium text-red-800">{error}</p>
+            </div>
+          )}
+
           <div>
             <label
               htmlFor="archive-user"
diff --git a/src/components/settings/users/EditStaffUserModal/EditStaffUserModal.tsx b/src/components/settings/users/EditStaffUserModal/EditStaffUserModal.tsx
index cfcd0d24..9bed0f36 100644
--- a/src/components/settings/users/EditStaffUserModal/EditStaffUserModal.tsx
+++ b/src/components/settings/users/EditStaffUserModal/EditStaffUserModal.tsx
@@ -10,7 +10,6 @@ import {
   Modal,
 } from "@/components/common/dialog"
 import type { Location, Role, StaffUser } from "@/generated/prisma/client"
-import { useEditableRoles } from "@/hooks/useEditableRoles"
 import { PermissionsSection } from "./sections/PermissionsSection"
 import { RoleAndAssignmentSection } from "./sections/RoleAndAssignmentSection"
 import { UserInformationSection } from "./sections/UserInformationSection"
@@ -19,6 +18,9 @@ type EditStaffUserModalProps = {
   open: boolean
   onClose: () => void
   user: StaffUser | null
+  canEdit: boolean
+  canArchive: boolean
+  availableRoles: Role[]
   locations: Location[]
   updateStaffUser: (
     user: Partial<StaffUser>,
@@ -33,7 +35,10 @@ export const EditStaffUserModal = ({
   open,
   onClose,
   user,
+  canEdit,
+  canArchive,
   locations,
+  availableRoles,
   updateStaffUser,
   revalidateTable,
   openConfirmArchiveUserModal,
@@ -42,7 +47,6 @@ export const EditStaffUserModal = ({
   const [error, setError] = useState<string | null>(null)
   const [formData, setFormData] = useState<StaffUser | null>(null)
   const [previousUser, setPreviousUser] = useState<StaffUser | null>(null)
-  const editableRoles = useEditableRoles()
 
   useEffect(() => {
     if (open && user) {
@@ -53,10 +57,8 @@ export const EditStaffUserModal = ({
 
   if (!user || !formData || !previousUser) return null
 
-  // Check if the user being edited has a higher role than the current user
-  const isUserHigherRole = !editableRoles.includes(user.role)
   const isArchived = user.deletedAt !== null
-  const isReadonly = isUserHigherRole || isArchived
+  const isReadonly = isArchived || !canEdit
 
   const hasMadeChanges = JSON.stringify(formData) !== JSON.stringify(previousUser)
 
@@ -64,10 +66,11 @@ export const EditStaffUserModal = ({
     if (formData && !isReadonly) {
       try {
         setIsSaving(true)
-        await updateStaffUser(formData, previousUser, editableRoles)
+        await updateStaffUser(formData, previousUser, availableRoles)
         await revalidateTable()
         onClose()
         setIsSaving(false)
+        window.location.href = "/protected/settings/users" // Force re-fetch
       } catch (e: unknown) {
         if (e instanceof Error) {
           setError(e.message)
@@ -94,14 +97,14 @@ export const EditStaffUserModal = ({
         <form className="space-y-5">
           {isReadonly && (
             <div className="flex flex-col gap-1 rounded-md border-l-4 border-l-red-600 bg-red-50 p-4">
-              {isUserHigherRole && (
+              {isArchived && (
                 <p className="text-sm font-medium text-red-800">
-                  This user has a higher role than yours and cannot be edited.
+                  This user is archived and cannot be edited.
                 </p>
               )}
-              {isArchived && (
+              {!canEdit && (
                 <p className="text-sm font-medium text-red-800">
-                  This user is archived and cannot be edited.
+                  You do not have permission to edit this user.
                 </p>
               )}
             </div>
@@ -120,7 +123,7 @@ export const EditStaffUserModal = ({
               user={formData}
               locations={locations}
               setFormData={setFormData}
-              availableRoles={editableRoles}
+              availableRoles={availableRoles}
               disabled={isReadonly}
             />
             <PermissionsSection user={formData} setFormData={setFormData} disabled={isReadonly} />
@@ -132,14 +135,11 @@ export const EditStaffUserModal = ({
         <button type="button" className="tertiary" onClick={onClose}>
           Cancel
         </button>
-        <button
-          type="button"
-          className="secondary danger"
-          onClick={handleOpenArchive}
-          disabled={isUserHigherRole}
-        >
-          {isArchived ? "Unarchive" : "Archive"}
-        </button>
+        {canArchive && (
+          <button type="button" className="secondary danger" onClick={handleOpenArchive}>
+            {isArchived ? "Unarchive" : "Archive"}
+          </button>
+        )}
         <button
           type="button"
           className="primary"
diff --git a/src/components/settings/users/StaffUserTable/StaffUserTable.tsx b/src/components/settings/users/StaffUserTable/StaffUserTable.tsx
index 73dc629e..19e93d3f 100644
--- a/src/components/settings/users/StaffUserTable/StaffUserTable.tsx
+++ b/src/components/settings/users/StaffUserTable/StaffUserTable.tsx
@@ -1,31 +1,38 @@
 "use client"
 
-import { useState } from "react"
+import { useEffect, useMemo, useState } from "react"
 import { DataTable } from "@/components/common/datatable"
 import { Switch } from "@/components/common/switch"
 import type { Location, Role, StaffUser } from "@/generated/prisma/client"
+import { useAuth } from "@/hooks/useAuth"
 import { useDialog } from "@/hooks/useDialog/useDialog"
+import type { StaffUserWithRelations } from "@/lib/prisma/staff_user/types"
+import { resolvePolicy } from "@/utils/policies/resolvePolicy"
+import type { UserContext } from "@/utils/policies/types"
 import { ConfirmArchiveUserModal } from "../ConfirmArchiveUserModal"
 import { EditStaffUserModal } from "../EditStaffUserModal"
 import { columns } from "./columns"
 
 export type UserTableProps = {
+  currentUser: StaffUserWithRelations | null
   users: StaffUser[]
   locations: Location[]
   updateStaffUser: (
     user: Partial<StaffUser>,
     prevUser: Partial<StaffUser>,
-    availableRoles: Role[]
+    availableRoles?: Role[]
   ) => Promise<StaffUser | null>
   revalidateTable: () => Promise<void>
 }
 
 export const StaffUserTable = ({
+  currentUser,
   users,
   locations,
   updateStaffUser,
   revalidateTable,
 }: UserTableProps) => {
+  const { role, idir_user_guid } = useAuth()
   const {
     open: editUserModalOpen,
     openDialog: openEditUserModal,
@@ -37,15 +44,54 @@ export const StaffUserTable = ({
     closeDialog: closeConfirmArchiveUserModal,
   } = useDialog()
 
+  const userContext = useMemo<UserContext>(
+    () => ({
+      staff_user_id: idir_user_guid ?? null,
+      role,
+      location_code: currentUser?.locationCode ?? null,
+    }),
+    [idir_user_guid, role, currentUser?.locationCode]
+  )
+
   const [selectedUser, setSelectedUser] = useState<StaffUser | null>(null)
+  const [canEditSelectedUser, setCanEditSelectedUser] = useState<boolean>(false)
+  const [canArchiveSelectedUser, setCanArchiveSelectedUser] = useState<boolean>(false)
+  const [availableRolesForSelectedUser, setAvailableRolesForSelectedUser] = useState<Role[]>([])
   const [showArchived, setShowArchived] = useState<boolean>(false)
 
+  // Determine if the current user can edit/archive the selected user whenever either changes
+  useEffect(() => {
+    if (selectedUser) {
+      const actions = resolvePolicy("staff_user", userContext, selectedUser)
+      setCanEditSelectedUser(actions.includes("edit"))
+      setCanArchiveSelectedUser(actions.includes("archive"))
+
+      // Extract available roles from change_role_to_ actions
+      const availableRoles = actions
+        .filter((action) => action.startsWith("change_role_to_"))
+        .map((action) => action.replace("change_role_to_", "") as Role)
+
+      setAvailableRolesForSelectedUser(availableRoles)
+    } else {
+      setCanEditSelectedUser(false)
+      setCanArchiveSelectedUser(false)
+      setAvailableRolesForSelectedUser([])
+    }
+  }, [selectedUser, userContext])
+
   const handleRowClick = (user: StaffUser) => {
     setSelectedUser(user)
     openEditUserModal()
   }
 
-  const usersToShow = showArchived ? users : users.filter((user) => user.deletedAt === null)
+  const usersToShow = users.filter((user) => {
+    // Filter by archived status
+    if (!showArchived && user.deletedAt !== null) return false
+
+    // Filter by view permission
+    const actions = resolvePolicy("staff_user", userContext, user)
+    return actions.includes("view")
+  })
 
   return (
     <>
@@ -72,6 +118,9 @@ export const StaffUserTable = ({
         open={editUserModalOpen}
         onClose={closeEditUserModal}
         user={selectedUser}
+        canEdit={canEditSelectedUser}
+        canArchive={canArchiveSelectedUser}
+        availableRoles={availableRolesForSelectedUser}
         locations={locations}
         updateStaffUser={updateStaffUser}
         revalidateTable={revalidateTable}
diff --git a/src/components/settings/users/StaffUserTable/columns.tsx b/src/components/settings/users/StaffUserTable/columns.tsx
index bae1bb78..4bb96c42 100644
--- a/src/components/settings/users/StaffUserTable/columns.tsx
+++ b/src/components/settings/users/StaffUserTable/columns.tsx
@@ -9,7 +9,10 @@ export const columns: ColumnConfig<StaffUser>[] = [
     searchable: true,
     render: (value, row) => {
       return (
-        <span className={row.deletedAt ? "text-typography-danger" : ""}>{value as string}</span>
+        <div className="flex flex-row gap-2 items-center">
+          {row.isActive && <div className="w-2 h-2 rounded-full bg-green-500" />}
+          <span className={row.deletedAt ? "text-typography-danger" : ""}>{value as string}</span>
+        </div>
       )
     },
   },
@@ -30,7 +33,14 @@ export const columns: ColumnConfig<StaffUser>[] = [
     searchable: true,
     render: (value, row) => {
       return (
-        <span className={row.deletedAt ? "text-typography-danger" : ""}>{value as string}</span>
+        <span
+          className={[
+            row.deletedAt ? "text-typography-danger" : "",
+            value === "Authenticated" ? "text-neutral-300" : "",
+          ].join(" ")}
+        >
+          {value as string}
+        </span>
       )
     },
   },
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index ad051d11..b438b836 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -1,5 +1,4 @@
 export * from "./useAuth"
 export * from "./useDataTable"
 export * from "./useDialog"
-export * from "./useEditableRoles"
 export * from "./useGeocoderAutocomplete"
diff --git a/src/hooks/useEditableRoles/index.ts b/src/hooks/useEditableRoles/index.ts
deleted file mode 100644
index 69b41f43..00000000
--- a/src/hooks/useEditableRoles/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { useEditableRoles } from "./useEditableRoles"
diff --git a/src/hooks/useEditableRoles/useEditableRoles.test.ts b/src/hooks/useEditableRoles/useEditableRoles.test.ts
deleted file mode 100644
index e7a89742..00000000
--- a/src/hooks/useEditableRoles/useEditableRoles.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { renderHook } from "@testing-library/react"
-import { beforeEach, describe, expect, it, vi } from "vitest"
-import type { UseAuthReturn } from "@/hooks/useAuth"
-import { useEditableRoles } from "./useEditableRoles"
-
-const mockUseAuth = vi.hoisted(() => ({
-  useAuth: vi.fn(
-    (): UseAuthReturn => ({
-      isAuthenticated: false,
-      hasRole: (): boolean => false,
-    })
-  ),
-}))
-
-vi.mock("@/hooks/useAuth", () => mockUseAuth)
-
-describe("useEditableRoles", () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it("should return empty array when user has no roles", () => {
-    mockUseAuth.useAuth.mockReturnValue({
-      isAuthenticated: false,
-      hasRole: (): boolean => false,
-    } as UseAuthReturn)
-
-    const { result } = renderHook(() => useEditableRoles())
-
-    expect(result.current).toEqual([])
-  })
-
-  it("should return CSR role when user has CSR role", () => {
-    mockUseAuth.useAuth.mockReturnValue({
-      isAuthenticated: true,
-      hasRole: (role: string): boolean => role === "CSR",
-    } as UseAuthReturn)
-
-    const { result } = renderHook(() => useEditableRoles())
-
-    expect(result.current).toEqual(["CSR"])
-  })
-
-  it("should return CSR and SCSR roles when user has SCSR role", () => {
-    mockUseAuth.useAuth.mockReturnValue({
-      isAuthenticated: true,
-      hasRole: (role: string): boolean => role === "SCSR",
-    } as UseAuthReturn)
-
-    const { result } = renderHook(() => useEditableRoles())
-
-    expect(result.current).toEqual(["CSR", "SCSR"])
-  })
-
-  it("should return CSR, SCSR, and SDM roles when user has SDM role", () => {
-    mockUseAuth.useAuth.mockReturnValue({
-      isAuthenticated: true,
-      hasRole: (role: string): boolean => role === "SDM",
-    } as UseAuthReturn)
-
-    const { result } = renderHook(() => useEditableRoles())
-
-    expect(result.current).toEqual(["CSR", "SCSR", "SDM"])
-  })
-
-  it("should return all roles when user has Administrator role", () => {
-    mockUseAuth.useAuth.mockReturnValue({
-      isAuthenticated: true,
-      hasRole: (role: string): boolean => role === "Administrator",
-    } as UseAuthReturn)
-
-    const { result } = renderHook(() => useEditableRoles())
-
-    expect(result.current).toEqual(["CSR", "SCSR", "SDM", "Administrator"])
-  })
-
-  it("should return highest role and all lower roles when user has multiple roles", () => {
-    mockUseAuth.useAuth.mockReturnValue({
-      isAuthenticated: true,
-      hasRole: (role: string): boolean => ["CSR", "Administrator"].includes(role),
-    } as UseAuthReturn)
-
-    const { result } = renderHook(() => useEditableRoles())
-
-    // Should return up to Administrator (highest role)
-    expect(result.current).toEqual(["CSR", "SCSR", "SDM", "Administrator"])
-  })
-})
diff --git a/src/hooks/useEditableRoles/useEditableRoles.ts b/src/hooks/useEditableRoles/useEditableRoles.ts
deleted file mode 100644
index e323f96c..00000000
--- a/src/hooks/useEditableRoles/useEditableRoles.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { useMemo } from "react"
-import type { Role } from "@/generated/prisma/client"
-import { Role as RoleMap } from "@/generated/prisma/enums"
-import { useAuth } from "@/hooks/useAuth"
-
-/**
- * Hook to get editable roles for the current user.
- * Returns the current user's role and all lower roles in the hierarchy.
- * Only roles at or below the user's level can be edited/assigned to other users.
- *
- * @returns Array of roles that can be edited (current user's role and all lower roles)
- */
-export const useEditableRoles = (): Role[] => {
-  const { hasRole } = useAuth()
-
-  const editableRoles = useMemo(() => {
-    const roleHierarchy = Object.values(RoleMap)
-
-    // Find the user's highest role by testing each role in reverse order
-    let userRoleIndex = -1
-    for (let i = roleHierarchy.length - 1; i >= 0; i--) {
-      if (hasRole(roleHierarchy[i])) {
-        userRoleIndex = i
-        break
-      }
-    }
-
-    if (userRoleIndex === -1) return []
-
-    return roleHierarchy.slice(0, userRoleIndex + 1)
-  }, [hasRole])
-
-  return editableRoles
-}
diff --git a/src/lib/prisma/staff_user/getAllStaffUsers.ts b/src/lib/prisma/staff_user/getAllStaffUsers.ts
index d12aeba8..40845a61 100644
--- a/src/lib/prisma/staff_user/getAllStaffUsers.ts
+++ b/src/lib/prisma/staff_user/getAllStaffUsers.ts
@@ -1,13 +1,15 @@
 "use server"
 
-import type { StaffUser } from "@/generated/prisma/client"
 import { prisma } from "@/utils/db/prisma"
+import type { StaffUserWithRelations } from "./types"
 
 /**
  * Function to retrieve all staff users from the database.
  * @returns Promise resolving to an array of StaffUser objects
  */
-export const getAllStaffUsers = async (): Promise<StaffUser[]> => {
-  const staffUsers = await prisma.staffUser.findMany()
+export const getAllStaffUsers = async (): Promise<StaffUserWithRelations[]> => {
+  const staffUsers = await prisma.staffUser.findMany({
+    include: { location: true, counter: true },
+  })
   return staffUsers
 }
diff --git a/src/lib/prisma/staff_user/getStaffUserBySub.test.ts b/src/lib/prisma/staff_user/getStaffUserBySub.test.ts
index 3e69392e..0fc110d9 100644
--- a/src/lib/prisma/staff_user/getStaffUserBySub.test.ts
+++ b/src/lib/prisma/staff_user/getStaffUserBySub.test.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from "vitest"
-import type { StaffUser } from "@/generated/prisma/client"
 import { prisma } from "@/utils/db/prisma"
 import { getStaffUserBySub } from "./getStaffUserBySub"
+import type { StaffUserWithRelations } from "./types"
 
 vi.mock("@/utils/db/prisma", () => ({
   prisma: {
@@ -21,10 +21,10 @@ describe("getStaffUserBySub", () => {
       sub: "550e8400-e29b-41d4-a716-446655440000@azureidir",
       guid: "550e8400-e29b-41d4-a716-446655440000",
       legacyCsrId: null,
-      locationId: null,
       username: "user1",
       displayName: "User One",
-      counterId: 1,
+      locationCode: null,
+      counterId: null,
       role: "CSR" as const,
       isActive: true,
       deletedAt: null,
@@ -35,13 +35,16 @@ describe("getStaffUserBySub", () => {
       isPesticideDesignate: false,
       isFinanceDesignate: false,
       isIta2Designate: false,
-    } as StaffUser
+    } as StaffUserWithRelations
 
     vi.mocked(prisma.staffUser.findUnique).mockResolvedValueOnce(mockUser)
 
     const result = await getStaffUserBySub(mockUser.sub)
 
-    expect(prisma.staffUser.findUnique).toHaveBeenCalledWith({ where: { sub: mockUser.sub } })
+    expect(prisma.staffUser.findUnique).toHaveBeenCalledWith({
+      where: { sub: mockUser.sub },
+      include: { location: true, counter: true },
+    })
     expect(result).toEqual(mockUser)
   })
 
@@ -50,6 +53,10 @@ describe("getStaffUserBySub", () => {
 
     const result = await getStaffUserBySub("non-existent-sub")
 
+    expect(prisma.staffUser.findUnique).toHaveBeenCalledWith({
+      where: { sub: "non-existent-sub" },
+      include: { location: true, counter: true },
+    })
     expect(result).toBeNull()
   })
 })
diff --git a/src/lib/prisma/staff_user/getStaffUserBySub.ts b/src/lib/prisma/staff_user/getStaffUserBySub.ts
index 857d4fce..a1d78b90 100644
--- a/src/lib/prisma/staff_user/getStaffUserBySub.ts
+++ b/src/lib/prisma/staff_user/getStaffUserBySub.ts
@@ -1,14 +1,17 @@
 "use server"
 
-import type { StaffUser } from "@/generated/prisma/client"
 import { prisma } from "@/utils/db/prisma"
+import type { StaffUserWithRelations } from "./types"
 
 /**
  * Function to retrieve a staff user by their subject identifier.
  * @param sub The subject identifier of the staff user
- * @returns Promise resolving to a StaffUser object or null if not found
+ * @returns Promise resolving to a StaffUserWithRelations object or null if not found
  */
-export const getStaffUserBySub = async (sub: string): Promise<StaffUser | null> => {
-  const staffUser = await prisma.staffUser.findUnique({ where: { sub } })
+export const getStaffUserBySub = async (sub: string): Promise<StaffUserWithRelations | null> => {
+  const staffUser = await prisma.staffUser.findUnique({
+    where: { sub },
+    include: { location: true, counter: true },
+  })
   return staffUser
 }
diff --git a/src/lib/prisma/staff_user/insertStaffUser.test.ts b/src/lib/prisma/staff_user/insertStaffUser.test.ts
index 60d5cd30..d3144420 100644
--- a/src/lib/prisma/staff_user/insertStaffUser.test.ts
+++ b/src/lib/prisma/staff_user/insertStaffUser.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
+import type { StaffUser } from "@/generated/prisma/client"
 import type { Role } from "@/generated/prisma/enums"
 import { prisma } from "@/utils/db/prisma"
 import { assignRole } from "@/utils/sso/assignRole"
@@ -31,7 +32,6 @@ describe("insertStaffUser (staff_user)", () => {
       sub: "sub-123",
       username: "j.doe",
       displayName: "J Doe",
-      locationCode: null,
       role: "CSR" as Role,
     }
 
@@ -41,7 +41,7 @@ describe("insertStaffUser (staff_user)", () => {
       legacyCsrId: null,
       username: inputData.username,
       displayName: inputData.displayName,
-      locationCode: inputData.locationCode,
+      locationCode: null,
       counterId: null,
       role: "CSR" as Role,
       isActive: true,
@@ -61,17 +61,58 @@ describe("insertStaffUser (staff_user)", () => {
     const result = await insertStaffUser(inputData)
 
     expect(assignRole).toHaveBeenCalledWith(inputData.sub, inputData.role)
-    expect(prisma.staffUser.create).toHaveBeenCalledWith({ data: { ...inputData } })
+    expect(prisma.staffUser.create).toHaveBeenCalledWith({
+      data: { ...inputData },
+      include: { location: true, counter: true },
+    })
     expect(result).toEqual(mockCreated)
   })
 
+  it("throws error when guid is missing", async () => {
+    const inputData = {
+      sub: "s",
+      role: "CSR" as Role,
+    } as unknown as StaffUser
+
+    await expect(insertStaffUser(inputData)).rejects.toThrow(
+      "GUID, SUB, and Role are required to insert a staff user."
+    )
+    expect(assignRole).not.toHaveBeenCalled()
+    expect(prisma.staffUser.create).not.toHaveBeenCalled()
+  })
+
+  it("throws error when sub is missing", async () => {
+    const inputData = {
+      guid: "g",
+      role: "CSR" as Role,
+    } as unknown as StaffUser
+
+    await expect(insertStaffUser(inputData)).rejects.toThrow(
+      "GUID, SUB, and Role are required to insert a staff user."
+    )
+    expect(assignRole).not.toHaveBeenCalled()
+    expect(prisma.staffUser.create).not.toHaveBeenCalled()
+  })
+
+  it("throws error when role is missing", async () => {
+    const inputData = {
+      guid: "g",
+      sub: "s",
+    } as unknown as StaffUser
+
+    await expect(insertStaffUser(inputData)).rejects.toThrow(
+      "GUID, SUB, and Role are required to insert a staff user."
+    )
+    expect(assignRole).not.toHaveBeenCalled()
+    expect(prisma.staffUser.create).not.toHaveBeenCalled()
+  })
+
   it("propagates SSO assignRole errors", async () => {
     const inputData = {
       guid: "g",
       sub: "s",
       username: "u",
       displayName: "d",
-      locationCode: null,
       role: "CSR" as Role,
     }
     const ssoError = new Error("SSO failed")
@@ -87,7 +128,6 @@ describe("insertStaffUser (staff_user)", () => {
       sub: "s2",
       username: "u2",
       displayName: "d2",
-      locationCode: null,
       role: "CSR" as Role,
     }
     const dbError = new Error("DB failed")
diff --git a/src/lib/prisma/staff_user/insertStaffUser.ts b/src/lib/prisma/staff_user/insertStaffUser.ts
index 32c55863..130ed3e4 100644
--- a/src/lib/prisma/staff_user/insertStaffUser.ts
+++ b/src/lib/prisma/staff_user/insertStaffUser.ts
@@ -1,15 +1,18 @@
 "use server"
 
-import type { Prisma, StaffUser } from "@/generated/prisma/client"
+import type { Prisma } from "@/generated/prisma/client"
 import { prisma } from "@/utils/db/prisma"
 import { assignRole } from "@/utils/sso/assignRole"
+import type { StaffUserWithRelations } from "./types"
 
 /**
  * Function to insert a staff user in the database and sso.
  * @param user Data to insert the staff user with
  * @returns Promise resolving to the inserted StaffUser object
  */
-export const insertStaffUser = async (user: Prisma.StaffUserCreateInput): Promise<StaffUser> => {
+export const insertStaffUser = async (
+  user: Prisma.StaffUserCreateInput
+): Promise<StaffUserWithRelations> => {
   if (!user.guid || !user.sub || !user.role) {
     throw new Error("GUID, SUB, and Role are required to insert a staff user.")
   }
@@ -17,6 +20,9 @@ export const insertStaffUser = async (user: Prisma.StaffUserCreateInput): Promis
   // Update SSO role
   await assignRole(user.sub, user.role)
 
-  const staffUser = await prisma.staffUser.create({ data: { ...user } })
+  const staffUser = await prisma.staffUser.create({
+    data: { ...user },
+    include: { location: true, counter: true },
+  })
   return staffUser
 }
diff --git a/src/lib/prisma/staff_user/types.ts b/src/lib/prisma/staff_user/types.ts
new file mode 100644
index 00000000..4a888a7d
--- /dev/null
+++ b/src/lib/prisma/staff_user/types.ts
@@ -0,0 +1,5 @@
+import type { Prisma } from "@/generated/prisma/client"
+
+export type StaffUserWithRelations = Prisma.StaffUserGetPayload<{
+  include: { location: true; counter: true }
+}>
diff --git a/src/lib/prisma/staff_user/updateStaffUser.test.ts b/src/lib/prisma/staff_user/updateStaffUser.test.ts
index 67199872..0cf231c8 100644
--- a/src/lib/prisma/staff_user/updateStaffUser.test.ts
+++ b/src/lib/prisma/staff_user/updateStaffUser.test.ts
@@ -1,8 +1,9 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
-import type { Role, StaffUser } from "@/generated/prisma/client"
+import type { Role } from "@/generated/prisma/client"
 import { prisma } from "@/utils/db/prisma"
 import { assignRole } from "@/utils/sso/assignRole"
 import { unassignRole } from "@/utils/sso/unassignRole"
+import type { StaffUserWithRelations } from "./types"
 import { updateStaffUser } from "./updateStaffUser"
 
 vi.mock("@/utils/db/prisma", () => ({
@@ -16,14 +17,14 @@ vi.mock("@/utils/sso/assignRole")
 vi.mock("@/utils/sso/unassignRole")
 
 describe("updateStaffUser", () => {
-  const mockStaffUser: StaffUser = {
+  const mockStaffUser: StaffUserWithRelations = {
     guid: "test-guid-123",
     sub: "test-sub-123",
     legacyCsrId: 5,
     username: "test.user",
     displayName: "Test User",
-    locationId: "11111111-1111-1111-1111-111111111111",
-    counterId: null,
+    locationCode: "LOC123",
+    counterId: "counter-123",
     role: "CSR" as Role,
     isActive: true,
     deletedAt: null,
@@ -34,6 +35,26 @@ describe("updateStaffUser", () => {
     isPesticideDesignate: false,
     isFinanceDesignate: false,
     isIta2Designate: false,
+    location: {
+      code: "LOC123",
+      name: "Test Location",
+      timezone: "America/Vancouver",
+      streetAddress: "123 Main St",
+      mailAddress: null,
+      phoneNumber: null,
+      latitude: 49.0,
+      longitude: -123.0,
+      legacyOfficeNumber: null,
+      deletedAt: null,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+    },
+    counter: {
+      id: "counter-123",
+      name: "Counter 1",
+      createdAt: new Date(),
+      updatedAt: new Date(),
+    },
   }
 
   beforeEach(() => {
diff --git a/src/lib/prisma/staff_user/updateStaffUser.ts b/src/lib/prisma/staff_user/updateStaffUser.ts
index bb7c7653..ed874b62 100644
--- a/src/lib/prisma/staff_user/updateStaffUser.ts
+++ b/src/lib/prisma/staff_user/updateStaffUser.ts
@@ -1,9 +1,10 @@
 "use server"
 
-import type { Role, StaffUser } from "@/generated/prisma/client"
+import type { Role } from "@/generated/prisma/client"
 import { prisma } from "@/utils/db/prisma"
 import { assignRole } from "@/utils/sso/assignRole"
 import { unassignRole } from "@/utils/sso/unassignRole"
+import type { StaffUserWithRelations } from "./types"
 
 /**
  * Function to update a staff user in the database and sso.
@@ -13,11 +14,19 @@ import { unassignRole } from "@/utils/sso/unassignRole"
  * @returns Promise resolving to the updated StaffUser object or null if not found
  */
 export const updateStaffUser = async (
-  user: Partial<StaffUser>,
-  prevUser: Partial<StaffUser>,
+  user: Partial<StaffUserWithRelations>,
+  prevUser: Partial<StaffUserWithRelations>,
   availableRoles: Role[] = []
-): Promise<StaffUser | null> => {
-  const { guid, sub, ...data } = user
+): Promise<StaffUserWithRelations | null> => {
+  const {
+    guid,
+    sub,
+    location: _location,
+    counter: _counter,
+    locationCode,
+    counterId,
+    ...data
+  } = user
   if (!guid && !prevUser.guid) return null
 
   // Use provided guid or fall back to previous user's guid
@@ -28,9 +37,13 @@ export const updateStaffUser = async (
     throw new Error("You do not have permission to assign this role.")
   }
 
+  const locationData = locationCode ? { connect: { code: locationCode } } : undefined
+  const counterData = counterId ? { connect: { id: counterId } } : undefined
+
   const staffUser = await prisma.staffUser.update({
     where: { guid: guidToUpdate },
-    data: { ...data, updatedAt: new Date() },
+    data: { ...data, location: locationData, counter: counterData, updatedAt: new Date() },
+    include: { location: true, counter: true },
   })
   if (!staffUser) return null
 
diff --git a/src/middleware/README.md b/src/middleware/README.md
index ba8e51d9..5962016b 100644
--- a/src/middleware/README.md
+++ b/src/middleware/README.md
@@ -80,19 +80,33 @@ Use `getAuthContext()` to extract authentication information:
 import { getAuthContext } from "@/utils/auth/getAuthContext"
 
 export async function GET(request: NextRequest) {
-  const { user, token, roles } = getAuthContext(request)
+  const { user, token, roles } = getAuthContext(request.headers) ?? {}
 
   // Use user information for business logic
-  console.log(`User: ${user.display_name}, Roles: ${roles}`)
+  console.log(`User: ${user?.display_name}, Roles: ${roles}`)
 }
 ```
 
-### In Frontend Pages
+### In Server Components & Pages
 
-Authentication is handled automatically by the middleware:
-- **Protected pages**: Users are redirected to home page if not authenticated
-- **Public pages**: No authentication required
-- **Access tokens**: Automatically managed via HTTP-only cookies
+Use `getAuthContext()` with `headers()` from Next.js:
+
+```typescript
+import { headers } from "next/headers"
+import { getAuthContext } from "@/utils/auth/getAuthContext"
+
+export default async function Page() {
+  const headersList = await headers()
+  const { user = { sub: "" } } = getAuthContext(headersList) ?? {}
+
+  // Use user.sub to fetch user-specific data
+  const currentUser = await getStaffUserBySub(user.sub)
+
+  return <div>{currentUser?.displayName}</div>
+}
+```
+
+**Note**: `getAuthContext` returns `null` if authentication fails, so use nullish coalescing (`??`) to provide fallback values.
 
 ## Cookie Configuration
 
diff --git a/src/middleware/auth.ts b/src/middleware/auth.ts
index 2258a12a..8530f793 100644
--- a/src/middleware/auth.ts
+++ b/src/middleware/auth.ts
@@ -109,9 +109,14 @@ export async function frontendAuthMiddleware(request: NextRequest): Promise<Next
       return NextResponse.redirect(new URL("/", request.url))
     }
 
-    // Token is valid, continue with the request
+    // Token is valid, continue with the request and add user info to headers
     const response = NextResponse.next()
 
+    // Add token and user information to headers so pages can access them
+    response.headers.set("x-user-token", accessToken)
+    response.headers.set("x-user-info", JSON.stringify(validationResult.user))
+    response.headers.set("x-user-roles", JSON.stringify(validationResult.roles || []))
+
     return response
   } catch (error) {
     console.error("Frontend auth middleware error:", error)
diff --git a/src/utils/auth/README.md b/src/utils/auth/README.md
index 51f67701..50aee007 100644
--- a/src/utils/auth/README.md
+++ b/src/utils/auth/README.md
@@ -7,7 +7,7 @@ This folder contains modular utilities for handling authentication logic across
 ```
 src/utils/auth/
 ├── constants.ts                    # Static auth values (token keys, timeouts)
-├── getAuthContext.ts               # Auth context retrieval (for api routes)
+├── getAuthContext.ts               # Auth context retrieval (for api routes and pages)
 ├── types.ts                        # Types for auth objects
 ├── jwt/
 │   ├── decodeJWT.ts               # JWT token payload decoding
diff --git a/src/utils/auth/getAuthContext.test.ts b/src/utils/auth/getAuthContext.test.ts
index 284c8b7c..cc15d366 100644
--- a/src/utils/auth/getAuthContext.test.ts
+++ b/src/utils/auth/getAuthContext.test.ts
@@ -1,4 +1,3 @@
-import type { NextRequest } from "next/server"
 import { beforeEach, describe, expect, it, vi } from "vitest"
 import { getAuthContext } from "./getAuthContext"
 import type { SSOIdirUser } from "./types"
@@ -40,26 +39,20 @@ describe("getAuthContext", () => {
 
   const mockRoles = ["admin", "user"]
 
-  const createMockRequest = (headers: Record<string, string | null>): NextRequest => {
+  const createMockHeaders = (headers: Record<string, string | null>): Headers => {
     const headerEntries = Object.entries(headers).filter(([, value]) => value !== null)
-    const mockHeaders = new Headers(headerEntries as [string, string][])
-
-    return {
-      headers: {
-        get: (name: string) => mockHeaders.get(name),
-      },
-    } as NextRequest
+    return new Headers(headerEntries as [string, string][])
   }
 
   describe("when all required headers are present and valid", () => {
     it("should return auth context with user, token, and roles", () => {
-      const request = createMockRequest({
+      const headers = createMockHeaders({
         "x-user-token": "valid-token",
         "x-user-info": JSON.stringify(mockUser),
         "x-user-roles": JSON.stringify(mockRoles),
       })
 
-      const result = getAuthContext(request)
+      const result = getAuthContext(headers)
 
       expect(result).toEqual({
         user: mockUser,
@@ -69,13 +62,13 @@ describe("getAuthContext", () => {
     })
 
     it("should return auth context with empty roles when x-user-roles header is missing", () => {
-      const request = createMockRequest({
+      const headers = createMockHeaders({
         "x-user-token": "valid-token",
         "x-user-info": JSON.stringify(mockUser),
         "x-user-roles": null,
       })
 
-      const result = getAuthContext(request)
+      const result = getAuthContext(headers)
 
       expect(result).toEqual({
         user: mockUser,
@@ -87,37 +80,37 @@ describe("getAuthContext", () => {
 
   describe("when required headers are missing", () => {
     it("should return null when x-user-token header is missing", () => {
-      const request = createMockRequest({
+      const headers = createMockHeaders({
         "x-user-token": null,
         "x-user-info": JSON.stringify(mockUser),
         "x-user-roles": JSON.stringify(mockRoles),
       })
 
-      const result = getAuthContext(request)
+      const result = getAuthContext(headers)
 
       expect(result).toBeNull()
     })
 
     it("should return null when x-user-info header is missing", () => {
-      const request = createMockRequest({
+      const headers = createMockHeaders({
         "x-user-token": "valid-token",
         "x-user-info": null,
         "x-user-roles": JSON.stringify(mockRoles),
       })
 
-      const result = getAuthContext(request)
+      const result = getAuthContext(headers)
 
       expect(result).toBeNull()
     })
 
     it("should return null when both required headers are missing", () => {
-      const request = createMockRequest({
+      const headers = createMockHeaders({
         "x-user-token": null,
         "x-user-info": null,
         "x-user-roles": JSON.stringify(mockRoles),
       })
 
-      const result = getAuthContext(request)
+      const result = getAuthContext(headers)
 
       expect(result).toBeNull()
     })
@@ -125,13 +118,13 @@ describe("getAuthContext", () => {
 
   describe("when headers contain invalid JSON", () => {
     it("should return null and log error when x-user-info contains invalid JSON", () => {
-      const request = createMockRequest({
+      const headers = createMockHeaders({
         "x-user-token": "valid-token",
         "x-user-info": "invalid-json",
         "x-user-roles": JSON.stringify(mockRoles),
       })
 
-      const result = getAuthContext(request)
+      const result = getAuthContext(headers)
 
       expect(result).toBeNull()
       expect(mockConsoleError).toHaveBeenCalledWith(
@@ -141,13 +134,13 @@ describe("getAuthContext", () => {
     })
 
     it("should return null and log error when x-user-roles contains invalid JSON", () => {
-      const request = createMockRequest({
+      const headers = createMockHeaders({
         "x-user-token": "valid-token",
         "x-user-info": JSON.stringify(mockUser),
         "x-user-roles": "invalid-json",
       })
 
-      const result = getAuthContext(request)
+      const result = getAuthContext(headers)
 
       expect(result).toBeNull()
       expect(mockConsoleError).toHaveBeenCalledWith(
@@ -159,25 +152,25 @@ describe("getAuthContext", () => {
 
   describe("edge cases", () => {
     it("should handle empty string headers", () => {
-      const request = createMockRequest({
+      const headers = createMockHeaders({
         "x-user-token": "",
         "x-user-info": "",
         "x-user-roles": "",
       })
 
-      const result = getAuthContext(request)
+      const result = getAuthContext(headers)
 
       expect(result).toBeNull()
     })
 
     it("should handle valid empty arrays for roles", () => {
-      const request = createMockRequest({
+      const headers = createMockHeaders({
         "x-user-token": "valid-token",
         "x-user-info": JSON.stringify(mockUser),
         "x-user-roles": JSON.stringify([]),
       })
 
-      const result = getAuthContext(request)
+      const result = getAuthContext(headers)
 
       expect(result).toEqual({
         user: mockUser,
@@ -187,13 +180,13 @@ describe("getAuthContext", () => {
     })
 
     it("should handle valid JSON null for roles", () => {
-      const request = createMockRequest({
+      const headers = createMockHeaders({
         "x-user-token": "valid-token",
         "x-user-info": JSON.stringify(mockUser),
         "x-user-roles": "null",
       })
 
-      const result = getAuthContext(request)
+      const result = getAuthContext(headers)
 
       expect(result).toEqual({
         user: mockUser,
diff --git a/src/utils/auth/getAuthContext.ts b/src/utils/auth/getAuthContext.ts
index 9a255be5..1dc6bd20 100644
--- a/src/utils/auth/getAuthContext.ts
+++ b/src/utils/auth/getAuthContext.ts
@@ -1,22 +1,21 @@
-import type { NextRequest } from "next/server"
 import type { SSOIdirUser } from "./types"
 
 /**
- * Extracts authentication context from request headers set by the authentication middleware.
+ * Extracts authentication context from headers set by the authentication middleware.
  *
  * Expected headers (set by middleware):
  * - `x-user-token`: JWT access token
  * - `x-user-info`: Serialized user object (SSOIdirUser)
  * - `x-user-roles`: JSON array of user roles
  *
- * @param request - The NextRequest object
+ * @param headers - The Headers object (from NextRequest or next/headers)
  * @returns Object containing { user, token, roles } or null if not authenticated
  */
-export function getAuthContext(request: NextRequest) {
+export function getAuthContext(headers: Headers) {
   try {
-    const token = request.headers.get("x-user-token")
-    const userInfoHeader = request.headers.get("x-user-info")
-    const userRolesHeader = request.headers.get("x-user-roles")
+    const token = headers.get("x-user-token")
+    const userInfoHeader = headers.get("x-user-info")
+    const userRolesHeader = headers.get("x-user-roles")
 
     if (!token || !userInfoHeader) {
       return null
diff --git a/src/utils/policies/policies.ts b/src/utils/policies/policies.ts
index 96a27315..a62bb640 100644
--- a/src/utils/policies/policies.ts
+++ b/src/utils/policies/policies.ts
@@ -1,3 +1,4 @@
+import { StaffUserPolicy } from "./resources/staff_user"
 import type { Policies } from "./types"
 
 /**
@@ -15,4 +16,6 @@ import type { Policies } from "./types"
  * Actions are not limited to CRUD and may represent any domain-specific capability
  * such as "moderate", "publish", "lock", or "approve".
  */
-export const policies: Policies = {}
+export const policies: Policies = {
+  staff_user: StaffUserPolicy,
+}
diff --git a/src/utils/policies/resources/staff_user.ts b/src/utils/policies/resources/staff_user.ts
new file mode 100644
index 00000000..cd8cf9df
--- /dev/null
+++ b/src/utils/policies/resources/staff_user.ts
@@ -0,0 +1,39 @@
+import type { Role } from "@/generated/prisma/enums"
+import type { StaffUserWithRelations } from "@/lib/prisma/staff_user/types"
+import type { Policy } from "../types"
+
+const ROLE_HIERARCHY: Role[] = ["Authenticated", "CSR", "SCSR", "SDM", "Administrator"] as const
+
+// Determines if a user's role is at or above a target role level in the hierarchy.
+const canUserEditRole = (userRole: Role | string, targetRole: Role | string): boolean => {
+  const userLevel = ROLE_HIERARCHY.indexOf(userRole as Role)
+  const targetLevel = ROLE_HIERARCHY.indexOf(targetRole as Role)
+  return userLevel > -1 && targetLevel > -1 && userLevel >= targetLevel
+}
+
+export const StaffUserPolicy: Policy = (user_context, data) => {
+  const { staff_user_id, role, location_code } = user_context
+  const actions = new Set<string>()
+
+  // View permissions
+  if (data?.guid === staff_user_id) actions.add("view") // Users can always view their own record
+  if (data?.locationCode === location_code) actions.add("view") // Users can view records in their own location
+  if (role === "Administrator") actions.add("view") // Administrators can view all records
+
+  // Edit permissions: user can edit if their role is at or above the target user's role (except for Authenticated role)
+  if (
+    data?.role &&
+    role !== "Authenticated" &&
+    canUserEditRole(role ?? "", (data as StaffUserWithRelations).role)
+  )
+    actions.add("edit")
+
+  // Archive permissions: Admins can archive anyone except themselves
+  if (role === "Administrator" && data?.guid !== staff_user_id) actions.add("archive")
+
+  // Role change permissions: user can change roles up to and including their own level
+  const editableRoles = ROLE_HIERARCHY.filter((r) => canUserEditRole(role ?? "", r))
+  editableRoles.forEach((r) => actions.add(`change_role_to_${r}`))
+
+  return Array.from(actions)
+}
diff --git a/src/utils/policies/types.ts b/src/utils/policies/types.ts
index 531bc71d..d42b0496 100644
--- a/src/utils/policies/types.ts
+++ b/src/utils/policies/types.ts
@@ -3,11 +3,20 @@ import type { Role } from "@/generated/prisma/enums"
 export type UserContext = {
   staff_user_id: string | null
   role: Role | null
+  location_code?: string | null
+  receptionist?: boolean
+  office_manager?: boolean
+  pesticide_designate?: boolean
+  finance_designate?: boolean
+  ita2_designate?: boolean
 }
 
 export type ResourceData = Record<string, unknown> | null
 
-export type Policy = (user_context: UserContext, data: ResourceData) => string[]
+export type Policy = <DataType extends ResourceData = ResourceData>(
+  user_context: UserContext,
+  data: DataType
+) => string[]
 
 export type Policies = Record<string, Policy>
 
diff --git a/src/utils/user/assignNewRoleFromCSR.test.ts b/src/utils/user/assignNewRoleFromCSR.test.ts
index 90532485..504371b4 100644
--- a/src/utils/user/assignNewRoleFromCSR.test.ts
+++ b/src/utils/user/assignNewRoleFromCSR.test.ts
@@ -13,10 +13,10 @@ describe("assignNewRoleFromCSR", () => {
     vi.restoreAllMocks()
   })
 
-  it("returns CSR and does not call assignRole when sub is null", async () => {
+  it("returns Authenticated and does not call assignRole when sub is null", async () => {
     const result = await assignNewRoleFromCSR(null, null)
 
-    expect(result).toBe("CSR")
+    expect(result).toBe("Authenticated")
     expect(assignRole).not.toHaveBeenCalled()
   })
 
@@ -38,11 +38,20 @@ describe("assignNewRoleFromCSR", () => {
     expect(assignRole).toHaveBeenCalledWith("test-sub", "Administrator")
   })
 
-  it("defaults to CSR and calls assignRole when sub provided but csrRoleId is null", async () => {
+  it("defaults to Authenticated and calls assignRole when sub provided but csrRoleId is null", async () => {
     vi.mocked(assignRole).mockResolvedValueOnce([])
 
     const result = await assignNewRoleFromCSR("test-sub", null)
 
+    expect(result).toBe("Authenticated")
+    expect(assignRole).toHaveBeenCalledWith("test-sub", "Authenticated")
+  })
+
+  it("maps other csrRoleIds to CSR and calls assignRole when sub provided", async () => {
+    vi.mocked(assignRole).mockResolvedValueOnce([])
+
+    const result = await assignNewRoleFromCSR("test-sub", 5)
+
     expect(result).toBe("CSR")
     expect(assignRole).toHaveBeenCalledWith("test-sub", "CSR")
   })
diff --git a/src/utils/user/assignNewRoleFromCSR.ts b/src/utils/user/assignNewRoleFromCSR.ts
index 6d549189..92cc4bfe 100644
--- a/src/utils/user/assignNewRoleFromCSR.ts
+++ b/src/utils/user/assignNewRoleFromCSR.ts
@@ -8,9 +8,10 @@ import { assignRole } from "../sso/assignRole"
  * @returns The new system role assigned
  */
 export const assignNewRoleFromCSR = async (sub: string | null, csrRoleId: number | null) => {
-  let newRole: Role = "CSR"
+  let newRole: Role = "Authenticated" // Default role for new users without legacy CSR roles
   if (csrRoleId === 1) newRole = "SDM"
   else if (csrRoleId === 30) newRole = "Administrator"
+  else if (csrRoleId) newRole = "CSR"
 
   // If sub, assign new role in SSO
   if (sub) await assignRole(sub, newRole)
diff --git a/src/utils/user/updateUserOnLogin.ts b/src/utils/user/updateUserOnLogin.ts
index a6889d09..78e030d1 100644
--- a/src/utils/user/updateUserOnLogin.ts
+++ b/src/utils/user/updateUserOnLogin.ts
@@ -13,7 +13,7 @@ import { assignNewRoleFromCSR } from "./assignNewRoleFromCSR"
 export const updateUserOnLogin = async (accessToken: string) => {
   const jwt = decodeJWT(accessToken)
   const { sub, idir_user_guid, idir_username, display_name, client_roles } = jwt
-  const userRole = (client_roles?.length ? client_roles[0] : "CSR") as Role
+  const userRole = (client_roles?.length ? client_roles[0] : "Authenticated") as Role
 
   // Check if user exists in the database
   const staffUser = await getStaffUserBySub(sub)

From 239946f0264c864179b3ab6cce20519175cab218 Mon Sep 17 00:00:00 2001
From: BradyMitch <braden.jr.mitch@gmail.com>
Date: Thu, 12 Mar 2026 14:05:11 -0700
Subject: [PATCH 2/4] updated tests

---
 .../ConfirmArchiveServiceCategoryModal.test.tsx |   2 +-
 .../prisma/staff_user/updateStaffUser.test.ts   |   2 ++
 src/lib/prisma/staff_user/updateStaffUser.ts    |  15 ++++++++++++---
 test_output.txt                                 | Bin 0 -> 67888 bytes
 test_output2.txt                                | Bin 0 -> 50812 bytes
 5 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 test_output.txt
 create mode 100644 test_output2.txt

diff --git a/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.test.tsx b/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.test.tsx
index b44db516..867cf0d6 100644
--- a/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.test.tsx
+++ b/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.test.tsx
@@ -181,7 +181,7 @@ describe("ConfirmArchiveServiceCategoryModal", () => {
     })
     expect(updateServiceCategory).toHaveBeenNthCalledWith(
       2,
-      expect.objectContaining({ id: "1", services: [] }) // Archived and detached
+      expect.objectContaining({ deletedAt: expect.any(Date), services: [] }) // Archived and detached
     )
   })
 })
diff --git a/src/lib/prisma/staff_user/updateStaffUser.test.ts b/src/lib/prisma/staff_user/updateStaffUser.test.ts
index 0cf231c8..35000dbe 100644
--- a/src/lib/prisma/staff_user/updateStaffUser.test.ts
+++ b/src/lib/prisma/staff_user/updateStaffUser.test.ts
@@ -92,6 +92,7 @@ describe("updateStaffUser", () => {
     expect(prisma.staffUser.update).toHaveBeenCalledWith({
       where: { guid: mockStaffUser.guid },
       data: expect.objectContaining({ displayName: "Updated Name", updatedAt: expect.any(Date) }),
+      include: { location: true, counter: true },
     })
   })
 
@@ -163,6 +164,7 @@ describe("updateStaffUser", () => {
     expect(prisma.staffUser.update).toHaveBeenCalledWith({
       where: { guid: mockStaffUser.guid },
       data: expect.objectContaining({ updatedAt: expect.any(Date) }),
+      include: { location: true, counter: true },
     })
   })
 
diff --git a/src/lib/prisma/staff_user/updateStaffUser.ts b/src/lib/prisma/staff_user/updateStaffUser.ts
index ed874b62..22c41ce9 100644
--- a/src/lib/prisma/staff_user/updateStaffUser.ts
+++ b/src/lib/prisma/staff_user/updateStaffUser.ts
@@ -37,12 +37,21 @@ export const updateStaffUser = async (
     throw new Error("You do not have permission to assign this role.")
   }
 
-  const locationData = locationCode ? { connect: { code: locationCode } } : undefined
-  const counterData = counterId ? { connect: { id: counterId } } : undefined
+  const updateData: Record<string, unknown> = {
+    ...data,
+    updatedAt: new Date(),
+  }
+
+  if (locationCode) {
+    updateData.location = { connect: { code: locationCode } }
+  }
+  if (counterId) {
+    updateData.counter = { connect: { id: counterId } }
+  }
 
   const staffUser = await prisma.staffUser.update({
     where: { guid: guidToUpdate },
-    data: { ...data, location: locationData, counter: counterData, updatedAt: new Date() },
+    data: updateData,
     include: { location: true, counter: true },
   })
   if (!staffUser) return null
diff --git a/test_output.txt b/test_output.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1514cf0037ac41f8df476badbaae067a8a95c5b1
GIT binary patch
literal 67888
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
MtSIxnRN(FZ14AFqng9R*

literal 0
HcmV?d00001

diff --git a/test_output2.txt b/test_output2.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4e213d873390bcdf69e94209b4a0cccb01d94bad
GIT binary patch
literal 50812
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

literal 0
HcmV?d00001


From 937dc9035f901fb48655dac2d80b6d51c1572f29 Mon Sep 17 00:00:00 2001
From: BradyMitch <braden.jr.mitch@gmail.com>
Date: Thu, 12 Mar 2026 14:14:08 -0700
Subject: [PATCH 3/4] updated tests

---
 ...onfirmArchiveServiceCategoryModal.test.tsx |   2 +-
 .../ConfirmArchiveServiceCategoryModal.tsx    |  13 ++++++++++---
 src/lib/prisma/staff_user/updateStaffUser.ts  |  15 +++------------
 test_output.txt                               | Bin 67888 -> 169842 bytes
 test_output2.txt                              | Bin 50812 -> 88498 bytes
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.test.tsx b/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.test.tsx
index 867cf0d6..b44db516 100644
--- a/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.test.tsx
+++ b/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.test.tsx
@@ -181,7 +181,7 @@ describe("ConfirmArchiveServiceCategoryModal", () => {
     })
     expect(updateServiceCategory).toHaveBeenNthCalledWith(
       2,
-      expect.objectContaining({ deletedAt: expect.any(Date), services: [] }) // Archived and detached
+      expect.objectContaining({ id: "1", services: [] }) // Archived and detached
     )
   })
 })
diff --git a/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.tsx b/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.tsx
index eddb0a4d..7810f67e 100644
--- a/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.tsx
+++ b/src/components/settings/service_categories/ConfirmArchiveServiceCategoryModal/ConfirmArchiveServiceCategoryModal.tsx
@@ -60,7 +60,7 @@ export const ConfirmArchiveServiceCategoryModal = ({
         if (!isArchived && hasServices) {
           if (serviceAction === "remove") {
             // Detach services
-            await updateServiceCategory({ deletedAt: new Date(), services: [] })
+            await updateServiceCategory({ id: formData?.id, deletedAt: new Date(), services: [] })
           } else if (serviceAction === "reassign" && newCategoryId) {
             // Reassign services to the new category
             const newCategory = serviceCategories.find((c) => c.id === newCategoryId)
@@ -78,10 +78,17 @@ export const ConfirmArchiveServiceCategoryModal = ({
               await updateServiceCategory({ id: newCategoryId, services: uniqueServices })
             }
             // Now archive the current category and detach its services
-            await updateServiceCategory({ deletedAt: new Date(), services: [] })
+            await updateServiceCategory({
+              id: formData?.id,
+              deletedAt: new Date(),
+              services: [],
+            })
           }
         } else {
-          await updateServiceCategory({ deletedAt: isArchived ? null : new Date() })
+          await updateServiceCategory({
+            id: formData?.id,
+            deletedAt: isArchived ? null : new Date(),
+          })
         }
 
         await revalidateTable()
diff --git a/src/lib/prisma/staff_user/updateStaffUser.ts b/src/lib/prisma/staff_user/updateStaffUser.ts
index 22c41ce9..ed874b62 100644
--- a/src/lib/prisma/staff_user/updateStaffUser.ts
+++ b/src/lib/prisma/staff_user/updateStaffUser.ts
@@ -37,21 +37,12 @@ export const updateStaffUser = async (
     throw new Error("You do not have permission to assign this role.")
   }
 
-  const updateData: Record<string, unknown> = {
-    ...data,
-    updatedAt: new Date(),
-  }
-
-  if (locationCode) {
-    updateData.location = { connect: { code: locationCode } }
-  }
-  if (counterId) {
-    updateData.counter = { connect: { id: counterId } }
-  }
+  const locationData = locationCode ? { connect: { code: locationCode } } : undefined
+  const counterData = counterId ? { connect: { id: counterId } } : undefined
 
   const staffUser = await prisma.staffUser.update({
     where: { guid: guidToUpdate },
-    data: updateData,
+    data: { ...data, location: locationData, counter: counterData, updatedAt: new Date() },
     include: { location: true, counter: true },
   })
   if (!staffUser) return null
diff --git a/test_output.txt b/test_output.txt
index 1514cf0037ac41f8df476badbaae067a8a95c5b1..027f09fefdf2ab167dfa9c88f5f79e5c25308b47 100644
GIT binary patch
literal 169842
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

delta 11
Scmeygj%&jtmWC~i2AlvO=>%T@

diff --git a/test_output2.txt b/test_output2.txt
index 4e213d873390bcdf69e94209b4a0cccb01d94bad..b60f724e21945b415c0b84c1faac9fe16e4a20d0 100644
GIT binary patch
literal 88498
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

delta 9
QcmdnAne|T(^M;yZ02qV>=l}o!


From ed7ce8774a1c28da1b97e9e6ec5b23a8b040d527 Mon Sep 17 00:00:00 2001
From: BradyMitch <braden.jr.mitch@gmail.com>
Date: Thu, 12 Mar 2026 15:02:29 -0700
Subject: [PATCH 4/4] fix redirect

---
 .../CreateServiceCategoryModal.tsx            |   2 +-
 .../EditServiceCategoryModal.tsx              |   2 +-
 test_output.txt                               | Bin 169842 -> 171270 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/settings/service_categories/CreateServiceCategoryModal/CreateServiceCategoryModal.tsx b/src/components/settings/service_categories/CreateServiceCategoryModal/CreateServiceCategoryModal.tsx
index 07b28442..669e1b54 100644
--- a/src/components/settings/service_categories/CreateServiceCategoryModal/CreateServiceCategoryModal.tsx
+++ b/src/components/settings/service_categories/CreateServiceCategoryModal/CreateServiceCategoryModal.tsx
@@ -98,7 +98,7 @@ export const CreateServiceCategoryModal = ({
         await revalidateTable()
         onClose()
         setIsSaving(false)
-        window.location.href = "/protected/settings"
+        window.location.href = "/protected/settings/service-categories"
       } catch (e: unknown) {
         if (e instanceof Error) {
           setError(e.message)
diff --git a/src/components/settings/service_categories/EditServiceCategoryModal/EditServiceCategoryModal.tsx b/src/components/settings/service_categories/EditServiceCategoryModal/EditServiceCategoryModal.tsx
index 6820abf2..c83d48f3 100644
--- a/src/components/settings/service_categories/EditServiceCategoryModal/EditServiceCategoryModal.tsx
+++ b/src/components/settings/service_categories/EditServiceCategoryModal/EditServiceCategoryModal.tsx
@@ -98,7 +98,7 @@ export const EditServiceCategoryModal = ({
         await revalidateTable()
         onClose()
         setIsSaving(false)
-        window.location.href = "/protected/settings"
+        window.location.href = "/protected/settings/service-categories"
       } catch (e: unknown) {
         if (e instanceof Error) {
           setError(e.message)
diff --git a/test_output.txt b/test_output.txt
index 027f09fefdf2ab167dfa9c88f5f79e5c25308b47..cdb45d3e7fde6027a870c9ea4f095bb7df3b66ea 100644
GIT binary patch
delta 109
zcmeygj;n1KS3?Wq7N(-<(+xNoS50nVOPk!_$}(Nz6r;psn=1;FHz@c`z96awlsLs`
zG5I2s`t%FVOdQiM^fT>YG@3q<jnQy=z)VJk=>>6&3cRKaRtyFVhCtGU!C<;#50f#o
NF@wQ&`-x1Mi~xuGBGUi>

delta 13
UcmZqM#r0_&S3?Wq7N(-<04mW1xc~qF