π₯π₯π₯ 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-4959]chore: refactor project member page #8464
b-saikrishnakanthc97e41851530
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsxindex 783f7a0dd0..5ac77bcccc 100644--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx@@ -9,7 +9,7 @@ import { SettingsMobileNav } from "@/components/settings/mobile";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";+import { SettingsRightSidebar } from "@/plane-web/components/settings/right-sidebar";// hooksimport { useUserPermissions } from "@/hooks/store/user";// local components@@ -48,7 +48,7 @@ const WorkspaceSettingLayout = observer(function WorkspaceSettingLayout({ params<div className="w-full h-full overflow-y-scroll md:pt-page-y"><Outlet /></div>- <WorkspaceSettingsRightSidebar workspaceSlug={workspaceSlug} />+ <SettingsRightSidebar workspaceSlug={workspaceSlug} /></div>)}</div>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 5c1fc059d8..1de0255b68 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@@ -42,7 +42,7 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsPconst {workspace: { workspaceMemberIds, inviteMembersToWorkspace, filtersStore },} = useMember();- const { currentWorkspace, mutateWorkspaceMembersActivity } = useWorkspace();+ const { currentWorkspace } = useWorkspace();const { t } = useTranslation();// derived values@@ -55,7 +55,6 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsPconst handleWorkspaceInvite = async (data: IWorkspaceBulkInviteFormData) => {try {await inviteMembersToWorkspace(workspaceSlug, data);- void mutateWorkspaceMembersActivity(workspaceSlug);setInviteModal(false);diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/layout.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/layout.tsxindex 8e8c09064d..2128bd2f2e 100644--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/layout.tsx+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/layout.tsx@@ -7,10 +7,13 @@ import { SettingsMobileNav } from "@/components/settings/mobile";import { ProjectSettingsSidebar } from "@/components/settings/project/sidebar";// plane web importsimport { ProjectAuthWrapper } from "@/plane-web/layouts/project-wrapper";+import { SettingsRightSidebar } from "@/plane-web/components/settings/right-sidebar";// typesimport type { Route } from "./+types/layout";-function ProjectDetailSettingsLayout({ params }: Route.ComponentProps) {+export const ProjectDetailSettingsLayout = observer(function ProjectDetailSettingsLayout({+ params,+}: Route.ComponentProps) {const { workspaceSlug, projectId } = params;// routerconst pathname = usePathname();@@ -24,10 +27,11 @@ function ProjectDetailSettingsLayout({ params }: Route.ComponentProps) {<div className="w-full h-full overflow-y-scroll md:pt-page-y"><Outlet /></div>+ <SettingsRightSidebar workspaceSlug={workspaceSlug} projectId={projectId} /></ProjectAuthWrapper></div></>);-}+});-export default observer(ProjectDetailSettingsLayout);+export default ProjectDetailSettingsLayout;diff --git a/apps/web/ce/components/projects/members/members-activity-button.tsx b/apps/web/ce/components/projects/members/members-activity-button.tsxnew file mode 100644index 0000000000..169d47a939--- /dev/null+++ b/apps/web/ce/components/projects/members/members-activity-button.tsx@@ -0,0 +1,10 @@+import { observer } from "mobx-react";++type TProjectMembersActivityButtonProps = { workspaceSlug: string; projectId: string };++export const ProjectMembersActivityButton = observer(function ProjectMembersActivityButton(+ // eslint-disable-next-line @typescript-eslint/no-unused-vars+ props: TProjectMembersActivityButtonProps+) {+ return <></>;+});diff --git a/apps/web/ce/components/settings/right-sidebar.tsx b/apps/web/ce/components/settings/right-sidebar.tsxnew file mode 100644index 0000000000..887da2f8e3--- /dev/null+++ b/apps/web/ce/components/settings/right-sidebar.tsx@@ -0,0 +1,10 @@+import { observer } from "mobx-react";++type TSettingsRightSidebarProps = { workspaceSlug: string; projectId?: string };++export const SettingsRightSidebar = observer(function SettingsRightSidebar(+ // eslint-disable-next-line @typescript-eslint/no-unused-vars+ props: TSettingsRightSidebarProps+) {+ return <></>;+});diff --git a/apps/web/ce/components/workspace/right-sidebar/index.ts b/apps/web/ce/components/workspace/right-sidebar/index.tsdeleted file mode 100644index 1efe34c51e..0000000000--- a/apps/web/ce/components/workspace/right-sidebar/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./root";diff --git a/apps/web/ce/components/workspace/right-sidebar/root.tsx b/apps/web/ce/components/workspace/right-sidebar/root.tsxdeleted file mode 100644index c98bb682a5..0000000000--- a/apps/web/ce/components/workspace/right-sidebar/root.tsx+++ /dev/null@@ -1,10 +0,0 @@-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 <></>;-});diff --git a/apps/web/ce/store/member/project-member.store.ts b/apps/web/ce/store/member/project-member.store.tsindex f0e5b3069d..1be3ee1c1c 100644--- a/apps/web/ce/store/member/project-member.store.ts+++ b/apps/web/ce/store/member/project-member.store.ts@@ -41,4 +41,13 @@ export class ProjectMemberStore extends BaseProjectMemberStore implements IProje* @param userId - The ID of the user to remove from the project*/processMemberRemoval = (projectId: string, userId: string) => this.handleMemberRemoval(projectId, userId);++ /**+ * @description Mutate project members activity+ * @param workspaceSlug+ * @param projectId+ */+ mutateProjectMembersActivity = async (_workspaceSlug: string, _projectId: string) => {+ // No-op in default/CE version+ };}diff --git a/apps/web/core/components/project/member-list.tsx b/apps/web/core/components/project/member-list.tsxindex 5dbe78d72e..acc32265f2 100644--- a/apps/web/core/components/project/member-list.tsx+++ b/apps/web/core/components/project/member-list.tsx@@ -14,6 +14,8 @@ import { useUserPermissions } from "@/hooks/store/user";import { MemberListFiltersDropdown } from "./dropdowns/filters/member-list";import { ProjectMemberListItem } from "./member-list-item";import { SendProjectInvitationModal } from "./send-project-invitation-modal";+// plane web components+import { ProjectMembersActivityButton } from "@/plane-web/components/projects/members/members-activity-button";type TProjectMemberListProps = {projectId: string;@@ -84,6 +86,7 @@ export const ProjectMemberList = observer(function ProjectMemberList(props: TProclassName="w-full max-w-[234px] border-none bg-transparent text-13 focus:outline-none placeholder:text-placeholder"placeholder="Search"value={searchQuery}+ // eslint-disable-next-line jsx-a11y/no-autofocusautoFocusonChange={(e) => setSearchQuery(e.target.value)}/>@@ -93,9 +96,11 @@ export const ProjectMemberList = observer(function ProjectMemberList(props: TProhandleUpdate={handleRoleFilterUpdate}memberType="project"/>+ {isAdmin && <ProjectMembersActivityButton workspaceSlug={workspaceSlug} projectId={projectId} />}{isAdmin && (<Buttonvariant="primary"+ size="lg"onClick={() => {setInviteModal(true);}}diff --git a/apps/web/core/components/workspace/settings/invitations-list-item.tsx b/apps/web/core/components/workspace/settings/invitations-list-item.tsxindex eded4bbc30..8565436556 100644--- a/apps/web/core/components/workspace/settings/invitations-list-item.tsx+++ b/apps/web/core/components/workspace/settings/invitations-list-item.tsx@@ -16,7 +16,6 @@ import { ConfirmWorkspaceMemberRemove } from "@/components/workspace/confirm-worimport { captureClick } from "@/helpers/event-tracker.helper";import { useMember } from "@/hooks/store/use-member";import { useUserPermissions } from "@/hooks/store/user";-import { useWorkspace } from "@/hooks/store/use-workspace";type Props = {invitationId: string;@@ -32,7 +31,6 @@ export const WorkspaceInvitationsListItem = observer(function WorkspaceInvitatioconst { t } = useTranslation();// store hooksconst { allowPermissions, workspaceInfoBySlug } = useUserPermissions();- const { mutateWorkspaceMembersActivity } = useWorkspace();const {workspace: { updateMemberInvitation, deleteMemberInvitation, getWorkspaceInvitationDetails },} = useMember();@@ -61,7 +59,6 @@ export const WorkspaceInvitationsListItem = observer(function WorkspaceInvitatiotitle: "Success!",message: "Invitation removed successfully.",});- void mutateWorkspaceMembersActivity(workspaceSlug);} catch (err: unknown) {const error = err as { error?: string };setToast({diff --git a/apps/web/core/components/workspace/settings/member-columns.tsx b/apps/web/core/components/workspace/settings/member-columns.tsxindex b98438b1d4..53bc115e9f 100644--- a/apps/web/core/components/workspace/settings/member-columns.tsx+++ b/apps/web/core/components/workspace/settings/member-columns.tsx@@ -16,7 +16,6 @@ import { getFileURL } from "@plane/utils";// hooksimport { useMember } from "@/hooks/store/use-member";import { useUser, useUserPermissions } from "@/hooks/store/user";-import { useWorkspace } from "@/hooks/store/use-workspace";// plane web constantsexport interface RowData {@@ -121,7 +120,6 @@ export const AccountTypeColumn = observer(function AccountTypeColumn(props: Accoconst {workspace: { updateMember },} = useMember();- const { mutateWorkspaceMembersActivity } = useWorkspace();const { data: currentUser } = useUser();// derived values@@ -156,7 +154,6 @@ export const AccountTypeColumn = observer(function AccountTypeColumn(props: Accoawait updateMember(workspaceSlug.toString(), rowData.member.id, {role: value as unknown as EUserPermissions,});- void mutateWorkspaceMembersActivity(workspaceSlug);} catch (err: unknown) {const error = err as { error?: string | string[] };const errorString = Array.isArray(error?.error) ? error.error[0] : error?.error;diff --git a/apps/web/core/components/workspace/settings/members-list-item.tsx b/apps/web/core/components/workspace/settings/members-list-item.tsxindex f980e4eee3..31c41615db 100644--- a/apps/web/core/components/workspace/settings/members-list-item.tsx+++ b/apps/web/core/components/workspace/settings/members-list-item.tsx@@ -35,7 +35,7 @@ export const WorkspaceMembersListItem = observer(function WorkspaceMembersListItworkspace: { removeMemberFromWorkspace },} = useMember();const { leaveWorkspace } = useUserPermissions();- const { getWorkspaceRedirectionUrl, mutateWorkspaceMembersActivity } = useWorkspace();+ const { getWorkspaceRedirectionUrl } = useWorkspace();const { fetchCurrentUserSettings } = useUserSettings();const { t } = useTranslation();// derived values@@ -76,7 +76,6 @@ export const WorkspaceMembersListItem = observer(function WorkspaceMembersListIttry {await removeMemberFromWorkspace(workspaceSlug.toString(), memberId);- void mutateWorkspaceMembersActivity(workspaceSlug);} catch (err: unknown) {const error = err as { error?: string };setToast({diff --git a/apps/web/core/constants/fetch-keys.ts b/apps/web/core/constants/fetch-keys.tsindex b7d669506e..5c6623f162 100644--- a/apps/web/core/constants/fetch-keys.ts+++ b/apps/web/core/constants/fetch-keys.ts@@ -154,10 +154,10 @@ export const APPLICATION_BY_CLIENT_ID = (clientId: string) => `APPLICATION_BY_CLexport const APPLICATION_CATEGORIES_LIST = () => `APPLICATION_CATEGORIES_LIST`;// project level keys-export const PROJECT_DETAILS = (workspaceSlug: string, projectId: string) =>+export const PROJECT_DETAILS = (_workspaceSlug: string, projectId: string) =>`PROJECT_DETAILS_${projectId.toString().toUpperCase()}`;-export const PROJECT_ME_INFORMATION = (workspaceSlug: string, projectId: string) =>+export const PROJECT_ME_INFORMATION = (_workspaceSlug: string, projectId: string) =>`PROJECT_ME_INFORMATION_${projectId.toString().toUpperCase()}`;export const PROJECT_LABELS = (projectId: string, projectRole: EUserPermissions | undefined) =>@@ -166,6 +166,8 @@ export const PROJECT_LABELS = (projectId: string, projectRole: EUserPermissionsexport const PROJECT_MEMBERS = (projectId: string, projectRole: EUserPermissions | undefined) =>`PROJECT_MEMBERS_${projectId.toString().toUpperCase()}_${projectRole}`;+export const PROJECT_MEMBER_ACTIVITY = (projectId: string) => `PROJECT_MEMBER_ACTIVITY_${projectId.toUpperCase()}`;+export const PROJECT_STATES = (projectId: string, projectRole: EUserPermissions | undefined) =>`PROJECT_STATES_${projectId.toString().toUpperCase()}_${projectRole}`;diff --git a/apps/web/core/store/member/project/base-project-member.store.ts b/apps/web/core/store/member/project/base-project-member.store.tsindex eb135868aa..3252b1948f 100644--- a/apps/web/core/store/member/project/base-project-member.store.ts+++ b/apps/web/core/store/member/project/base-project-member.store.ts@@ -81,6 +81,7 @@ export interface IBaseProjectMemberStore {role: EUserProjectRoles) => Promise<TProjectMembership>;removeMemberFromProject: (workspaceSlug: string, projectId: string, userId: string) => Promise<void>;+ mutateProjectMembersActivity: (workspaceSlug: string, projectId: string) => Promise<void>;}export abstract class BaseProjectMemberStore implements IBaseProjectMemberStore {@@ -315,13 +316,13 @@ export abstract class BaseProjectMemberStore implements IBaseProjectMemberStore});});});- update(this.projectRoot.projectMap, [projectId, "members"], (memberIds) =>+ update(this.projectRoot.projectMap, [projectId, "members"], (memberIds: string[]) =>uniq([...memberIds, ...data.members.map((m) => m.member_id)]));this.projectRoot.projectMap[projectId].members = this.projectRoot.projectMap?.[projectId]?.members?.concat(data.members.map((m) => m.member_id));-+ void this.mutateProjectMembersActivity(workspaceSlug, projectId);return response;});@@ -375,6 +376,7 @@ export abstract class BaseProjectMemberStore implements IBaseProjectMemberStorerole,});+ void this.mutateProjectMembersActivity(workspaceSlug, projectId);return response;} catch (error) {// revert back to original members in case of error@@ -429,11 +431,11 @@ export abstract class BaseProjectMemberStore implements IBaseProjectMemberStoreremoveMemberFromProject = async (workspaceSlug: string, projectId: string, userId: string) => {const memberDetails = this.getProjectMemberDetails(userId, projectId);if (!memberDetails || !memberDetails?.id) throw new Error("Member not found");- await this.projectMemberService.deleteProjectMember(workspaceSlug, projectId, memberDetails?.id).then(() => {- runInAction(() => {- this.processMemberRemoval(projectId, userId);- });+ await this.projectMemberService.deleteProjectMember(workspaceSlug, projectId, memberDetails?.id);+ runInAction(() => {+ this.processMemberRemoval(projectId, userId);});+ void this.mutateProjectMembersActivity(workspaceSlug, projectId);};/**@@ -501,4 +503,11 @@ export abstract class BaseProjectMemberStore implements IBaseProjectMemberStorethrow error;}};++ /**+ * Mutate project members activity+ * @param workspaceSlug+ * @param projectId+ */+ abstract mutateProjectMembersActivity(workspaceSlug: string, projectId: string): Promise<void>;}diff --git a/apps/web/core/store/member/workspace/workspace-member.store.ts b/apps/web/core/store/member/workspace/workspace-member.store.tsindex edf9d2a297..1d820d6628 100644--- a/apps/web/core/store/member/workspace/workspace-member.store.ts+++ b/apps/web/core/store/member/workspace/workspace-member.store.ts@@ -4,14 +4,14 @@ import { computedFn } from "mobx-utils";// typesimport type { EUserPermissions } from "@plane/constants";import type { IWorkspaceBulkInviteFormData, IWorkspaceMember, IWorkspaceMemberInvitation } from "@plane/types";-// plane-web constants+// plane-web imports+import type { RootStore } from "@/plane-web/store/root.store";// servicesimport { WorkspaceService } from "@/plane-web/services";// typesimport type { IRouterStore } from "@/store/router.store";import type { IUserStore } from "@/store/user";// store-import type { CoreRootStore } from "../../root.store";import type { IMemberRootStore } from "../index.ts";import type { IWorkspaceMemberFiltersStore } from "./workspace-member-filters.store";import { WorkspaceMemberFiltersStore } from "./workspace-member-filters.store";@@ -69,10 +69,11 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {routerStore: IRouterStore;userStore: IUserStore;memberRoot: IMemberRootStore;+ rootStore: RootStore;// servicesworkspaceService;- constructor(_memberRoot: IMemberRootStore, _rootStore: CoreRootStore) {+ constructor(_memberRoot: IMemberRootStore, _rootStore: RootStore) {makeObservable(this, {// observablesworkspaceMemberMap: observable,@@ -95,6 +96,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {this.routerStore = _rootStore.router;this.userStore = _rootStore.user;this.memberRoot = _memberRoot;+ this.rootStore = _rootStore;// servicesthis.workspaceService = new WorkspaceService();}@@ -259,6 +261,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {set(this.workspaceMemberMap, [workspaceSlug, userId, "role"], data.role);});await this.workspaceService.updateWorkspaceMember(workspaceSlug, memberDetails.id, data);+ void this.rootStore.workspaceRoot.mutateWorkspaceMembersActivity(workspaceSlug);} catch (error) {// revert back to original members in case of errorrunInAction(() => {@@ -276,11 +279,11 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {removeMemberFromWorkspace = async (workspaceSlug: string, userId: string) => {const memberDetails = this.getWorkspaceMemberDetails(userId);if (!memberDetails) throw new Error("Member not found");- await this.workspaceService.deleteWorkspaceMember(workspaceSlug, memberDetails?.id).then(() => {- runInAction(() => {- set(this.workspaceMemberMap, [workspaceSlug, userId, "is_active"], false);- });+ await this.workspaceService.deleteWorkspaceMember(workspaceSlug, memberDetails?.id);+ runInAction(() => {+ set(this.workspaceMemberMap, [workspaceSlug, userId, "is_active"], false);});+ void this.rootStore.workspaceRoot.mutateWorkspaceMembersActivity(workspaceSlug);};/**@@ -301,9 +304,9 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {* @param data*/inviteMembersToWorkspace = async (workspaceSlug: string, data: IWorkspaceBulkInviteFormData) => {- const response = await this.workspaceService.inviteWorkspace(workspaceSlug, data);+ await this.workspaceService.inviteWorkspace(workspaceSlug, data);await this.fetchWorkspaceMemberInvitations(workspaceSlug);- return response;+ void this.rootStore.workspaceRoot.mutateWorkspaceMembersActivity(workspaceSlug);};/**@@ -317,7 +320,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {invitationId: string,data: Partial<IWorkspaceMemberInvitation>) => {- const originalMemberInvitations = [...this.workspaceMemberInvitations?.[workspaceSlug]]; // in case of error, we will revert back to original members+ const originalMemberInvitations = [...(this.workspaceMemberInvitations?.[workspaceSlug] ?? [])]; // in case of error, we will revert back to original memberstry {const memberInvitations = originalMemberInvitations?.map((invitation) => ({...invitation,@@ -342,14 +345,15 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {* @param workspaceSlug* @param memberId*/- deleteMemberInvitation = async (workspaceSlug: string, invitationId: string) =>- await this.workspaceService.deleteWorkspaceInvitations(workspaceSlug.toString(), invitationId).then(() => {- runInAction(() => {- this.workspaceMemberInvitations[workspaceSlug] = this.workspaceMemberInvitations[workspaceSlug].filter(- (inv) => inv.id !== invitationId- );- });+ deleteMemberInvitation = async (workspaceSlug: string, invitationId: string) => {+ await this.workspaceService.deleteWorkspaceInvitations(workspaceSlug.toString(), invitationId);+ runInAction(() => {+ this.workspaceMemberInvitations[workspaceSlug] = this.workspaceMemberInvitations[workspaceSlug].filter(+ (inv) => inv.id !== invitationId+ );});+ void this.rootStore.workspaceRoot.mutateWorkspaceMembersActivity(workspaceSlug);+ };isUserSuspended = computedFn((userId: string, workspaceSlug: string) => {if (!workspaceSlug) return false;