Miamiohlibs · kenirwin · Sep 10, 2025 · Sep 11, 2025 · Sep 18, 2025 · Sep 22, 2025
diff --git a/app/(main-layout)/admin/users/edit/[id]/page.tsx b/app/(main-layout)/admin/users/edit/[id]/page.tsx
@@ -34,7 +34,10 @@ export default async function UserEditPage({
       <div style={{ display: 'flex', flexDirection: 'column', gap: '1rem' }}>
         <h2 className="h3">{userToEdit.name}</h2>
         <p>Email: {userToEdit.email}</p>
-        <UserEditForm user={userToEdit} actorIsSuperAdmin={actorIsSuperAdmin} />
+        <UserEditForm
+          user={userToEdit}
+          actorIsSuperAdmin={actorIsSuperAdmin ?? false}
+        />
       </div>
     </>
   );

diff --git a/app/(main-layout)/editEntry/[id]/page.tsx b/app/(main-layout)/editEntry/[id]/page.tsx
@@ -84,7 +84,7 @@ export default async function EditEntryPage({
         holdingsData={holdingsData}
         actionType="edit"
         existingEntry={existingEntry}
-        isEditor={canEdit}
+        isEditor={canEdit ?? false}
       />
     </>
   );

diff --git a/app/(main-layout)/layout.tsx b/app/(main-layout)/layout.tsx
@@ -5,7 +5,7 @@ import { Roboto } from 'next/font/google';
 import '@/app/styles/custom-bootstrap.scss';
 import './globals.css';
 import { ClerkProvider } from '@clerk/nextjs';
-import Header from '@/components/Header';
+import Header from '@/components/Header/Header';
 import Footer from '@/components/Footer';
 import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
@@ -27,7 +27,8 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en">
-      <body className={`${roboto.className}`}><ClerkProvider>
+      <body className={`${roboto.className}`}>
+        <ClerkProvider>
           <div id="skiplink" className="visually-hidden-focusable">
             <a href="#main-content">Skip to Main Content</a>
           </div>
@@ -37,7 +38,8 @@ export default function RootLayout({
           </main>
           <ToastContainer />
           <Footer />
-        </ClerkProvider></body>
+        </ClerkProvider>
+      </body>
     </html>
   );
 }
diff --git a/app/(main-layout)/searchBibs/page.tsx b/app/(main-layout)/searchBibs/page.tsx
@@ -40,9 +40,9 @@ async function SearchBibsPage({ searchParams }: SearchBibsPageProps) {
       <ServerDataFetcher projectId={projectId.toString()}>
         <ClientSearchBibsPage
           projectId={projectId}
-          userCanEditPage={canEdit}
-          userCanPrint={canPrint}
-          nonOwnerAlert={nonOwnerEditor}
+          userCanEditPage={canEdit ?? false}
+          userCanPrint={canPrint ?? false}
+          nonOwnerAlert={nonOwnerEditor ?? false}
           project={project}
         />
       </ServerDataFetcher>

diff --git a/app/actions/deleteEntry.ts b/app/actions/deleteEntry.ts
@@ -25,7 +25,7 @@ async function deleteEntry({
   logger.verbose(
     `deletion request on ${entryId} by ${
       user.id
-    }; isAdmin: ${isAdmin.toString()}`
+    }; isAdmin: ${isAdmin?.toString()}`,
   );
 
   // only delete if isAdmin, isOwner, or isCoEditor

diff --git a/components/Header.tsx → components/Header/ClientNav.tsx b/components/Header.tsx → components/Header/ClientNav.tsx
@@ -1,8 +1,7 @@
-import NextLink from 'next/link';
+import Link from 'next/link';
 import {
   Nav,
   NavItem,
-  NavLink,
   Navbar,
   NavbarText,
   NavbarBrand,
@@ -11,17 +10,22 @@ import {
 } from 'react-bootstrap';
 import Image from 'next/image';
 import {
-SignInButton, // SignUpButton,
-Show, UserButton
+  SignInButton, // SignUpButton,
+  Show,
+  UserButton,
 } from '@clerk/nextjs';
 import { Search } from 'react-bootstrap-icons';
-import { checkUser } from '@/lib/checkUser';
-import NavEditor from './NavEditor';
-import NavAdmin from './NavAdmin';
+import { User } from '@prisma/client';
+import { ArgusPermissions } from '@/types/ArgusPermissions';
+import ClientNavEditor from './ClientNavEditor';
+import ClientNavAdmin from './ClientNavAdmin';
 
-const Header = async () => {
-  const user = await checkUser();
+interface PageProps {
+  user: User | null | undefined;
+  permissions: ArgusPermissions;
+}
 
+const ClientNav = async ({ user, permissions }: PageProps) => {
   return (
     <Navbar
       bg={process.env.NEXT_PUBLIC_NAV_COLOR || 'dark'}
@@ -30,33 +34,36 @@ const Header = async () => {
       className="px-2"
     >
       <NavbarToggle aria-controls="navbarScroll" />
-      <NavbarBrand as={NextLink} href="/">
-        <Image
-          src={`${process.env.NEXT_PUBLIC_APP_BASEPATH}/peacock-logo.png`}
-          alt="Peacock Logo"
-          width={40}
-          height={40}
-        />
-        <span className="ps-2">
-          Argus {process.env.NEXT_PUBLIC_NAV_LABEL || ''}
-        </span>
-      </NavbarBrand>
+      <Link href={'/'}>
+        <NavbarBrand>
+          <Image
+            src={`${process.env.NEXT_PUBLIC_APP_BASEPATH}/peacock-logo.png`}
+            alt="Peacock Logo"
+            width={40}
+            height={40}
+          />
+          <span className="ps-2">
+            Argus {process.env.NEXT_PUBLIC_NAV_LABEL || ''}
+          </span>
+        </NavbarBrand>
+      </Link>
+
       <NavbarCollapse id="navbar">
         <Nav className="ms-auto me-3 text-light">
-          <NavEditor />
+          <ClientNavEditor permissions={permissions} />
           <Show when="signed-in">
             <NavItem>
-              <NavLink as={NextLink} href="/publicProjects">
+              <Link href="/publicProjects" className="nav-link">
                 Public Projects
-              </NavLink>
+              </Link>
             </NavItem>
           </Show>
-          <NavAdmin />
+          <ClientNavAdmin permissions={permissions} />
           <Show when="signed-in">
             <NavItem>
-              <NavLink as={NextLink} href="/searchEntries">
+              <Link className="nav-link" href="/searchEntries">
                 <Search aria-hidden="true" /> Search
-              </NavLink>
+              </Link>
             </NavItem>
           </Show>
           <Show when="signed-out">
@@ -82,4 +89,4 @@ const Header = async () => {
   );
 };
 
-export default Header;
+export default ClientNav;
diff --git a/components/NavAdmin.tsx → components/Header/ClientNavAdmin.tsx b/components/NavAdmin.tsx → components/Header/ClientNavAdmin.tsx
@@ -1,21 +1,21 @@
-import logger from '@/lib/logger';
+'use client';
 import NextLink from 'next/link';
 import { NavItem, NavLink } from 'react-bootstrap';
-import checkAccess from '@/lib/checkAccess';
+import { ArgusPermissions } from '@/types/ArgusPermissions';
 
-const NavAdmin = async () => {
+interface PageProps {
+  permissions: ArgusPermissions;
+}
+
+const ClientNavAdmin = ({ permissions }: PageProps) => {
   // Check if the user has access to admin features
-  const hasAccess = await checkAccess({
-    permittedRoles: ['admin', 'superadmin'],
-    inline: true,
-  });
-  logger.verbose('NavAdmin - hasAccess:', hasAccess);
-  if (!hasAccess) {
+  console.log(JSON.stringify(permissions));
+  if (!permissions.isAdmin && !permissions.isSuperAdmin) {
     return null; // If no access, do not render the admin navigation
   }
+
   return (
     <>
-      {/* <Nav className="me-3"> */}
       <NavLink disabled aria-hidden="true" className="d-none d-md-block">
         |
       </NavLink>
@@ -29,9 +29,8 @@ const NavAdmin = async () => {
           Users
         </NavLink>
       </NavItem>
-      {/* </Nav> */}
     </>
   );
 };
 
-export default NavAdmin;
+export default ClientNavAdmin;
diff --git a/components/Header/ClientNavEditor.tsx b/components/Header/ClientNavEditor.tsx
@@ -0,0 +1,26 @@
+'use client';
+import NextLink from 'next/link';
+import Link from 'next/link';
+import { NavItem, NavLink } from 'react-bootstrap';
+import type { ArgusPermissions } from '@/types/ArgusPermissions';
+
+interface PageProps {
+  permissions: ArgusPermissions;
+}
+
+const ClientNavEditor = ({ permissions }: PageProps) => {
+  if (!permissions.isEditorOrAbove) {
+    return null; // If no access, do not render the editor navigation
+  }
+  return (
+    <>
+      <NavItem>
+        <NavLink as={NextLink} href="/">
+          My Projects
+        </NavLink>
+      </NavItem>
+    </>
+  );
+};
+
+export default ClientNavEditor;
diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx
@@ -0,0 +1,12 @@
+'use server';
+import { checkUser } from '@/lib/checkUser';
+// import checkAccess from '@/lib/checkAccess';
+import getUserInfo from '@/lib/getUserInfo';
+import ClientNav from './ClientNav';
+
+export default async function Header() {
+  const user = await checkUser();
+  const { permissions } = await getUserInfo();
+
+  return <ClientNav user={user} permissions={permissions} />;
+}
diff --git a/components/NavEditor.tsx b/components/NavEditor.tsx