From 826c44c9967130f26ddbcfc2e8f4d43673819a71 Mon Sep 17 00:00:00 2001
From: Blake Matthes <cowchmonkey@gmail.com>
Date: Wed, 11 Jun 2025 20:47:43 -0500
Subject: [PATCH] fix(removed roles): changes to remove the roles and use
 userRoles instead

---
 .../admin/user/components/UserCard.tsx        | 22 ++++-----
 .../src/components/production/ocp/Lots.tsx    | 46 ++++++++++++-------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/frontend/src/components/admin/user/components/UserCard.tsx b/frontend/src/components/admin/user/components/UserCard.tsx
index 8646012..a0ed65d 100644
--- a/frontend/src/components/admin/user/components/UserCard.tsx
+++ b/frontend/src/components/admin/user/components/UserCard.tsx
@@ -2,15 +2,15 @@ import { LstCard } from "@/components/extendedUI/LstCard";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import {
-    Select,
-    SelectContent,
-    SelectGroup,
-    SelectItem,
-    SelectLabel,
-    SelectTrigger,
-    SelectValue,
-} from "@/components/ui/select";
+// import {
+//     Select,
+//     SelectContent,
+//     SelectGroup,
+//     SelectItem,
+//     SelectLabel,
+//     SelectTrigger,
+//     SelectValue,
+// } from "@/components/ui/select";
 
 import { DebugButton } from "@/utils/formStuff/debugButton";
 import { userFormOptions } from "@/utils/formStuff/options/userformOptions";
@@ -142,7 +142,7 @@ export default function UserCard(data: any) {
                                 );
                             }}
                         />
-                        <form.Field
+                        {/* <form.Field
                             name="role"
                             //listeners={{onChange: ({value})=>{}}}
                             children={(field) => {
@@ -184,7 +184,7 @@ export default function UserCard(data: any) {
                                     </div>
                                 );
                             }}
-                        />
+                        /> */}
                         <form.Field
                             name="password"
                             validators={{
diff --git a/frontend/src/components/production/ocp/Lots.tsx b/frontend/src/components/production/ocp/Lots.tsx
index 5cf839f..7129229 100644
--- a/frontend/src/components/production/ocp/Lots.tsx
+++ b/frontend/src/components/production/ocp/Lots.tsx
@@ -17,6 +17,8 @@ import { useQuery } from "@tanstack/react-query";
 import ManualPrint from "./ManualPrinting/ManualPrint";
 import ManualPrintForm from "./ManualPrinting/ManualPrintForm";
 import { ScrollArea } from "@/components/ui/scroll-area";
+import { useGetUserRoles } from "@/lib/store/useGetRoles";
+import { useModuleStore } from "@/lib/store/useModuleStore";
 
 let lotColumns = [
     {
@@ -68,12 +70,21 @@ export default function Lots() {
     const { data, isError, isLoading } = useQuery(getlots());
     const { user } = useSessionStore();
     const { settings } = useSettingStore();
+    const { userRoles } = useGetUserRoles();
+    const { modules } = useModuleStore();
+
     const server = settings.filter((n) => n.name === "server")[0]?.value || "";
 
-    const roles = ["technician", "admin", "manager", "operator"];
+    const roles = ["systemAdmin", "technician", "admin", "manager", "operator"];
     const lotdata = data ? data : [];
 
-    if (user && roles.includes(user.role)) {
+    const module = modules.filter((n) => n.name === "logistics");
+
+    const accessRoles = userRoles.filter(
+        (n) => n.module_id === module[0]?.module_id
+    ) as any;
+
+    if (user && roles.includes(accessRoles[0]?.role)) {
         //width = 1280;
         const checkCol = lotColumns.some((l) => l.key === "printLabel");
         if (!checkCol) {
@@ -230,22 +241,25 @@ export default function Lots() {
                                     <TableCell className="font-medium">
                                         {lot.overPrinting}
                                     </TableCell>
-                                    {user && roles.includes(user.role) && (
-                                        <>
-                                            {server === "usday1vms006" ||
-                                            server === "localhost" ? (
-                                                <>
+                                    {user &&
+                                        roles.includes(accessRoles[0].role) && (
+                                            <>
+                                                {server === "usday1vms006" ||
+                                                server === "localhost" ? (
+                                                    <>
+                                                        <TableCell className="flex justify-center">
+                                                            <ManualPrintForm />
+                                                        </TableCell>
+                                                    </>
+                                                ) : (
                                                     <TableCell className="flex justify-center">
-                                                        <ManualPrintForm />
+                                                        <ManualPrint
+                                                            lot={lot}
+                                                        />
                                                     </TableCell>
-                                                </>
-                                            ) : (
-                                                <TableCell className="flex justify-center">
-                                                    <ManualPrint lot={lot} />
-                                                </TableCell>
-                                            )}
-                                        </>
-                                    )}
+                                                )}
+                                            </>
+                                        )}
                                 </TableRow>
                             ))}
                         </TableBody>