Compare commits

...

5 Commits

3 changed files with 33 additions and 8 deletions

View File

@@ -14,6 +14,7 @@ import { useRouter } from "@tanstack/react-router";
import { ChangeSetting } from "./SettingForm"; import { ChangeSetting } from "./SettingForm";
import { getSettings } from "@/utils/querys/settings"; import { getSettings } from "@/utils/querys/settings";
import { Skeleton } from "@/components/ui/skeleton"; import { Skeleton } from "@/components/ui/skeleton";
import { useEffect } from "react";
export type Settings = { export type Settings = {
settings_id?: string; settings_id?: string;
@@ -27,14 +28,25 @@ export default function SettingsPage() {
const { modules } = useModuleStore(); const { modules } = useModuleStore();
const router = useRouter(); const router = useRouter();
const adminModule = modules.filter((n) => n.name === "admin"); useEffect(() => {
const userLevel = if (!user || modules.length === 0) return;
user?.roles.filter((r) => r.module_id === adminModule[0].module_id) ||
[];
if (!adminModule[0].roles.includes(userLevel[0]?.role)) { const adminModule = modules.find((n) => n.name === "admin");
router.navigate({ to: "/" }); if (!adminModule) {
} console.log("no module loaded");
//router.navigate({ to: "/" });
return;
}
const userLevel =
user?.roles?.filter((r) => r.module_id === adminModule.module_id) ||
[];
if (!adminModule.roles?.includes(userLevel[0]?.role)) {
console.log("Something failed");
//router.navigate({ to: "/" });
}
}, [modules, user, router]);
const { data, isError, error, isLoading } = useQuery( const { data, isError, error, isLoading } = useQuery(
getSettings(token ?? "") getSettings(token ?? "")

View File

@@ -36,7 +36,7 @@
} }
}, },
"admConfig": { "admConfig": {
"build": 429, "build": 432,
"oldBuild": "backend-0.1.3.zip" "oldBuild": "backend-0.1.3.zip"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -35,6 +35,19 @@ const newProdRoles: any = [
roles: ["Quality\\Blocking\\ProcessAdmin"], roles: ["Quality\\Blocking\\ProcessAdmin"],
rolesLegacy: [3, 14, 45], rolesLegacy: [3, 14, 45],
}, },
{
name: "qualityManager",
description:
"Quality manager with cch, blocking, planning, stock warehouse leader, waste, quality waste.",
roles: [
"Manufacturing\\ProductionControlling\\ProductionController",
"Quality\\ComplaintHandling\\ProcessAdmin",
"Quality\\Blocking\\ProcessAdmin",
"Manufacturing\\IssueMaterial\\ProcessAdmin",
"Manufacturing\\ProductionLabelling\\ProcessAdmin",
],
rolesLegacy: [105, 3, 14, 45],
},
// logistics // logistics
// plant manager // plant manager