fix(dm): fixes to validate auth before submiting incase someone stays on the page to long

frontend/src/routes/_old/old/-components/logistics/dm/DMButtons.tsx

@@ -3,53 +3,72 @@ import ForecastImport from "./ForecastImport";
 import OrderImport from "./OrderImport";
 
 export default function DMButtons() {
-	const { settings } = useSettingStore();
-	const testServers = ["test1", "test2", "test3"];
-	const plantToken = settings.filter((n) => n.name === "plantToken");
-	//console.log(plantToken);
-	return (
-		<div className="flex flex-row-reverse gap-1">
-			<OrderImport fileType={"macro"} name={"Macro Import"} />
-			{/* dev and testserver sees all */}
-			{testServers.includes(plantToken[0]?.value) && (
-				<div className="flex flex-row gap-2">
-					<OrderImport fileType={"abbott"} name={"Abbott truck list"} />
-					<OrderImport fileType={"energizer"} name={"Energizer Truck List"} />
-					<ForecastImport fileType={"loreal"} name={"VMI Import"} />
-					<ForecastImport fileType={"pg"} name={"P&G"} />
-					<ForecastImport fileType={"energizer"} name={"Energizer Forecast"} />
-				</div>
-			)}
-			{plantToken[0]?.value === "usday1" && (
-				<div className="flex flex-row gap-2">
-					<OrderImport fileType={"abbott"} name={"Abbott truck list"} />
-					<OrderImport fileType={"energizer"} name={"Energizer Truck List"} />
-					<ForecastImport fileType={"energizer"} name={"Energizer Forecast"} />
-				</div>
-			)}
-			{plantToken[0]?.value === "usflo1" && (
-				<div className="flex flex-row gap-2">
-					<ForecastImport fileType={"loreal"} name={"VMI Import"} />
-				</div>
-			)}
-			{plantToken[0]?.value === "usstp1" && (
-				<div className="flex flex-row gap-2"></div>
-			)}
-			{plantToken[0]?.value === "usiow1" && (
-				<div className="flex flex-row gap-2">
-					<ForecastImport fileType={"pg"} name={"P&G"} />
-				</div>
-			)}
-			{plantToken[0]?.value === "usiow2" && (
-				<div className="flex flex-row gap-2">
-					<ForecastImport fileType={"pg"} name={"P&G"} />
-				</div>
-			)}
-			{plantToken[0]?.value === "usksc1" && (
-				<div className="flex flex-row gap-2">
-					<ForecastImport fileType={"pg"} name={"P&G"} />
-				</div>
-			)}
-		</div>
-	);
+    const { settings } = useSettingStore();
+    const testServers = ["test1", "test2", "test3"];
+    const plantToken = settings.filter((n) => n.name === "plantToken");
+
+    //console.log(plantToken);
+    return (
+        <div className="flex flex-row-reverse gap-1">
+            <OrderImport fileType={"macro"} name={"Macro Import"} />
+            {/* dev and testserver sees all */}
+            {testServers.includes(plantToken[0]?.value) && (
+                <div className="flex flex-row gap-2">
+                    <OrderImport
+                        fileType={"abbott"}
+                        name={"Abbott truck list"}
+                    />
+                    <OrderImport
+                        fileType={"energizer"}
+                        name={"Energizer Truck List"}
+                    />
+                    <ForecastImport fileType={"loreal"} name={"VMI Import"} />
+                    <ForecastImport fileType={"pg"} name={"P&G"} />
+                    <ForecastImport
+                        fileType={"energizer"}
+                        name={"Energizer Forecast"}
+                    />
+                </div>
+            )}
+            {plantToken[0]?.value === "usday1" && (
+                <div className="flex flex-row gap-2">
+                    <OrderImport
+                        fileType={"abbott"}
+                        name={"Abbott truck list"}
+                    />
+                    <OrderImport
+                        fileType={"energizer"}
+                        name={"Energizer Truck List"}
+                    />
+                    <ForecastImport
+                        fileType={"energizer"}
+                        name={"Energizer Forecast"}
+                    />
+                </div>
+            )}
+            {plantToken[0]?.value === "usflo1" && (
+                <div className="flex flex-row gap-2">
+                    <ForecastImport fileType={"loreal"} name={"VMI Import"} />
+                </div>
+            )}
+            {plantToken[0]?.value === "usstp1" && (
+                <div className="flex flex-row gap-2"></div>
+            )}
+            {plantToken[0]?.value === "usiow1" && (
+                <div className="flex flex-row gap-2">
+                    <ForecastImport fileType={"pg"} name={"P&G"} />
+                </div>
+            )}
+            {plantToken[0]?.value === "usiow2" && (
+                <div className="flex flex-row gap-2">
+                    <ForecastImport fileType={"pg"} name={"P&G"} />
+                </div>
+            )}
+            {plantToken[0]?.value === "usksc1" && (
+                <div className="flex flex-row gap-2">
+                    <ForecastImport fileType={"pg"} name={"P&G"} />
+                </div>
+            )}
+        </div>
+    );
 }

