From d37d21092161592427bcb3f3dbf4d0e0bbc65ff3 Mon Sep 17 00:00:00 2001 From: Akshita Goyal <36129505+gakshita@users.noreply.github.com> Date: Mon, 24 Mar 2025 18:15:43 +0530 Subject: [PATCH] [WEB-3677] fix: settings dynamic pages permissions (#6804) * fix: settings dynamic pages permissions * fix: refactor --- .../(projects)/settings/(with-sidebar)/layout.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/layout.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/layout.tsx index 24f81d39d..e51106bfe 100644 --- a/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/layout.tsx +++ b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/layout.tsx @@ -24,7 +24,7 @@ const WorkspaceSettingLayout: FC = observer((props) => const { workspaceUserInfo } = useUserPermissions(); const pathname = usePathname(); - const { workspaceSlug } = useParams(); + const [workspaceSlug, suffix, route] = pathname.replace(/^\/|\/$/g, "").split("/"); // Regex removes leading and trailing slashes // derived values const userWorkspaceRole = workspaceUserInfo?.[workspaceSlug.toString()]?.role; @@ -32,7 +32,7 @@ const WorkspaceSettingLayout: FC = observer((props) => pathname && workspaceSlug && userWorkspaceRole && - WORKSPACE_SETTINGS_ACCESS[pathname.replace(`/${workspaceSlug}`, "").slice(0, -1)]?.includes( + WORKSPACE_SETTINGS_ACCESS[route ? `/${suffix}/${route}` : `/${suffix}`]?.includes( userWorkspaceRole as EUserWorkspaceRoles );