From 24899887b2e3f34866619cb41156ad21c2b02ae3 Mon Sep 17 00:00:00 2001 From: Saurabh Kumar <70131915+Saurabhkmr98@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:41:47 +0530 Subject: [PATCH] chore: Add workspace slug to should render setting link method (#6886) * add workspace slug to setting link function * add params in the function --- .../(projects)/settings/(with-sidebar)/mobile-header-tabs.tsx | 2 +- .../(projects)/settings/(with-sidebar)/sidebar.tsx | 2 +- web/ce/helpers/workspace.helper.ts | 4 ++-- .../command-palette/actions/workspace-settings-actions.tsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/mobile-header-tabs.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/mobile-header-tabs.tsx index b699a1ff2..272862597 100644 --- a/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/mobile-header-tabs.tsx +++ b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/mobile-header-tabs.tsx @@ -20,7 +20,7 @@ export const MobileWorkspaceSettingsTabs = observer(() => {
{WORKSPACE_SETTINGS_LINKS.map( (item, index) => - shouldRenderSettingLink(item.key) && + shouldRenderSettingLink(workspaceSlug.toString(), item.key) && allowPermissions(item.access, EUserPermissionsLevel.WORKSPACE, workspaceSlug.toString()) && (
{
{WORKSPACE_SETTINGS_LINKS.map( (link) => - shouldRenderSettingLink(link.key) && + shouldRenderSettingLink(workspaceSlug.toString(), link.key) && allowPermissions(link.access, EUserPermissionsLevel.WORKSPACE, workspaceSlug.toString()) && ( true; +export type TRenderSettingsLink = (workspaceSlug: string, settingKey: string) => boolean; +export const shouldRenderSettingLink: TRenderSettingsLink = (workspaceSlug, settingKey) => true; \ No newline at end of file diff --git a/web/core/components/command-palette/actions/workspace-settings-actions.tsx b/web/core/components/command-palette/actions/workspace-settings-actions.tsx index 670788a33..5cf7ee4b1 100644 --- a/web/core/components/command-palette/actions/workspace-settings-actions.tsx +++ b/web/core/components/command-palette/actions/workspace-settings-actions.tsx @@ -40,7 +40,7 @@ export const CommandPaletteWorkspaceSettingsActions: React.FC = (props) = {WORKSPACE_SETTINGS_LINKS.map( (setting) => allowPermissions(setting.access, EUserPermissionsLevel.WORKSPACE, workspaceSlug.toString()) && - shouldRenderSettingLink(setting.key) && ( + shouldRenderSettingLink(workspaceSlug.toString(), setting.key) && ( redirect(`/${workspaceSlug}${setting.href}`)}