diff --git a/adminfront/src/components/layout/AppLayout.tsx b/adminfront/src/components/layout/AppLayout.tsx index 0b44a8c7..92c8d00e 100644 --- a/adminfront/src/components/layout/AppLayout.tsx +++ b/adminfront/src/components/layout/AppLayout.tsx @@ -267,7 +267,7 @@ function AppLayout() { if (item.to === "/auth") return permissions.auth_guard; if (item.to === "/api-keys") return permissions.api_keys; if (item.to === "/audit-logs") return permissions.audit_logs; - if (item.to === "/permissions-direct") return permissions.permissions_direct || _manageableCount > 0; + if (item.to === "/permissions-direct") return false; if (item.to === "/tenants") return permissions.tenants; if (item.to === orgfrontUrl) return permissions.org_chart; if (item.to === "/worksmobile") return permissions.worksmobile && showWorksmobile; diff --git a/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.tsx b/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.tsx index 5f4e62c3..8235c7c2 100644 --- a/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.tsx +++ b/adminfront/src/features/tenants/routes/TenantFineGrainedPermissionsPage.tsx @@ -1,4 +1,5 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; +import { useNavigate } from "react-router-dom"; import type { AxiosError } from "axios"; import { useState, useEffect } from "react"; import { @@ -55,6 +56,7 @@ import { toast } from "../../../components/ui/use-toast"; export function TenantFineGrainedPermissionsPage() { const queryClient = useQueryClient(); + const navigate = useNavigate(); const [activeTab, setActiveTab] = useState<"tenant" | "system">("system"); const [selectedTenantId, setSelectedTenantId] = useState(""); const [searchTerm, setSearchTerm] = useState(""); @@ -72,6 +74,19 @@ export function TenantFineGrainedPermissionsPage() { const isSuperAdmin = profile?.role === "super_admin"; + if (profile && !isSuperAdmin) { + return ( +