From f7986149e8d1e683c86ab10fd9b1d1113e5b251d Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Wed, 7 Jan 2026 13:01:32 +0700 Subject: [PATCH 1/2] fix: adjust marketing report endpoint --- src/services/api/report/marketing-report.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/api/report/marketing-report.ts b/src/services/api/report/marketing-report.ts index b1bcafae..5d81605e 100644 --- a/src/services/api/report/marketing-report.ts +++ b/src/services/api/report/marketing-report.ts @@ -13,7 +13,7 @@ export class MarketingReportApiService extends BaseApiService< unknown, unknown > { - constructor(basePath: string = '/reports/marketings/daily-marketing') { + constructor(basePath: string = '/reports/marketing') { super(basePath); } @@ -71,5 +71,5 @@ export class MarketingReportApiService extends BaseApiService< } export const MarketingReportApi = new MarketingReportApiService( - '/reports/marketings/daily-marketing' + '/reports/marketing' ); From 50d499005d988f898ccbdc7771bce4ac1811fc1d Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Wed, 7 Jan 2026 13:57:00 +0700 Subject: [PATCH 2/2] fix: format pathname --- src/components/MainDrawer.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/MainDrawer.tsx b/src/components/MainDrawer.tsx index fc8cbb18..eaf1e2c1 100644 --- a/src/components/MainDrawer.tsx +++ b/src/components/MainDrawer.tsx @@ -67,7 +67,9 @@ const MainDrawer = ({ const pathname = usePathname(); const { permissionCheck } = useAuth(); - const isPermitted = ROUTE_PERMISSIONS[pathname]?.some((permission) => + const formattedPathname = pathname.endsWith('/') ? pathname : `${pathname}/`; + + const isPermitted = ROUTE_PERMISSIONS[formattedPathname]?.some((permission) => permissionCheck(permission) );