π₯π₯π₯ 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-5603] feat: enhance workspace settings layout and members page (#8266)
b-saikrishnakanthf70384bff764
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsxindex 4412962cc0..783f7a0dd0 100644--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx@@ -1,26 +1,32 @@import { observer } from "mobx-react";import { usePathname } from "next/navigation";import { Outlet } from "react-router";-// constants-import { WORKSPACE_SETTINGS_ACCESS } from "@plane/constants";-import type { EUserWorkspaceRoles } from "@plane/types";// componentsimport { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";import { getWorkspaceActivePath, pathnameToAccessKey } from "@/components/settings/helper";import { SettingsMobileNav } from "@/components/settings/mobile";+// plane imports+import { WORKSPACE_SETTINGS_ACCESS } from "@plane/constants";+import type { EUserWorkspaceRoles } from "@plane/types";+// plane web components+import { WorkspaceSettingsRightSidebar } from "@/plane-web/components/workspace/right-sidebar";// hooksimport { useUserPermissions } from "@/hooks/store/user";// local componentsimport { WorkspaceSettingsSidebar } from "./sidebar";-function WorkspaceSettingLayout() {+import type { Route } from "./+types/layout";++const WorkspaceSettingLayout = observer(function WorkspaceSettingLayout({ params }: Route.ComponentProps) {+ // router+ const { workspaceSlug } = params;// store hooksconst { workspaceUserInfo, getWorkspaceRoleByWorkspaceSlug } = useUserPermissions();// next hooksconst pathname = usePathname();// derived values- const { workspaceSlug, accessKey } = pathnameToAccessKey(pathname);- const userWorkspaceRole = getWorkspaceRoleByWorkspaceSlug(workspaceSlug.toString());+ const { accessKey } = pathnameToAccessKey(pathname);+ const userWorkspaceRole = getWorkspaceRoleByWorkspaceSlug(workspaceSlug);let isAuthorized: boolean | string = false;if (pathname && workspaceSlug && userWorkspaceRole) {@@ -42,11 +48,12 @@ function WorkspaceSettingLayout() {<div className="w-full h-full overflow-y-scroll md:pt-page-y"><Outlet /></div>+ <WorkspaceSettingsRightSidebar workspaceSlug={workspaceSlug} /></div>)}</div></>);-}+});-export default observer(WorkspaceSettingLayout);+export default WorkspaceSettingLayout;diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/members/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/members/page.tsxindex 609c13c90e..0d1104f83c 100644--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/members/page.tsx+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/members/page.tsx@@ -28,10 +28,10 @@ import { useWorkspace } from "@/hooks/store/use-workspace";import { useUserPermissions } from "@/hooks/store/user";// plane web componentsimport { BillingActionsButton } from "@/plane-web/components/workspace/billing/billing-actions-button";-import { SendWorkspaceInvitationModal } from "@/plane-web/components/workspace/members/invite-modal";+import { SendWorkspaceInvitationModal, MembersActivityButton } from "@/plane-web/components/workspace/members";import type { Route } from "./+types/page";-function WorkspaceMembersSettingsPage({ params }: Route.ComponentProps) {+const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsPage({ params }: Route.ComponentProps) {// statesconst [inviteModal, setInviteModal] = useState(false);const [searchQuery, setSearchQuery] = useState<string>("");@@ -70,23 +70,27 @@ function WorkspaceMembersSettingsPage({ params }: Route.ComponentProps) {title: "Success!",message: t("workspace_settings.settings.members.invitations_sent_successfully"),});- // eslint-disable-next-line @typescript-eslint/no-explicit-any- } catch (err: any) {+ } catch (error: unknown) {+ let message = undefined;+ if (error instanceof Error) {+ const err = error as Error & { error?: string };+ message = err.error;+ }captureError({eventName: MEMBER_TRACKER_EVENTS.invite,payload: {emails: data.emails.map((email) => email.email),},- error: err,+ error: error as Error,});setToast({type: TOAST_TYPE.ERROR,title: "Error!",- message: `${err.error ?? t("something_went_wrong_please_try_again")}`,+ message: `${message ?? t("something_went_wrong_please_try_again")}`,});- throw err;+ throw error;}};@@ -137,6 +141,7 @@ function WorkspaceMembersSettingsPage({ params }: Route.ComponentProps) {className="w-full max-w-[234px] border-none bg-transparent text-sm outline-none placeholder:text-custom-text-400"placeholder={`${t("search")}...`}value={searchQuery}+ // eslint-disable-next-line jsx-a11y/no-autofocusautoFocusonChange={(e) => setSearchQuery(e.target.value)}/>@@ -146,6 +151,7 @@ function WorkspaceMembersSettingsPage({ params }: Route.ComponentProps) {handleUpdate={handleRoleFilterUpdate}memberType="workspace"/>+ <MembersActivityButton workspaceSlug={workspaceSlug} />{canPerformWorkspaceAdminActions && (<Buttonvariant="primary"@@ -163,6 +169,6 @@ function WorkspaceMembersSettingsPage({ params }: Route.ComponentProps) {</section></SettingsContentWrapper>);-}+});-export default observer(WorkspaceMembersSettingsPage);+export default WorkspaceMembersSettingsPage;diff --git a/apps/web/ce/components/workspace/members/index.ts b/apps/web/ce/components/workspace/members/index.tsnew file mode 100644index 0000000000..8e7291706c--- /dev/null+++ b/apps/web/ce/components/workspace/members/index.ts@@ -0,0 +1,2 @@+export * from "./invite-modal";+export * from "./members-activity-button";diff --git a/apps/web/ce/components/workspace/members/members-activity-button.tsx b/apps/web/ce/components/workspace/members/members-activity-button.tsxnew file mode 100644index 0000000000..bf3d333d89--- /dev/null+++ b/apps/web/ce/components/workspace/members/members-activity-button.tsx@@ -0,0 +1,6 @@+import { observer } from "mobx-react";++// eslint-disable-next-line @typescript-eslint/no-unused-vars+export const MembersActivityButton = observer(function MembersActivityButton(props: { workspaceSlug: string }) {+ return <></>;+});diff --git a/apps/web/ce/components/workspace/right-sidebar/index.ts b/apps/web/ce/components/workspace/right-sidebar/index.tsnew file mode 100644index 0000000000..1efe34c51e--- /dev/null+++ b/apps/web/ce/components/workspace/right-sidebar/index.ts@@ -0,0 +1 @@+export * from "./root";diff --git a/apps/web/ce/components/workspace/right-sidebar/root.tsx b/apps/web/ce/components/workspace/right-sidebar/root.tsxnew file mode 100644index 0000000000..c98bb682a5--- /dev/null+++ b/apps/web/ce/components/workspace/right-sidebar/root.tsx@@ -0,0 +1,10 @@+import { observer } from "mobx-react";++type TWorkspaceSettingsRightSidebarProps = { workspaceSlug: string };++export const WorkspaceSettingsRightSidebar = observer(function WorkspaceSettingsRightSidebar(+ // eslint-disable-next-line @typescript-eslint/no-unused-vars+ props: TWorkspaceSettingsRightSidebarProps+) {+ return <></>;+});