admin/hspguard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: bar items better check for isActive

Browse Source
This commit is contained in:
Amir Adal
2025-05-31 16:16:04 +02:00
parent cd5adcdc3f
commit 0ca2bb3f89
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web/src/hooks/barItems.tsx
View File

@ -1,5 +1,5 @@
import { useAuth } from "@/store/auth"; import { useAuth } from "@/store/auth";
import { Blocks, Home, Settings2, User } from "lucide-react"; import { Blocks, Home, Settings2, User, Users } from "lucide-react";
import { useCallback, type ReactNode } from "react"; import { useCallback, type ReactNode } from "react";
import { useLocation } from "react-router"; import { useLocation } from "react-router";
@ -16,7 +16,8 @@ export const useBarItems = (): [BarItem[], (item: BarItem) => boolean] => {
const isActive = useCallback( const isActive = useCallback(
(item: BarItem) => { (item: BarItem) => {
return location.pathname === item.pathname; if (item.pathname === "/") return location.pathname === item.pathname;
return location.pathname.startsWith(item.pathname);
}, },
[location.pathname], [location.pathname],
); );
@ -50,9 +51,15 @@ export const useBarItems = (): [BarItem[], (item: BarItem) => boolean] => {
{ {
icon: <Blocks />, icon: <Blocks />,
title: "API Services", title: "API Services",
tab: "api-services", tab: "admin.api-services",
pathname: "/admin/api-services", pathname: "/admin/api-services",
}, },
{
icon: <Users />,
title: "Users",
tab: "admin.users",
pathname: "/admin/users",
},
] ]
: []), : []),
], ],