Skip to content

Side Menu Changes #1172

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
merged 3 commits into from
May 20, 2025
Merged

Side Menu Changes #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bb7bbc
Side Menu Changes
ammb-123 May 19, 2025
2fb89bb
Update config.store.ts
ammb-123 May 20, 2025
8c404f7
fix(client): fix condition on navigator layout for side menu adminOnl…
johbaxter May 20, 2025
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
31 changes: 16 additions & 15 deletions packages/client/src/pages/HomePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,21 +328,22 @@ export const HomePage = observer((): JSX.Element => {
}}
/>
</Stack>
{configStore.isEngineOperationAvailable(
'APP',
'add',
) && (
<Button
size={'large'}
variant={'contained'}
onClick={() => {
navigate('/app/new');
}}
aria-label={`Open the App Model`}
>
Create New App
</Button>
)}
{configStore.store.config.adminOnlyViewMenuBarFlag &&
configStore.isEngineOperationAvailable(
'APP',
'add',
) && (
<Button
size={'large'}
variant={'contained'}
onClick={() => {
navigate('/app/new');
}}
aria-label={`Open the App Model`}
>
Create New App
</Button>
)}
</Stack>
</Stack>
}
Expand Down
110 changes: 65 additions & 45 deletions packages/client/src/pages/NavigatorLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import { ErrorBoundary } from '@/components/common';
import { ENGINE_ROUTES } from '@/pages/engine';
import { ErrorPage } from './ErrorPage';
import { PlatformMessages } from './PlatformMessages';
import { useRootStore } from '@/hooks';
import { useEffect, useState } from 'react';

const NAV_HEIGHT = '48px';
const SIDEBAR_WIDTH = '56px';
Expand Down Expand Up @@ -81,48 +83,65 @@ const StyledContent = styled('div')(() => ({
*/
export const NavigatorLayout = observer(() => {
const { pathname } = useLocation();
const { configStore } = useRootStore();
const [viewSidebar, setViewSidebar] = useState(false);

useEffect(() => {
if (configStore.store.user.admin) {
setViewSidebar(true);
} else if (
!configStore.store.user.admin &&
!configStore.store.config.adminOnlyViewMenuBarFlag
) {
setViewSidebar(true);
}
}, [
configStore.store.user.admin,
configStore.store.config.adminOnlyViewMenuBarFlag,
]);

return (
<ErrorBoundary fallback={<ErrorPage />}>
<Navbar />
<StyledSidebar>
<Tooltip title={`Open App Library`} placement="right">
<StyledSidebarItem
data-tour="nav-app-library"
to={'/'}
selected={
!!matchPath('', pathname) ||
!!matchPath('app/*', pathname)
}
aria-label={'Navigate to app library'}
>
<Icon>
<LibraryBooksOutlined />
</Icon>
</StyledSidebarItem>
</Tooltip>
<StyledSidebarDivider />
{ENGINE_ROUTES.map((r) => (
<Tooltip
title={`Open ${r.name}`}
key={r.path}
placement="right"
>
{viewSidebar && (
<StyledSidebar>
<Tooltip title={`Open App Library`} placement="right">
<StyledSidebarItem
data-testid={`${r.name}-icon`}
// id={`${r.name}-icon`}
data-tour={`nav-engine-${r.path}`}
to={`/engine/${r.path}`}
data-tour="nav-app-library"
to={'/'}
selected={
!!matchPath(`engine/${r.path}/*`, pathname)
!!matchPath('', pathname) ||
!!matchPath('app/*', pathname)
}
aria-label={`Navigate to ${r.name}`}
aria-label={'Navigate to app library'}
>
<Icon>{createElement(r.icon, {})}</Icon>
<Icon>
<LibraryBooksOutlined />
</Icon>
</StyledSidebarItem>
</Tooltip>
))}
{/* <Tooltip title={`Open Prompt Hub`} placement="right">
<StyledSidebarDivider />
{ENGINE_ROUTES.map((r) => (
<Tooltip
title={`Open ${r.name}`}
key={r.path}
placement="right"
>
<StyledSidebarItem
data-testid={`${r.name}-icon`}
// id={`${r.name}-icon`}
data-tour={`nav-engine-${r.path}`}
to={`/engine/${r.path}`}
selected={
!!matchPath(`engine/${r.path}/*`, pathname)
}
aria-label={`Navigate to ${r.name}`}
>
<Icon>{createElement(r.icon, {})}</Icon>
</StyledSidebarItem>
</Tooltip>
))}
{/* <Tooltip title={`Open Prompt Hub`} placement="right">
<StyledSidebarItem
to={'/prompt'}
selected={!!matchPath('prompt/*', pathname)}
Expand All @@ -133,19 +152,20 @@ export const NavigatorLayout = observer(() => {
</Icon>
</StyledSidebarItem>
</Tooltip> */}
<Stack flex={1}>&nbsp;</Stack>
<Tooltip title={`Open Settings`} placement="right">
<StyledSidebarItem
to={'/settings'}
selected={!!matchPath('settings/*', pathname)}
aria-label={'Navigate to settings'}
>
<Icon>
<Settings data-testid="Settings-icon" />
</Icon>
</StyledSidebarItem>
</Tooltip>
</StyledSidebar>
<Stack flex={1}>&nbsp;</Stack>
<Tooltip title={`Open Settings`} placement="right">
<StyledSidebarItem
to={'/settings'}
selected={!!matchPath('settings/*', pathname)}
aria-label={'Navigate to settings'}
>
<Icon>
<Settings data-testid="Settings-icon" />
</Icon>
</StyledSidebarItem>
</Tooltip>
</StyledSidebar>
)}
<StyledContent>
<PlatformMessages platformAssist={true}>
<Outlet />
Expand Down
6 changes: 5 additions & 1 deletion packages/client/src/stores/config/config.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ interface ConfigStoreInterface {
* Track if csrf is enabled
*/
csrf: boolean;

/*
* sidemenubar if adminOnlyViewMenuBarFlag is enabled
*/
adminOnlyViewMenuBarFlag: boolean;
/**
* Flags
*/
Expand Down Expand Up @@ -162,6 +165,7 @@ export class ConfigStore {
r: true,
python: true,
csrf: false,
adminOnlyViewMenuBarFlag: false,
adminOnlyDbAdd: false,
adminOnlyDbAddAccess: false,
adminOnlyDbDelete: false,
Expand Down