Revert: refactor project member page" #8476
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export * from "./root"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <></>; | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -4,14 +4,14 @@ import { computedFn } from "mobx-utils"; | |||||
| // types | ||||||
| import type { EUserPermissions } from "@plane/constants"; | ||||||
| import type { IWorkspaceBulkInviteFormData, IWorkspaceMember, IWorkspaceMemberInvitation } from "@plane/types"; | ||||||
| // plane-web constants | ||||||
| // services | ||||||
| import { WorkspaceService } from "@/plane-web/services"; | ||||||
| // types | ||||||
| import 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; | ||||||
| // services | ||||||
| workspaceService; | ||||||
|
|
||||||
| constructor(_memberRoot: IMemberRootStore, _rootStore: CoreRootStore) { | ||||||
| makeObservable(this, { | ||||||
| // observables | ||||||
| workspaceMemberMap: observable, | ||||||
|
|
@@ -96,7 +95,6 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore { | |||||
| this.routerStore = _rootStore.router; | ||||||
| this.userStore = _rootStore.user; | ||||||
| this.memberRoot = _memberRoot; | ||||||
| // services | ||||||
| this.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); | ||||||
| } catch (error) { | ||||||
| // revert back to original members in case of error | ||||||
| runInAction(() => { | ||||||
|
|
@@ -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).then(() => { | ||||||
| runInAction(() => { | ||||||
| set(this.workspaceMemberMap, [workspaceSlug, userId, "is_active"], false); | ||||||
| }); | ||||||
| }); | ||||||
| }; | ||||||
|
|
||||||
| /** | ||||||
|
|
@@ -304,9 +301,9 @@ export class WorkspaceMemberStore implements IWorkspaceMemberStore { | |||||
| * @param data | ||||||
| */ | ||||||
| inviteMembersToWorkspace = async (workspaceSlug: string, data: IWorkspaceBulkInviteFormData) => { | ||||||
| const response = await this.workspaceService.inviteWorkspace(workspaceSlug, data); | ||||||
| await this.fetchWorkspaceMemberInvitations(workspaceSlug); | ||||||
| return response; | ||||||
| }; | ||||||
|
Comment on lines
303
to
307
There was a problem hiding this comment. The interface declares that |
||||||
|
|
||||||
| /** | ||||||
|
|
@@ -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 | ||||||
|
There was a problem hiding this comment. The spread operator on line 320 may throw a runtime error if
Suggested change
Contributor
There was a problem hiding this comment. Unsafe optional chaining can throw TypeError. If 🔎 Proposed fix- 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 members🧰 Tools🪛 Biome (2.1.2)[error] 320-320: Unsafe usage of optional chaining. If it short-circuits with 'undefined' the evaluation will throw TypeError here: (lint/correctness/noUnsafeOptionalChaining) 🤖 Prompt for AI Agents |
||||||
| try { | ||||||
| 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).then(() => { | ||||||
| runInAction(() => { | ||||||
| this.workspaceMemberInvitations[workspaceSlug] = this.workspaceMemberInvitations[workspaceSlug].filter( | ||||||
| (inv) => inv.id !== invitationId | ||||||
| ); | ||||||
| }); | ||||||
| }); | ||||||
|
|
||||||
| isUserSuspended = computedFn((userId: string, workspaceSlug: string) => { | ||||||
| if (!workspaceSlug) return false; | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Critical: Duplicate and conflicting member updates outside
runInAction.Lines 318-320 use
update()withuniq()to deduplicate members, but lines 321-323 immediately overwrite this with a direct mutation that:runInActionblock (which ends at line 317), violating MobX patterns🔎 Proposed fix: Remove the redundant direct mutation
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) - ); return response;Alternatively, if you need both updates for some reason, wrap the second one in
runInAction: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) - ); + runInAction(() => { + set(this.projectRoot.projectMap, [projectId, "members"], + uniq([...(this.projectRoot.projectMap?.[projectId]?.members ?? []), ...data.members.map((m) => m.member_id)]) + ); + }); return response;However, the first solution (removing lines 321-323) is preferred since the
update()call already handles the mutation correctly.🤖 Prompt for AI Agents