Skip to content

fix(client): removing admin override to view information outside of settings #2807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
themaherkhalil merged 1 commit into from
Mar 4, 2026
Merged

fix(client): removing admin override to view information outside of settings #2807

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions packages/client/src/pages/engine/engine-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -29,8 +29,6 @@ export const EngineLayout: React.FC<EngineLayoutProps> = ({ 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(
Expand Down Expand Up @@ -122,9 +120,7 @@ export const EngineLayout: React.FC<EngineLayoutProps> = ({ 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
Expand All @@ -135,17 +131,14 @@ export const EngineLayout: React.FC<EngineLayoutProps> = ({ 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) =>
Expand All @@ -167,7 +160,6 @@ export const EngineLayout: React.FC<EngineLayoutProps> = ({ route }) => {
return filteredTabs;
}, [
route,
isAdminContext,
getUserEnginePermission.status,
getUserEnginePermission.data
? getUserEnginePermission.data.permission
Expand Down Expand Up @@ -199,15 +191,12 @@ export const EngineLayout: React.FC<EngineLayoutProps> = ({ 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 <Navigate to={`${route.path}`} replace />;
}

// show a loading screen when it is pending
if (!isAdminContext && getUserEnginePermission.status !== "SUCCESS") {
if (getUserEnginePermission.status !== "SUCCESS") {
return (
<div>
<Spinner className="size-8" />
Expand Down Expand Up @@ -244,9 +233,7 @@ export const EngineLayout: React.FC<EngineLayoutProps> = ({ 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,
Expand Down