π₯π₯π₯ 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
Revert "[WEB-4959]chore: refactor project member page #8464" (#8476)
sriram veeraghanta6129e8e53bf1
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/layout.tsxindex 5ac77bcccc..783f7a0dd0 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 { SettingsRightSidebar } from "@/plane-web/components/settings/right-sidebar";+import { WorkspaceSettingsRightSidebar } from "@/plane-web/components/workspace/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>- <SettingsRightSidebar workspaceSlug={workspaceSlug} />+ <WorkspaceSettingsRightSidebar 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 f74d9ca271..d096a17fff 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@@ -40,7 +40,7 @@ const WorkspaceMembersSettingsPage = observer(function WorkspaceMembersSettingsPconst {workspace: { workspaceMemberIds, inviteMembersToWorkspace, filtersStore },} = useMember();- const { currentWorkspace } = useWorkspace();+ const { currentWorkspace, mutateWorkspaceMembersActivity } = useWorkspace();const { t } = useTranslation();// derived values@@ -53,6 +53,7 @@ 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 2128bd2f2e..8e8c09064d 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,13 +7,10 @@ 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";-export const ProjectDetailSettingsLayout = observer(function ProjectDetailSettingsLayout({- params,-}: Route.ComponentProps) {+function ProjectDetailSettingsLayout({ params }: Route.ComponentProps) {const { workspaceSlug, projectId } = params;// routerconst pathname = usePathname();@@ -27,11 +24,10 @@ export const ProjectDetailSettingsLayout = observer(function ProjectDetailSettin<div className="w-full h-full overflow-y-scroll md:pt-page-y"><Outlet /></div>- <SettingsRightSidebar workspaceSlug={workspaceSlug} projectId={projectId} /></ProjectAuthWrapper></div></>);-});+}-export default ProjectDetailSettingsLayout;+export default observer(ProjectDetailSettingsLayout);diff --git a/apps/web/ce/components/projects/members/members-activity-button.tsx b/apps/web/ce/components/projects/members/members-activity-button.tsxdeleted file mode 100644index 169d47a939..0000000000--- a/apps/web/ce/components/projects/members/members-activity-button.tsx+++ /dev/null@@ -1,10 +0,0 @@-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.tsxdeleted file mode 100644index 887da2f8e3..0000000000--- a/apps/web/ce/components/settings/right-sidebar.tsx+++ /dev/null@@ -1,10 +0,0 @@-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.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 <></>;+});diff --git a/apps/web/ce/store/member/project-member.store.ts b/apps/web/ce/store/member/project-member.store.tsindex 1be3ee1c1c..f0e5b3069d 100644--- a/apps/web/ce/store/member/project-member.store.ts+++ b/apps/web/ce/store/member/project-member.store.ts@@ -41,13 +41,4 @@ 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 acc32265f2..5dbe78d72e 100644--- a/apps/web/core/components/project/member-list.tsx+++ b/apps/web/core/components/project/member-list.tsx@@ -14,8 +14,6 @@ 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;@@ -86,7 +84,6 @@ 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)}/>@@ -96,11 +93,9 @@ 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 12b4cc821f..20ea3d7a9c 100644--- a/apps/web/core/components/workspace/settings/invitations-list-item.tsx+++ b/apps/web/core/components/workspace/settings/invitations-list-item.tsx@@ -14,6 +14,7 @@ import { ConfirmWorkspaceMemberRemove } from "@/components/workspace/confirm-wor// hooksimport { useMember } from "@/hooks/store/use-member";import { useUserPermissions } from "@/hooks/store/user";+import { useWorkspace } from "@/hooks/store/use-workspace";type Props = {invitationId: string;@@ -29,6 +30,7 @@ export const WorkspaceInvitationsListItem = observer(function WorkspaceInvitatioconst { t } = useTranslation();// store hooksconst { allowPermissions, workspaceInfoBySlug } = useUserPermissions();+ const { mutateWorkspaceMembersActivity } = useWorkspace();const {workspace: { updateMemberInvitation, deleteMemberInvitation, getWorkspaceInvitationDetails },} = useMember();@@ -57,6 +59,7 @@ 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 53bc115e9f..b98438b1d4 100644--- a/apps/web/core/components/workspace/settings/member-columns.tsx+++ b/apps/web/core/components/workspace/settings/member-columns.tsx@@ -16,6 +16,7 @@ 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 {@@ -120,6 +121,7 @@ export const AccountTypeColumn = observer(function AccountTypeColumn(props: Accoconst {workspace: { updateMember },} = useMember();+ const { mutateWorkspaceMembersActivity } = useWorkspace();const { data: currentUser } = useUser();// derived values@@ -154,6 +156,7 @@ 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 9499110ee5..4f0b20dc5d 100644--- a/apps/web/core/components/workspace/settings/members-list-item.tsx+++ b/apps/web/core/components/workspace/settings/members-list-item.tsx@@ -32,7 +32,7 @@ export const WorkspaceMembersListItem = observer(function WorkspaceMembersListItworkspace: { removeMemberFromWorkspace },} = useMember();const { leaveWorkspace } = useUserPermissions();- const { getWorkspaceRedirectionUrl } = useWorkspace();+ const { getWorkspaceRedirectionUrl, mutateWorkspaceMembersActivity } = useWorkspace();const { fetchCurrentUserSettings } = useUserSettings();const { t } = useTranslation();// derived values@@ -59,6 +59,7 @@ 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 5c6623f162..b7d669506e 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,8 +166,6 @@ 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 3252b1948f..eb135868aa 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,7 +81,6 @@ 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 {@@ -316,13 +315,13 @@ export abstract class BaseProjectMemberStore implements IBaseProjectMemberStore});});});- update(this.projectRoot.projectMap, [projectId, "members"], (memberIds: string[]) =>+ update(this.projectRoot.projectMap, [projectId, "members"], (memberIds) =>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;});@@ -376,7 +375,6 @@ export abstract class BaseProjectMemberStore implements IBaseProjectMemberStorerole,});- void this.mutateProjectMembersActivity(workspaceSlug, projectId);return response;} catch (error) {// revert back to original members in case of error@@ -431,11 +429,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);- runInAction(() => {- this.processMemberRemoval(projectId, userId);+ await this.projectMemberService.deleteProjectMember(workspaceSlug, projectId, memberDetails?.id).then(() => {+ runInAction(() => {+ this.processMemberRemoval(projectId, userId);+ });});- void this.mutateProjectMembersActivity(workspaceSlug, projectId);};/**@@ -503,11 +501,4 @@ 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 1d820d6628..edf9d2a297 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 imports-import type { RootStore } from "@/plane-web/store/root.store";+// plane-web constants// 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,11 +69,10 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {routerStore: IRouterStore;userStore: IUserStore;memberRoot: IMemberRootStore;- rootStore: RootStore;// servicesworkspaceService;- constructor(_memberRoot: IMemberRootStore, _rootStore: RootStore) {+ constructor(_memberRoot: IMemberRootStore, _rootStore: CoreRootStore) {makeObservable(this, {// observablesworkspaceMemberMap: observable,@@ -96,7 +95,6 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {this.routerStore = _rootStore.router;this.userStore = _rootStore.user;this.memberRoot = _memberRoot;- this.rootStore = _rootStore;// servicesthis.workspaceService = new WorkspaceService();}@@ -261,7 +259,6 @@ 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(() => {@@ -279,11 +276,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);- runInAction(() => {- set(this.workspaceMemberMap, [workspaceSlug, userId, "is_active"], false);+ await this.workspaceService.deleteWorkspaceMember(workspaceSlug, memberDetails?.id).then(() => {+ runInAction(() => {+ set(this.workspaceMemberMap, [workspaceSlug, userId, "is_active"], false);+ });});- void this.rootStore.workspaceRoot.mutateWorkspaceMembersActivity(workspaceSlug);};/**@@ -304,9 +301,9 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {* @param data*/inviteMembersToWorkspace = async (workspaceSlug: string, data: IWorkspaceBulkInviteFormData) => {- await this.workspaceService.inviteWorkspace(workspaceSlug, data);+ const response = await this.workspaceService.inviteWorkspace(workspaceSlug, data);await this.fetchWorkspaceMemberInvitations(workspaceSlug);- void this.rootStore.workspaceRoot.mutateWorkspaceMembersActivity(workspaceSlug);+ return response;};/**@@ -320,7 +317,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,@@ -345,15 +342,14 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {* @param workspaceSlug* @param memberId*/- 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- );+ 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+ );+ });});- void this.rootStore.workspaceRoot.mutateWorkspaceMembersActivity(workspaceSlug);- };isUserSuspended = computedFn((userId: string, workspaceSlug: string) => {if (!workspaceSlug) return false;