binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[WEB-2443] fix: join project flicker (#5602)

Browse source 
* fix: join project flicker

* fix: leave project project mutation and code refactor
This commit is contained in:
Anmol Singh Bhatia 2024-09-16 14:16:23 +05:30 • committed by GitHub
parent c14d20c2e0
commit 5ba1eeaf4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
web/core/layouts/auth-layout/project-wrapper.tsx
View file

@ -105,12 +105,12 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
// derived values // derived values
const projectExists = projectId ? getProjectById(projectId.toString()) : null; const projectExists = projectId ? getProjectById(projectId.toString()) : null;
const hasPermissionToCurrentProject = projectId const hasPermissionToCurrentProject = allowPermissions(
? allowPermissions(
[EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST], [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
EUserPermissionsLevel.PROJECT EUserPermissionsLevel.PROJECT,
) workspaceSlug.toString(),
: undefined; projectId.toString()
);
// check if the project member apis is loading // check if the project member apis is loading
if (!projectMemberInfo && projectId && hasPermissionToCurrentProject === null) if (!projectMemberInfo && projectId && hasPermissionToCurrentProject === null)

4
web/core/store/user/permissions.store.ts
View file

@ -243,9 +243,10 @@ export class UserPermissionStore implements IUserPermissionStore {
joinProject = async (workspaceSlug: string, projectId: string): Promise<void | undefined> => { joinProject = async (workspaceSlug: string, projectId: string): Promise<void | undefined> => {
try { try {
const response = await userService.joinProject(workspaceSlug, [projectId]); const response = await userService.joinProject(workspaceSlug, [projectId]);
const projectMemberRole = this.workspaceInfoBySlug(workspaceSlug)?.role ?? EUserPermissions.MEMBER;
if (response) { if (response) {
runInAction(() => { runInAction(() => {
set(this.workspaceProjectsPermissions, [workspaceSlug, projectId], response); set(this.workspaceProjectsPermissions, [workspaceSlug, projectId], projectMemberRole);
}); });
} }
return response; return response;
@ -267,6 +268,7 @@ export class UserPermissionStore implements IUserPermissionStore {
runInAction(() => { runInAction(() => {
unset(this.workspaceProjectsPermissions, [workspaceSlug, projectId]); unset(this.workspaceProjectsPermissions, [workspaceSlug, projectId]);
unset(this.projectUserInfo, [workspaceSlug, projectId]); unset(this.projectUserInfo, [workspaceSlug, projectId]);
unset(this.store.projectRoot.project.projectMap, [projectId]);
}); });
} catch (error) { } catch (error) {
console.error("Error user leaving the project", error); console.error("Error user leaving the project", error);