π₯π₯π₯ 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-4311] fix: membership data handling and state reversal on error (#7205)
Prateek Shouryacf595de7c74b
diff --git a/web/core/store/member/base-project-member.store.ts b/web/core/store/member/base-project-member.store.tsindex 40047b065c..ceba44c9e5 100644--- a/web/core/store/member/base-project-member.store.ts+++ b/web/core/store/member/base-project-member.store.ts@@ -273,7 +273,7 @@ export abstract class BaseProjectMemberStore implements IBaseProjectMemberStoreif (!memberDetails || !memberDetails?.id) throw new Error("Member not found");// original data to revert back in case of errorconst isCurrentUser = this.rootStore.user.data?.id === userId;- const membershipBeforeUpdate = this.getProjectMembershipByUserId(userId, projectId);+ const membershipBeforeUpdate = { ...this.getProjectMembershipByUserId(userId, projectId) };const permissionBeforeUpdate = isCurrentUser? this.rootStore.user.permission.getProjectRoleByWorkspaceSlugAndProjectId(workspaceSlug, projectId): undefined;diff --git a/web/core/store/member/workspace-member.store.ts b/web/core/store/member/workspace-member.store.tsindex e45c2d5c2c..a4a5b1f1ce 100644--- a/web/core/store/member/workspace-member.store.ts+++ b/web/core/store/member/workspace-member.store.ts@@ -30,6 +30,7 @@ export interface IWorkspaceMemberStore {workspaceMemberInvitationIds: string[] | null;memberMap: Record<string, IWorkspaceMembership> | null;// computed actions+ getWorkspaceMemberIds: (workspaceSlug: string) => string[];getSearchedWorkspaceMemberIds: (searchQuery: string) => string[] | null;getSearchedWorkspaceInvitationIds: (searchQuery: string) => string[] | null;getWorkspaceMemberDetails: (workspaceMemberId: string) => IWorkspaceMember | null;@@ -95,14 +96,8 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {get workspaceMemberIds() {const workspaceSlug = this.routerStore.workspaceSlug;if (!workspaceSlug) return null;- let members = Object.values(this.workspaceMemberMap?.[workspaceSlug] ?? {});- members = sortBy(members, [- (m) => m.member !== this.userStore?.data?.id,- (m) => this.memberRoot?.memberMap?.[m.member]?.display_name?.toLowerCase(),- ]);- //filter out bots- const memberIds = members.filter((m) => !this.memberRoot?.memberMap?.[m.member]?.is_bot).map((m) => m.member);- return memberIds;++ return this.getWorkspaceMemberIds(workspaceSlug);}get memberMap() {@@ -117,6 +112,17 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {return this.workspaceMemberInvitations?.[workspaceSlug]?.map((inv) => inv.id);}+ getWorkspaceMemberIds = computedFn((workspaceSlug: string) => {+ let members = Object.values(this.workspaceMemberMap?.[workspaceSlug] ?? {});+ members = sortBy(members, [+ (m) => m.member !== this.userStore?.data?.id,+ (m) => this.memberRoot?.memberMap?.[m.member]?.display_name?.toLowerCase(),+ ]);+ //filter out bots+ const memberIds = members.filter((m) => !this.memberRoot?.memberMap?.[m.member]?.is_bot).map((m) => m.member);+ return memberIds;+ });+/*** @description get the list of all the user ids that match the search query of all the members of the current workspace* @param searchQuery@@ -217,7 +223,7 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore {const memberDetails = this.getWorkspaceMemberDetails(userId);if (!memberDetails) throw new Error("Member not found");// original data to revert back in case of error- const originalProjectMemberData = this.workspaceMemberMap?.[workspaceSlug]?.[userId];+ const originalProjectMemberData = { ...this.workspaceMemberMap?.[workspaceSlug]?.[userId] };try {runInAction(() => {set(this.workspaceMemberMap, [workspaceSlug, userId, "role"], data.role);