Merge branch 'master' into feat/1151/workflow-az

Author: AndyRae

app/next-client-app/app/(protected)/datasets/columns.tsx

@@ -37,7 +37,7 @@ export const columns: ColumnDef<DataSet>[] = [
         <Link href={`/datasets/${id}/`}>
           <Button
             variant="link"
-            className="font-bold text-black dark:text-white"
+            className="font-bold"
           >
             {name}
           </Button>

app/next-client-app/app/(protected)/layout.tsx

@@ -3,6 +3,7 @@ import React from "react";
 import { getServerSession } from "next-auth";
 import { options } from "@/auth/options";
 import { MenuBar } from "@/components/core/menubar";
+import Footer from "@/components/core/footer";
 
 export default async function ProtectedLayout({
   children,
@@ -14,10 +15,11 @@ export default async function ProtectedLayout({
 
   return (
     <>
-      <section className="container mb-5">
+      <section className="container flex flex-col min-h-svh">
         <MenuBar user={user} />
         {children}
       </section>
+      <Footer />
     </>
   );
 }

app/next-client-app/app/(protected)/projects/columns.tsx

@@ -20,7 +20,7 @@ export const columns: ColumnDef<Project>[] = [
         <Link href={`/projects/${id}/`}>
           <Button
             variant="link"
-            className="font-bold text-black dark:text-white"
+            className="font-bold"
           >
             {name}
           </Button>

app/next-client-app/app/(protected)/scanreports/[id]/actions-download-menu.tsx

@@ -31,11 +31,11 @@ export function ActionsDownloadMenu({ scanreportId }: Props) {
     <DropdownMenuGroup>
       <DropdownMenuLabel>Downloads</DropdownMenuLabel>
       <DropdownMenuItem onSelect={() => handleDownload("application/json")}>
-        <FileJson className="mr-2 size-4" />
+        <FileJson />
         Mapping JSON
       </DropdownMenuItem>
       <DropdownMenuItem onSelect={() => handleDownload("text/csv")}>
-        <FileSpreadsheet className="mr-2 size-4" />
+        <FileSpreadsheet />
         Mapping CSV
       </DropdownMenuItem>
     </DropdownMenuGroup>

app/next-client-app/app/(protected)/scanreports/[id]/downloads/columns.tsx

@@ -108,7 +108,7 @@ export const columns: ColumnDef<FileDownload>[] = [
       };
       return (
         <Button variant={"outline"} onClick={handleDownload}>
-          Download <Download className="ml-2 size-4" />
+          Download <Download />
         </Button>
       );
     },

app/next-client-app/app/(protected)/scanreports/[id]/tables/[tableId]/columns.tsx

@@ -37,7 +37,7 @@ export const columns = (
                 prePath.endsWith("/") ? prePath : prePath + "/"
               }fields/${id}`}
             >
-              <Button variant="link" className="font-bold dark:text-white">
+              <Button variant="link" className="font-bold">
                 {name}
               </Button>
             </Link>

app/next-client-app/app/(protected)/scanreports/columns.tsx

@@ -46,7 +46,7 @@ export const columns: ColumnDef<ScanReport>[] = [
         <Link href={`/scanreports/${id}`}>
           <Button
             variant="link"
-            className="font-bold text-black dark:text-white"
+            className="font-bold"
           >
             {dataset}
           </Button>
@@ -180,7 +180,7 @@ export const columns: ColumnDef<ScanReport>[] = [
               </DropdownMenuItem>
               <DropdownMenuItem
                 onClick={() => setOpen(true)}
-                className="text-black dark:text-white hover:text-destructive focus:text-destructive dark:hover:text-destructive dark:focus:text-destructive"
+                className="hover:text-destructive focus:text-destructive dark:hover:text-destructive dark:focus:text-destructive"
               >
                 Delete <TrashIcon className="ml-auto" />
               </DropdownMenuItem>