diff --git a/packages/client/src/pages/engine/engine-layout.tsx b/packages/client/src/pages/engine/engine-layout.tsx index 2397528bc0..943a91ce7c 100644 --- a/packages/client/src/pages/engine/engine-layout.tsx +++ b/packages/client/src/pages/engine/engine-layout.tsx @@ -12,7 +12,7 @@ import { usePixel } from "@semoss/sdk/react"; import { Spinner, Tabs, TabsList, TabsTrigger } from "@semoss/ui/next"; import { EngineHeader } from "@/components/engine"; import { EngineContext } from "@/contexts"; -import { useAPI, useRootStore, useSettings } from "@/hooks"; +import { useAPI, useRootStore } from "@/hooks"; import type { ENGINE_ROUTES } from "./engine.constants"; interface EngineLayoutProps { @@ -29,8 +29,6 @@ export const EngineLayout: React.FC = ({ route }) => { const resolvedPath = useResolvedPath(""); const { pathname } = useLocation(); const navigate = useNavigate(); - const { adminMode } = useSettings(); - const isAdminContext = adminMode && configStore.store.user.admin; // filter metakeys to the ones we want const engineMetaKeys = configStore.store.config.databaseMetaKeys.filter( @@ -122,9 +120,7 @@ export const EngineLayout: React.FC = ({ route }) => { // get the user's role const getUserEnginePermission = useAPI( - !isAdminContext && engineId - ? ["getUserEnginePermission", engineId] - : null, + engineId ? ["getUserEnginePermission", engineId] : null, ); // get the tabs based on permission and database type @@ -135,17 +131,14 @@ export const EngineLayout: React.FC = ({ route }) => { } if ( - !isAdminContext && - (getUserEnginePermission.status !== "SUCCESS" || - !getUserEnginePermission.data) + getUserEnginePermission.status !== "SUCCESS" || + !getUserEnginePermission.data ) { return []; } // check the permission - const permission = isAdminContext - ? "OWNER" - : getUserEnginePermission.data.permission; + const permission = getUserEnginePermission.data.permission; // get the routes based on permission let filteredTabs = route.specific.filter((t) => @@ -167,7 +160,6 @@ export const EngineLayout: React.FC = ({ route }) => { return filteredTabs; }, [ route, - isAdminContext, getUserEnginePermission.status, getUserEnginePermission.data ? getUserEnginePermission.data.permission @@ -199,15 +191,12 @@ export const EngineLayout: React.FC = ({ route }) => { }, [route, tabs, resolvedPath, pathname]); // if the engine isn't found, navigate to the Home Page - if ( - !engineId || - (!isAdminContext && getUserEnginePermission.status === "ERROR") - ) { + if (!engineId || getUserEnginePermission.status === "ERROR") { return ; } // show a loading screen when it is pending - if (!isAdminContext && getUserEnginePermission.status !== "SUCCESS") { + if (getUserEnginePermission.status !== "SUCCESS") { return (
@@ -244,9 +233,7 @@ export const EngineLayout: React.FC = ({ route }) => { name: route.name, active: { id: engineId, - role: isAdminContext - ? "OWNER" - : getUserEnginePermission.data.permission, + role: getUserEnginePermission.data.permission, name: (getEngineMetadata.data?.database_name as string) || "", metadata: values,