refactor(ocme): changes in the pickup to no longer handle all but specific area

frontend/src/components/admin/prodUser/ProdUserCard.tsx

@@ -16,7 +16,7 @@ import { useSessionStore } from "@/lib/store/sessionStore";
 import { getProdPerms } from "@/utils/querys/prodUser/getProdPerms";
 
 import { useForm } from "@tanstack/react-form";
-
+import { useState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import axios from "axios";
 import { toast } from "sonner";
@@ -24,6 +24,7 @@ import { toast } from "sonner";
 export default function ProdUserCard() {
     const { token } = useSessionStore();
     const { data, isError, isLoading } = useQuery(getProdPerms(token ?? ""));
+    const [creating, setCreating] = useState(false);
 
     const form = useForm({
         defaultValues: {
@@ -34,7 +35,8 @@ export default function ProdUserCard() {
         },
 
         onSubmit: async ({ value }) => {
-            console.log(value);
+            setCreating(true);
+            //console.log(value);
 
             if (value.role === "") {
                 toast.error(
@@ -50,15 +52,22 @@ export default function ProdUserCard() {
                 //console.log(res.data);
 
                 if (!res.data.success) {
-                    toast.error(res.data.data?.errors[0].message);
+                    const errMSG: string = res.data.data.errors
+                        ? res.data.data?.errors[0].message
+                        : res.data.data;
+
+                    toast.error(`${errMSG}`);
+                    setCreating(false);
                 }
 
                 if (res.data.success) {
                     toast.success(res.data.message);
                     form.reset();
+                    setCreating(false);
                 }
             } catch (error) {
                 console.log(error);
+                setCreating(false);
             }
         },
     });
@@ -205,7 +214,9 @@ export default function ProdUserCard() {
                         }}
                     />
                     <div className="flex justify-end mr-3">
-                        <Button onClick={form.handleSubmit}>Submit</Button>
+                        <Button onClick={form.handleSubmit} disabled={creating}>
+                            Submit
+                        </Button>
                     </div>
                 </form>
             </LstCard>

package.json

@@ -35,7 +35,7 @@
     }
   },
   "admConfig": {
-    "build": 406,
+    "build": 410,
     "oldBuild": "backend-0.1.3.zip"
   },
   "devDependencies": {

server/services/ocme/controller/pickedup.ts

@@ -1,7 +1,7 @@
-import {eq, sql} from "drizzle-orm";
-import {db} from "../../../../database/dbclient.js";
-import {ocmeData} from "../../../../database/schema/ocme.js";
-import {createLog, logLevel} from "../../logger/logger.js";
+import { eq, sql } from "drizzle-orm";
+import { db } from "../../../../database/dbclient.js";
+import { ocmeData } from "../../../../database/schema/ocme.js";
+import { createLog, logLevel } from "../../logger/logger.js";
 
 export const pickedup = async (data: any) => {
     if (data.sscc && !data.runningNr) {
@@ -10,33 +10,74 @@ export const pickedup = async (data: any) => {
 
     if (!data.sscc && !data.runningNr) {
         // data.runningNr = data.sscc.slice(10, -1);
-        return {success: false, message: "Missing data please try again", data: []};
+        return {
+            success: false,
+            message: "Missing data please try again",
+            data: [],
+        };
     }
 
-    if (data.all) {
+    if (data.areaFrom) {
         try {
             const updateRn = await db
                 .update(ocmeData)
-            .set({pickedUp: true, upd_date: sql`NOW()`})
-            .returning({runningNr: ocmeData.runningNr});
-            createLog("info", "ocme", "ocme", `Pending pallets were just cleared out.`);
-            return {success: true, message: `Pending pallets were just cleared out.`, data: updateRn};
+                .set({ pickedUp: true, upd_date: sql`NOW()` })
+                .where(eq(ocmeData.areaFrom, data.areaFrom))
+                .returning({ runningNr: ocmeData.runningNr });
+            createLog(
+                "info",
+                "ocme",
+                "ocme",
+                `Pending pallets were just cleared out.`
+            );
+            return {
+                success: true,
+                message: `Pending pallets were just cleared out.`,
+                data: updateRn,
+            };
         } catch (error) {
-            createLog("error", "ocme", "ocme", `Error clearing out the pallets.`);
-            return {success: false, message: `Error clearing out the pallets.`, error};
+            createLog(
+                "error",
+                "ocme",
+                "ocme",
+                `Error clearing out the pallets.`
+            );
+            return {
+                success: false,
+                message: `Error clearing out the pallets.`,
+                error,
+            };
         }
     }
 
     try {
         const updateRn = await db
             .update(ocmeData)
-        .set({pickedUp: true, upd_date: sql`NOW()`})
+            .set({ pickedUp: true, upd_date: sql`NOW()` })
             .where(eq(ocmeData.runningNr, data.runningNr))
-        .returning({runningNr: ocmeData.runningNr});
-        createLog("info", "ocme", "ocme", `${parseInt(data.runningNr)} was just pickedup`);
-        return {success: true, message: `${parseInt(data.runningNr)} was just pickedup`, data: updateRn};
+            .returning({ runningNr: ocmeData.runningNr });
+        createLog(
+            "info",
+            "ocme",
+            "ocme",
+            `${parseInt(data.runningNr)} was just pickedup`
+        );
+        return {
+            success: true,
+            message: `${parseInt(data.runningNr)} was just pickedup`,
+            data: updateRn,
+        };
     } catch (error) {
-        createLog("error", "ocme", "ocme", `${parseInt(data.runningNr)} was just pickedup`);
-        return {success: false, message: `${parseInt(data.runningNr)} was not pickedup`, error};
+        createLog(
+            "error",
+            "ocme",
+            "ocme",
+            `${parseInt(data.runningNr)} was just pickedup`
+        );
+        return {
+            success: false,
+            message: `${parseInt(data.runningNr)} was not pickedup`,
+            error,
+        };
     }
 };