π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
chore: Add workspace slug to should render setting link method (#6886)
Saurabh Kumar24899887b2e3
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.tsxindex b699a1ff26..2728625970 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(() => {<div className="flex-shrink-0 md:hidden sticky inset-0 flex overflow-x-auto bg-custom-background-100 z-10">{WORKSPACE_SETTINGS_LINKS.map((item, index) =>- shouldRenderSettingLink(item.key) &&+ shouldRenderSettingLink(workspaceSlug.toString(), item.key) &&allowPermissions(item.access, EUserPermissionsLevel.WORKSPACE, workspaceSlug.toString()) && (<divclassName={`${diff --git a/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/sidebar.tsxindex a120655364..95cb20c6cd 100644--- a/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/sidebar.tsx+++ b/web/app/[workspaceSlug]/(projects)/settings/(with-sidebar)/sidebar.tsx@@ -28,7 +28,7 @@ export const WorkspaceSettingsSidebar = observer(() => {<div className="flex w-full flex-col gap-1">{WORKSPACE_SETTINGS_LINKS.map((link) =>- shouldRenderSettingLink(link.key) &&+ shouldRenderSettingLink(workspaceSlug.toString(), link.key) &&allowPermissions(link.access, EUserPermissionsLevel.WORKSPACE, workspaceSlug.toString()) && (<Link key={link.key} href={`/${workspaceSlug}${link.href}`}><SidebarNavItemdiff --git a/web/ce/helpers/workspace.helper.ts b/web/ce/helpers/workspace.helper.tsindex bc8c5c1b4f..7f223f12f4 100644--- a/web/ce/helpers/workspace.helper.ts+++ b/web/ce/helpers/workspace.helper.ts@@ -1,2 +1,2 @@-// eslint-disable-next-line @typescript-eslint/no-unused-vars-export const shouldRenderSettingLink = (settingKey: string) => true;+export type TRenderSettingsLink = (workspaceSlug: string, settingKey: string) => boolean;+export const shouldRenderSettingLink: TRenderSettingsLink = (workspaceSlug, settingKey) => true;\ No newline at end of filediff --git a/web/core/components/command-palette/actions/workspace-settings-actions.tsx b/web/core/components/command-palette/actions/workspace-settings-actions.tsxindex 670788a330..5cf7ee4b1f 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> = (props) ={WORKSPACE_SETTINGS_LINKS.map((setting) =>allowPermissions(setting.access, EUserPermissionsLevel.WORKSPACE, workspaceSlug.toString()) &&- shouldRenderSettingLink(setting.key) && (+ shouldRenderSettingLink(workspaceSlug.toString(), setting.key) && (<Command.Itemkey={setting.key}onSelect={() => redirect(`/${workspaceSlug}${setting.href}`)}