Skip to content

Commit 6e71e8f

Browse files
Add NavTop
1 parent 8e230cd commit 6e71e8f

4 files changed

Lines changed: 37 additions & 17 deletions

File tree

packages/react-ui/src/app/features/navigation/side-menu/dashboard/dashboard-side-menu.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { useAnalyticsLinks } from '@/app/features/navigation/lib/analytics-links
1414
import { useMenuLinks } from '@/app/features/navigation/lib/menu-links-hook';
1515
import { DashboardSideMenuHeader } from '@/app/features/navigation/side-menu/dashboard/dashboard-side-menu-header';
1616
import { SideMenuFooter } from '@/app/features/navigation/side-menu/side-menu-footer';
17+
import { NavTop } from '@/app/features/workspaces/components/nav-top';
1718
import { usersApi } from '@/app/lib/users-api';
1819
import { isValidISODate } from '@/app/lib/utils';
1920
import { useAppStore } from '@/app/store/app-store';
@@ -65,7 +66,11 @@ export function DashboardSideMenu() {
6566
MenuHeader={<DashboardSideMenuHeader />}
6667
MenuFooter={<SideMenuFooter isMinimized={isSidebarMinimized} />}
6768
>
68-
<SideMenuNavigation links={menuLinks} isMinimized={isSidebarMinimized} />
69+
<SideMenuNavigation
70+
links={menuLinks}
71+
isMinimized={isSidebarMinimized}
72+
NavTop={<NavTop isSidebarMinimized={isSidebarMinimized} />}
73+
/>
6974
<div className="flex flex-col justify-between h-full overflow-hidden">
7075
{isWorkflowsPage && !isSidebarMinimized && (
7176
<ScrollArea className="border-t">
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export const NavTop = ({
2+
isSidebarMinimized,
3+
}: {
4+
isSidebarMinimized: boolean;
5+
}) => {
6+
return null;
7+
};

packages/react-ui/src/app/lib/project-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ export const projectApi = {
1818
return api.get<Project>(`/v1/users/projects/${projectId}`);
1919
},
2020
getAll: async () => {
21-
return api.get<Project>(`/v1/users/projects`);
21+
return api.get<Project[]>(`/v1/users/projects`);
2222
},
2323
};

packages/ui-components/src/components/sidebar/side-menu-navigation.tsx

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,34 @@ import { MenuLink } from './types';
44
type SideMenuNavigationProps = {
55
links: MenuLink[];
66
isMinimized: boolean;
7+
NavTop?: React.ReactNode;
8+
NavBottom?: React.ReactNode;
79
};
810

911
const SideMenuNavigation = ({
1012
links,
1113
isMinimized,
12-
}: SideMenuNavigationProps) => (
13-
<nav className="flex flex-col w-full gap-1 py-3 px-3">
14-
{links.map((link, index) => (
15-
<MenuNavigationItem
16-
to={link.to}
17-
target={link.target}
18-
label={link.label}
19-
Icon={link.icon}
20-
key={index}
21-
isMinimized={isMinimized}
22-
isComingSoon={link.isComingSoon}
23-
/>
24-
))}
25-
</nav>
26-
);
14+
NavTop,
15+
NavBottom,
16+
}: SideMenuNavigationProps) => {
17+
return (
18+
<nav className="flex flex-col w-full gap-1 py-3 px-3">
19+
{NavTop}
20+
{links.map((link, index) => (
21+
<MenuNavigationItem
22+
to={link.to}
23+
target={link.target}
24+
label={link.label}
25+
Icon={link.icon}
26+
key={index}
27+
isMinimized={isMinimized}
28+
isComingSoon={link.isComingSoon}
29+
/>
30+
))}
31+
{NavBottom}
32+
</nav>
33+
);
34+
};
2735

2836
SideMenuNavigation.displayName = 'SideMenuNavigation';
2937
export { SideMenuNavigation };

0 commit comments

Comments
 (0)