π₯π₯π₯ 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
[WEB-2376] dev: workspace settings improvement & refactor. (#5519)
Prateek Shouryac78b2344b847
diff --git a/web/app/[workspaceSlug]/(projects)/settings/mobile-header-tabs.tsx b/web/app/[workspaceSlug]/(projects)/settings/mobile-header-tabs.tsxindex 5cbcce6534..a672cc2ca4 100644--- a/web/app/[workspaceSlug]/(projects)/settings/mobile-header-tabs.tsx+++ b/web/app/[workspaceSlug]/(projects)/settings/mobile-header-tabs.tsx@@ -1,28 +1,44 @@import { useParams, usePathname } from "next/navigation";+// constants+import { EUserWorkspaceRoles } from "@/constants/workspace";// hooks+import { useUser } from "@/hooks/store";import { useAppRouter } from "@/hooks/use-app-router";// plane web constantsimport { WORKSPACE_SETTINGS_LINKS } from "@/plane-web/constants/workspace";+// plane web helpers+import { shouldRenderSettingLink } from "@/plane-web/helpers/workspace.helper";export const MobileWorkspaceSettingsTabs = () => {const router = useAppRouter();const { workspaceSlug } = useParams();const pathname = usePathname();+ // mobx store+ const {+ membership: { currentWorkspaceRole },+ } = useUser();++ // derived values+ const workspaceMemberInfo = currentWorkspaceRole || EUserWorkspaceRoles.GUEST;+return (<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) => (- <div- className={`${- item.highlight(pathname, `/${workspaceSlug}`)- ? "text-custom-primary-100 text-sm py-2 px-3 whitespace-nowrap flex flex-grow cursor-pointer justify-around border-b border-custom-primary-200"- : "text-custom-text-200 flex flex-grow cursor-pointer justify-around border-b border-custom-border-200 text-sm py-2 px-3 whitespace-nowrap"- }`}- key={index}- onClick={() => router.push(`/${workspaceSlug}${item.href}`)}- >- {item.label}- </div>- ))}+ {WORKSPACE_SETTINGS_LINKS.map(+ (item, index) =>+ shouldRenderSettingLink(item.key) &&+ workspaceMemberInfo >= item.access && (+ <div+ className={`${item.highlight(pathname, `/${workspaceSlug}`)+ ? "text-custom-primary-100 text-sm py-2 px-3 whitespace-nowrap flex flex-grow cursor-pointer justify-around border-b border-custom-primary-200"+ : "text-custom-text-200 flex flex-grow cursor-pointer justify-around border-b border-custom-border-200 text-sm py-2 px-3 whitespace-nowrap"+ }`}+ key={index}+ onClick={() => router.push(`/${workspaceSlug}${item.href}`)}+ >+ {item.label}+ </div>+ )+ )}</div>);};diff --git a/web/app/[workspaceSlug]/(projects)/settings/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/settings/sidebar.tsxindex 0dc206f2b0..9572d6519b 100644--- a/web/app/[workspaceSlug]/(projects)/settings/sidebar.tsx+++ b/web/app/[workspaceSlug]/(projects)/settings/sidebar.tsx@@ -12,6 +12,8 @@ import { EUserWorkspaceRoles } from "@/constants/workspace";import { useUser } from "@/hooks/store";// plane web constantsimport { WORKSPACE_SETTINGS_LINKS } from "@/plane-web/constants/workspace";+// plane web helpers+import { shouldRenderSettingLink } from "@/plane-web/helpers/workspace.helper";export const WorkspaceSettingsSidebar = observer(() => {// router@@ -22,6 +24,7 @@ export const WorkspaceSettingsSidebar = observer(() => {membership: { currentWorkspaceRole },} = useUser();+ // derived valuesconst workspaceMemberInfo = currentWorkspaceRole || EUserWorkspaceRoles.GUEST;return (@@ -31,6 +34,7 @@ export const WorkspaceSettingsSidebar = observer(() => {<div className="flex w-full flex-col gap-1">{WORKSPACE_SETTINGS_LINKS.map((link) =>+ shouldRenderSettingLink(link.key) &&workspaceMemberInfo >= link.access && (<Link key={link.key} href={`/${workspaceSlug}${link.href}`}><SidebarNavItemdiff --git a/web/ce/helpers/workspace.helper.ts b/web/ce/helpers/workspace.helper.tsnew file mode 100644index 0000000000..bc8c5c1b4f--- /dev/null+++ b/web/ce/helpers/workspace.helper.ts@@ -0,0 +1,2 @@+// eslint-disable-next-line @typescript-eslint/no-unused-vars+export const shouldRenderSettingLink = (settingKey: string) => true;diff --git a/web/core/components/command-palette/actions/workspace-settings-actions.tsx b/web/core/components/command-palette/actions/workspace-settings-actions.tsxindex 109257ed13..c2094d296c 100644--- a/web/core/components/command-palette/actions/workspace-settings-actions.tsx+++ b/web/core/components/command-palette/actions/workspace-settings-actions.tsx@@ -11,6 +11,8 @@ import { useUser } from "@/hooks/store";import { useAppRouter } from "@/hooks/use-app-router";// plane wev constantsimport { WORKSPACE_SETTINGS_LINKS } from "@/plane-web/constants/workspace";+// plane web helpers+import { shouldRenderSettingLink } from "@/plane-web/helpers/workspace.helper";type Props = {closePalette: () => void;@@ -38,7 +40,8 @@ export const CommandPaletteWorkspaceSettingsActions: React.FC<Props> = (props) =<>{WORKSPACE_SETTINGS_LINKS.map((setting) =>- workspaceMemberInfo >= setting.access && (+ workspaceMemberInfo >= setting.access &&+ shouldRenderSettingLink(setting.key) && (<Command.Itemkey={setting.key}onSelect={() => redirect(`/${workspaceSlug}${setting.href}`)}diff --git a/web/core/lib/store-context.tsx b/web/core/lib/store-context.tsxindex cbee8b2dac..f06dfb4d83 100644--- a/web/core/lib/store-context.tsx+++ b/web/core/lib/store-context.tsx@@ -15,7 +15,6 @@ const initializeStore = () => {return newRootStore;};-export const StoreProvider = ({ children }: { children: ReactElement }) => {- const store = initializeStore();- return <StoreContext.Provider value={store}>{children}</StoreContext.Provider>;-};+export const store = initializeStore();++export const StoreProvider = ({ children }: { children: ReactElement }) => <StoreContext.Provider value={store}>{children}</StoreContext.Provider>;diff --git a/web/ee/helpers/workspace.helper.ts b/web/ee/helpers/workspace.helper.tsnew file mode 100644index 0000000000..731cd07dc4--- /dev/null+++ b/web/ee/helpers/workspace.helper.ts@@ -0,0 +1 @@+export * from "ce/helpers/workspace.helper";