diff --git a/backend/mobile/laneCheck.ts b/backend/mobile/laneCheck.ts index 3855973..6812ff3 100644 --- a/backend/mobile/laneCheck.ts +++ b/backend/mobile/laneCheck.ts @@ -1,6 +1,12 @@ import { Router } from "express"; +import { prodQuery } from "../prodSql/prodSqlQuery.controller.js"; +import { + type SqlQuery, + sqlQuerySelector, +} from "../prodSql/prodSqlQuerySelector.utils.js"; import { runProdApi } from "../utils/prodEndpoint.utils.js"; -import { apiReturn } from "../utils/returnHelper.utils.js"; +import { apiReturn, returnFunc } from "../utils/returnHelper.utils.js"; +import { tryCatch } from "../utils/trycatch.utils.js"; const router = Router(); @@ -9,7 +15,27 @@ router.post("/", async (req, res) => { const lane = body.lane.split("#"); - console.log(lane[2]); + // check if the plant has warehousing activated + const featureQ = sqlQuerySelector(`featureCheck`) as SqlQuery; + + const { data: fd, error: fe } = await tryCatch( + prodQuery(featureQ.query, `Running feature check`), + ); + + if (fe) { + return returnFunc({ + success: false, + level: "error", + module: "datamart", + subModule: "query", + message: `feature check failed`, + data: fe as any, + notify: false, + }); + } + + console.log(fd); + const laneData = await runProdApi({ method: "post", endpoint: "/public/v1.1/Warehousing/GetWarehouseUnits", diff --git a/frontend/src/lib/queries/getScanUsers.ts b/frontend/src/lib/queries/getScanUsers.ts index fec5d96..60d6ece 100644 --- a/frontend/src/lib/queries/getScanUsers.ts +++ b/frontend/src/lib/queries/getScanUsers.ts @@ -1,25 +1,25 @@ import { keepPreviousData, queryOptions } from "@tanstack/react-query"; -import axios from "axios"; +import { api } from "../apiHelper"; export function getScanUsers() { return queryOptions({ queryKey: ["getScanUsers"], - queryFn: () => fetch(), + queryFn: () => dataFetch(), staleTime: 5000, refetchOnWindowFocus: true, placeholderData: keepPreviousData, }); } -const fetch = async () => { +const dataFetch = async () => { if (window.location.hostname === "localhost") { await new Promise((res) => setTimeout(res, 1500)); } - const { data } = await axios.get("/lst/api/mobile/auth/user", { - withCredentials: true, - timeout: 5000, - }); + const { data } = await api.get("/mobile/auth/user"); + if (!data.success) { + throw new Error(data.message ?? "Failed to load scan users"); + } - return data.data; + return data.data ?? []; }; diff --git a/frontend/src/lib/queries/getScannerIds.ts b/frontend/src/lib/queries/getScannerIds.ts index 6a8eb77..ee7977e 100644 --- a/frontend/src/lib/queries/getScannerIds.ts +++ b/frontend/src/lib/queries/getScannerIds.ts @@ -1,5 +1,6 @@ import { keepPreviousData, queryOptions } from "@tanstack/react-query"; -import axios from "axios"; + +import { api } from "../apiHelper"; export function getScannerIds() { return queryOptions({ @@ -16,10 +17,7 @@ const fetch = async () => { await new Promise((res) => setTimeout(res, 1500)); } - const { data } = await axios.get("/lst/api/mobile/available", { - withCredentials: true, - timeout: 5000, - }); + const { data } = await api.get("/mobile/available"); return data.data; }; diff --git a/frontend/src/routes/admin/scanUsers.tsx b/frontend/src/routes/admin/scanUsers.tsx index 67c61f6..a77af31 100644 --- a/frontend/src/routes/admin/scanUsers.tsx +++ b/frontend/src/routes/admin/scanUsers.tsx @@ -3,7 +3,7 @@ import { createFileRoute, redirect } from "@tanstack/react-router"; import { createColumnHelper } from "@tanstack/react-table"; import axios from "axios"; import { format } from "date-fns-tz"; -import { CircleFadingArrowUp, Trash } from "lucide-react"; +import { Trash } from "lucide-react"; import { Suspense, useState } from "react"; import { toast } from "sonner"; import { Button } from "../../components/ui/button"; @@ -19,7 +19,7 @@ import NewScanUser from "./-components/NewScanUser"; export const Route = createFileRoute("/admin/scanUsers")({ beforeLoad: async ({ location }) => { const { data: session } = await authClient.getSession(); - const allowedRole = ["systemAdmin", "admin"]; + const allowedRole = ["systemAdmin", "admin", "manager"]; if (!session?.user) { throw redirect({ @@ -111,7 +111,7 @@ const ScanUserTable = () => {