From c80330fdfa31f0fc7d3c147742185722fdf6a472 Mon Sep 17 00:00:00 2001
From: sriram veeraghanta <veeraghanta.sriram@gmail.com>
Date: Tue, 12 Dec 2023 12:47:40 +0530
Subject: [PATCH] fix: user membership store changes added

---
 web/store/user/user-membership.store.ts | 39 +++++++++++--------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/web/store/user/user-membership.store.ts b/web/store/user/user-membership.store.ts
index 7e964940f..e7cd475ed 100644
--- a/web/store/user/user-membership.store.ts
+++ b/web/store/user/user-membership.store.ts
@@ -1,12 +1,10 @@
 // mobx
 import { action, observable, runInAction, makeObservable, computed } from "mobx";
 // services
-import { ProjectMemberService, ProjectService } from "services/project";
+import { ProjectMemberService } from "services/project";
 import { UserService } from "services/user.service";
 import { WorkspaceService } from "services/workspace.service";
-import { AuthService } from "services/auth.service";
 // interfaces
-import { IUser, IUserSettings } from "types/users";
 import { IWorkspaceMemberMe, IProjectMember, TUserProjectRole, TUserWorkspaceRole } from "types";
 import { RootStore } from "../root.store";
 
@@ -53,14 +51,12 @@ export class UserMembershipStore implements IUserMembershipStore {
   hasPermissionToProject: {
     [projectId: string]: boolean;
   } = {};
-  // root store
-  rootStore;
+  // stores
+  router;
   // services
   userService;
   workspaceService;
-  projectService;
   projectMemberService;
-  authService;
 
   constructor(_rootStore: RootStore) {
     makeObservable(this, {
@@ -83,42 +79,41 @@ export class UserMembershipStore implements IUserMembershipStore {
       hasPermissionToCurrentWorkspace: computed,
       hasPermissionToCurrentProject: computed,
     });
-    this.rootStore = _rootStore;
+    this.router = _rootStore.app.router;
+    // services
     this.userService = new UserService();
     this.workspaceService = new WorkspaceService();
-    this.projectService = new ProjectService();
     this.projectMemberService = new ProjectMemberService();
-    this.authService = new AuthService();
   }
 
   get currentWorkspaceMemberInfo() {
-    if (!this.rootStore.workspace.workspaceSlug) return;
-    return this.workspaceMemberInfo[this.rootStore.workspace.workspaceSlug];
+    if (!this.router.query?.workspaceSlug) return;
+    return this.workspaceMemberInfo[this.router.query?.workspaceSlug];
   }
 
   get currentWorkspaceRole() {
-    if (!this.rootStore.workspace.workspaceSlug) return;
-    return this.workspaceMemberInfo[this.rootStore.workspace.workspaceSlug]?.role;
+    if (!this.router.query?.workspaceSlug) return;
+    return this.workspaceMemberInfo[this.router.query?.workspaceSlug]?.role;
   }
 
   get currentProjectMemberInfo() {
-    if (!this.rootStore.project.projectId) return;
-    return this.projectMemberInfo[this.rootStore.project.projectId];
+    if (!this.router.query?.projectId) return;
+    return this.projectMemberInfo[this.router.query?.projectId];
   }
 
   get currentProjectRole() {
-    if (!this.rootStore.project.projectId) return;
-    return this.projectMemberInfo[this.rootStore.project.projectId]?.role;
+    if (!this.router.query?.projectId) return;
+    return this.projectMemberInfo[this.router.query?.projectId]?.role;
   }
 
   get hasPermissionToCurrentWorkspace() {
-    if (!this.rootStore.workspace.workspaceSlug) return;
-    return this.hasPermissionToWorkspace[this.rootStore.workspace.workspaceSlug];
+    if (!this.router.query?.workspaceSlug) return;
+    return this.hasPermissionToWorkspace[this.router.query?.workspaceSlug];
   }
 
   get hasPermissionToCurrentProject() {
-    if (!this.rootStore.project.projectId) return;
-    return this.hasPermissionToProject[this.rootStore.project.projectId];
+    if (!this.router.query?.projectId) return;
+    return this.hasPermissionToProject[this.router.query?.projectId];
   }
 
   fetchUserWorkspaceInfo = async (workspaceSlug: string) => {