frontend/src/routes/_old/old/-components/logistics/dm/ForecastImport.tsx

@@ -3,70 +3,80 @@ import { useRef, useState } from "react";
 import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
 import { useAuth } from "@/lib/authClient";
+import { useNavigate, useRouterState } from "@tanstack/react-router";
 
 export default function ForecastImport(props: any) {
-	const fileInputRef: any = useRef(null);
-	const [posting, setPosting] = useState(false);
-	//const token = localStorage.getItem("auth_token");
-	const { session } = useAuth();
-	//const [fileType, setFileType] = useState("");
-	const importOrders = async (e: any) => {
-		const file = e.target.files[0];
-		if (!file) {
-			toast.error("Missing file please try again");
-			setPosting(false);
-			return;
-		}
+    const fileInputRef: any = useRef(null);
+    const [posting, setPosting] = useState(false);
+    //const token = localStorage.getItem("auth_token");
+    const { session } = useAuth();
+    //const [fileType, setFileType] = useState("");
+    const navigate = useNavigate();
+    const router = useRouterState();
+    const currentPath = router.location.href;
 
-		// create the form data with the correct fileType
-		const formData = new FormData();
-		formData.append("postForecast", e.target.files[0]);
-		formData.append("fileType", props.fileType); // extra field
-		formData.append("username", `${session?.user.username}`);
+    const importOrders = async (e: any) => {
+        if (!session || !session.user) {
+            toast.error("You are allowed to do this unless you are logged in");
+            navigate({ to: "/login", search: { redirect: currentPath } });
+            return;
+        }
+        const file = e.target.files[0];
+        if (!file) {
+            toast.error("Missing file please try again");
+            setPosting(false);
+            return;
+        }
 
-		// console.log(formData);
-		toast.success("Import started.");
-		try {
-			const response = await axios.post(
-				"/lst/old/api/logistics/postforecastin",
-				formData,
-				{
-					headers: {
-						"Content-Type": "multipart/form-data",
-					},
-				},
-			);
-			//console.log("Upload successful:", response.data);
-			toast.success(response?.data?.message);
-			fileInputRef.current.value = null;
-			setPosting(false);
-			// toast.success(
-			//     "File Uploaded, please validate processing in alplaprod 2.0"
-			// );
-			setPosting(false);
-		} catch (error) {
-			console.log(error);
-			toast.error("Upload failed");
-		}
-		setPosting(false);
-	};
+        // create the form data with the correct fileType
+        const formData = new FormData();
+        formData.append("postForecast", e.target.files[0]);
+        formData.append("fileType", props.fileType); // extra field
+        formData.append("username", `${session?.user.username}`);
 
-	const handleButtonClick = () => {
-		setPosting(true);
-		fileInputRef.current.click();
-	};
-	return (
-		<div>
-			<Button onClick={handleButtonClick} disabled={posting}>
-				{props.name}
-			</Button>
-			<input
-				type="file"
-				accept=".xlsx, .xls, .xlsm"
-				ref={fileInputRef}
-				style={{ display: "none" }}
-				onChange={importOrders}
-			/>
-		</div>
-	);
+        // console.log(formData);
+        toast.success("Import started.");
+        try {
+            const response = await axios.post(
+                "/lst/old/api/logistics/postforecastin",
+                formData,
+                {
+                    headers: {
+                        "Content-Type": "multipart/form-data",
+                    },
+                }
+            );
+            //console.log("Upload successful:", response.data);
+            toast.success(response?.data?.message);
+            fileInputRef.current.value = null;
+            setPosting(false);
+            // toast.success(
+            //     "File Uploaded, please validate processing in alplaprod 2.0"
+            // );
+            setPosting(false);
+        } catch (error) {
+            console.log(error);
+            toast.error("Upload failed");
+        }
+        setPosting(false);
+    };
+
+    const handleButtonClick = () => {
+        setPosting(true);
+        fileInputRef.current.click();
+    };
+    return (
+        <div>
+            <Button onClick={handleButtonClick} disabled={posting}>
+                {props.name}
+            </Button>
+            <input
+                type="file"
+                accept=".xlsx, .xls, .xlsm"
+                ref={fileInputRef}
+                style={{ display: "none" }}
+                onChange={importOrders}
+            />
+        </div>
+    );
 }

frontend/src/routes/_old/old/-components/logistics/dm/OrderImport.tsx

@@ -3,63 +3,72 @@ import { useRef, useState } from "react";
 import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
 import { useAuth } from "@/lib/authClient";
+import { useNavigate, useRouterState } from "@tanstack/react-router";
 
 export default function OrderImport(props: any) {
-	const fileInputRef: any = useRef(null);
-	const [posting, setPosting] = useState(false);
-	const { session } = useAuth();
-	//const [fileType, setFileType] = useState("");
-	const importOrders = async (e: any) => {
-		const file = e.target.files[0];
-		if (!file) {
-			toast.error("Missing file please try again");
-			setPosting(false);
-			return;
-		}
+    const fileInputRef: any = useRef(null);
+    const [posting, setPosting] = useState(false);
+    const { session } = useAuth();
+    const navigate = useNavigate();
+    const router = useRouterState();
+    const currentPath = router.location.href;
+    //const [fileType, setFileType] = useState("");
+    const importOrders = async (e: any) => {
+        if (!session || !session.user) {
+            toast.error("You are allowed to do this unless you are logged in");
+            navigate({ to: "/login", search: { redirect: currentPath } });
+            return;
+        }
+        const file = e.target.files[0];
+        if (!file) {
+            toast.error("Missing file please try again");
+            setPosting(false);
+            return;
+        }
 
-		// create the form data with the correct fileType
-		const formData = new FormData();
-		formData.append("postOrders", e.target.files[0]);
-		formData.append("fileType", props.fileType); // extra field
-		formData.append("username", `${session?.user.username}`);
+        // create the form data with the correct fileType
+        const formData = new FormData();
+        formData.append("postOrders", e.target.files[0]);
+        formData.append("fileType", props.fileType); // extra field
+        formData.append("username", `${session?.user.username}`);
 
-		try {
-			const response = await axios.post(
-				"/lst/old/api/logistics/postbulkorders",
-				formData,
-				{
-					headers: {
-						"Content-Type": "multipart/form-data",
-					},
-				},
-			);
-			//console.log("Upload successful:", response.data);
-			toast.success(response?.data?.message);
-			fileInputRef.current.value = null;
-			setPosting(false);
-		} catch (error) {
-			console.log(error);
-			toast.error("Upload failed");
-		}
-		setPosting(false);
-	};
+        try {
+            const response = await axios.post(
+                "/lst/old/api/logistics/postbulkorders",
+                formData,
+                {
+                    headers: {
+                        "Content-Type": "multipart/form-data",
+                    },
+                }
+            );
+            //console.log("Upload successful:", response.data);
+            toast.success(response?.data?.message);
+            fileInputRef.current.value = null;
+            setPosting(false);
+        } catch (error) {
+            console.log(error);
+            toast.error("Upload failed");
+        }
+        setPosting(false);
+    };
 
-	const handleButtonClick = () => {
-		setPosting(true);
-		fileInputRef.current.click();
-	};
-	return (
-		<div>
-			<Button onClick={handleButtonClick} disabled={posting}>
-				{props.name}
-			</Button>
-			<input
-				type="file"
-				accept=".xlsx, .xls, .xlsm"
-				ref={fileInputRef}
-				style={{ display: "none" }}
-				onChange={importOrders}
-			/>
-		</div>
-	);
+    const handleButtonClick = () => {
+        setPosting(true);
+        fileInputRef.current.click();
+    };
+    return (
+        <div>
+            <Button onClick={handleButtonClick} disabled={posting}>
+                {props.name}
+            </Button>
+            <input
+                type="file"
+                accept=".xlsx, .xls, .xlsm"
+                ref={fileInputRef}
+                style={{ display: "none" }}
+                onChange={importOrders}
+            />
+        </div>
+    );
 }