fix: project wrapper (#2589)

* fix: project wrapper

* fix: project wrapper for unjoined project

* chore: update store structure

web/components/auth-screens/project/join-project.tsx

@@ -1,23 +1,20 @@
 import { useState } from "react";
 import Image from "next/image";
 import { useRouter } from "next/router";
-import { mutate } from "swr";
+// mobx store
-// services
+import { useMobxStore } from "lib/mobx/store-provider";
-import { ProjectService } from "services/project";
 // ui
 import { Button } from "@plane/ui";
 // icons
 import { ClipboardList } from "lucide-react";
 // images
 import JoinProjectImg from "public/auth/project-not-authorized.svg";
-// fetch-keys
-import { USER_PROJECT_VIEW } from "constants/fetch-keys";
-
-const projectService = new ProjectService();
 
 export const JoinProject: React.FC = () => {
   const [isJoiningProject, setIsJoiningProject] = useState(false);
 
+  const { project: projectStore } = useMobxStore();
+
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
 
@@ -25,14 +22,8 @@ export const JoinProject: React.FC = () => {
     if (!workspaceSlug || !projectId) return;
 
     setIsJoiningProject(true);
-    projectService
+
-      .joinProject(workspaceSlug as string, [projectId as string])
+    projectStore.joinProject(workspaceSlug.toString(), [projectId.toString()]).finally(() => {
-      .then(async () => {
-        await mutate(USER_PROJECT_VIEW(projectId.toString()));
-        setIsJoiningProject(false);
-      })
-      .catch((err) => {
-        console.error(err);
       setIsJoiningProject(false);
     });
   };

web/components/project/card.tsx

@@ -1,6 +1,5 @@
 import React, { useState } from "react";
 import { useRouter } from "next/router";
-import Link from "next/link";
 import { observer } from "mobx-react-lite";
 import { useMobxStore } from "lib/mobx/store-provider";
 import { RootStore } from "store/root";
@@ -95,9 +94,13 @@ export const ProjectCard: React.FC<ProjectCardProps> = observer((props) => {
       )}
 
       {/* Card Information */}
-      <div className="flex flex-col rounded bg-custom-background-100 border border-custom-border-200">
+      <div
-        <Link href={`/${workspaceSlug as string}/projects/${project.id}/issues`}>
+        onClick={() => {
-          <a>
+          if (project.is_member) router.push(`/${workspaceSlug?.toString()}/projects/${project.id}/issues`);
+          else setJoinProjectModal(true);
+        }}
+        className="flex flex-col rounded bg-custom-background-100 border border-custom-border-200 cursor-pointer"
+      >
         <div className="relative h-[118px] w-full rounded-t ">
           <div className="absolute z-[1] inset-0 bg-gradient-to-t from-black/60 to-transparent" />
 
@@ -182,9 +185,7 @@ export const ProjectCard: React.FC<ProjectCardProps> = observer((props) => {
 
                       if (!member) return null;
 
-                          return (
+                      return <Avatar key={member.id} name={member.member__display_name} src={member.member__avatar} />;
-                            <Avatar key={member.id} name={member.member__display_name} src={member.member__avatar} />
-                          );
                     })}
                   </AvatarGroup>
                 </div>
@@ -223,8 +224,6 @@ export const ProjectCard: React.FC<ProjectCardProps> = observer((props) => {
             ) : null}
           </div>
         </div>
-          </a>
-        </Link>
       </div>
     </>
   );

web/layouts/auth-layout/project-wrapper.tsx

@@ -104,8 +104,11 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
     }
   );
 
+  const projectsList = workspaceSlug ? projectStore.projects[workspaceSlug.toString()] : null;
+  const projectExists = projectId ? projectsList?.find((project) => project.id === projectId.toString()) : null;
+
   // check if the project member apis is loading
-  if (!userStore.projectMemberInfo && userStore.hasPermissionToProject === null) {
+  if (!userStore.projectMemberInfo && projectId && userStore.hasPermissionToProject[projectId.toString()] === null)
     return (
       <div className="grid h-screen place-items-center p-4 bg-custom-background-100">
         <div className="flex flex-col items-center gap-3 text-center">
@@ -113,15 +116,14 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
         </div>
       </div>
     );
-  }
 
   // check if the user don't have permission to access the project
-  if (userStore.hasPermissionToProject === false && !userStore.projectNotFound) {
+  if (projectExists && projectId && userStore.hasPermissionToProject[projectId.toString()] === false)
-    <JoinProject />;
+    return <JoinProject />;
-  }
 
   // check if the project info is not found.
-  if (userStore.hasPermissionToProject === false && userStore.projectNotFound) {
+  if (!projectExists && projectId && userStore.hasPermissionToProject[projectId.toString()] === false)
+    return (
       <div className="container grid h-screen place-items-center bg-custom-background-100">
         <EmptyState
           title="No such project exists"
@@ -137,8 +139,8 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
             },
           }}
         />
-    </div>;
+      </div>
-  }
+    );
 
   return <>{children}</>;
 });

web/layouts/auth-layout/workspace-wrapper.tsx

@@ -43,7 +43,11 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)
   );
 
   // while data is being loaded
-  if (!userStore.workspaceMemberInfo && userStore.hasPermissionToWorkspace === null) {
+  if (
+    !userStore.workspaceMemberInfo &&
+    workspaceSlug &&
+    userStore.hasPermissionToWorkspace[workspaceSlug.toString()] === null
+  ) {
     return (
       <div className="grid h-screen place-items-center p-4 bg-custom-background-100">
         <div className="flex flex-col items-center gap-3 text-center">
@@ -53,7 +57,11 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)
     );
   }
   // while user does not have access to view that workspace
-  if (userStore.hasPermissionToWorkspace !== null && userStore.hasPermissionToWorkspace === false) {
+  if (
+    userStore.hasPermissionToWorkspace !== null &&
+    workspaceSlug &&
+    userStore.hasPermissionToWorkspace[workspaceSlug.toString()] === false
+  ) {
     return (
       <div className={`h-screen w-full overflow-hidden bg-custom-background-100`}>
         <div className="grid h-full place-items-center p-4">

web/store/project/project.store.ts

@@ -522,6 +522,11 @@ export class ProjectStore implements IProjectStore {
   };
 
   joinProject = async (workspaceSlug: string, projectIds: string[]) => {
+    const newPermissions: { [projectId: string]: boolean } = {};
+    projectIds.forEach((projectId) => {
+      newPermissions[projectId] = true;
+    });
+
     try {
       this.loader = true;
       this.error = null;
@@ -530,6 +535,10 @@ export class ProjectStore implements IProjectStore {
       await this.fetchProjects(workspaceSlug);
 
       runInAction(() => {
+        this.rootStore.user.hasPermissionToProject = {
+          ...this.rootStore.user.hasPermissionToProject,
+          ...newPermissions,
+        };
         this.loader = false;
         this.error = null;
       });

web/store/user.store.ts

@@ -18,11 +18,14 @@ export interface IUserStore {
   dashboardInfo: any;
 
   workspaceMemberInfo: IWorkspaceMemberMe | null;
-  hasPermissionToWorkspace: boolean | null;
+  hasPermissionToWorkspace: {
+    [workspaceSlug: string]: boolean | null;
+  };
 
   projectMemberInfo: IProjectMember | null;
-  projectNotFound: boolean;
+  hasPermissionToProject: {
-  hasPermissionToProject: boolean | null;
+    [projectId: string]: boolean | null;
+  };
 
   fetchCurrentUser: () => Promise<IUser>;
   fetchCurrentUserSettings: () => Promise<IUserSettings>;
@@ -46,11 +49,14 @@ class UserStore implements IUserStore {
   dashboardInfo: any = null;
 
   workspaceMemberInfo: IWorkspaceMemberMe | null = null;
-  hasPermissionToWorkspace: boolean | null = null;
+  hasPermissionToWorkspace: {
+    [workspaceSlug: string]: boolean | null;
+  } = {};
 
   projectMemberInfo: IProjectMember | null = null;
-  projectNotFound: boolean = false;
+  hasPermissionToProject: {
-  hasPermissionToProject: boolean | null = null;
+    [projectId: string]: boolean | null;
+  } = {};
   // root store
   rootStore;
   // services
@@ -68,7 +74,6 @@ class UserStore implements IUserStore {
       workspaceMemberInfo: observable.ref,
       hasPermissionToWorkspace: observable.ref,
       projectMemberInfo: observable.ref,
-      projectNotFound: observable.ref,
       hasPermissionToProject: observable.ref,
       // action
       fetchCurrentUser: action,
@@ -128,14 +133,21 @@ class UserStore implements IUserStore {
   fetchUserWorkspaceInfo = async (workspaceSlug: string) => {
     try {
       const response = await this.workspaceService.workspaceMemberMe(workspaceSlug.toString());
+
       runInAction(() => {
         this.workspaceMemberInfo = response;
-        this.hasPermissionToWorkspace = true;
+        this.hasPermissionToWorkspace = {
+          ...this.hasPermissionToWorkspace,
+          [workspaceSlug]: true,
+        };
       });
       return response;
     } catch (error) {
       runInAction(() => {
-        this.hasPermissionToWorkspace = false;
+        this.hasPermissionToWorkspace = {
+          ...this.hasPermissionToWorkspace,
+          [workspaceSlug]: false,
+        };
       });
       throw error;
     }
@@ -147,18 +159,20 @@ class UserStore implements IUserStore {
 
       runInAction(() => {
         this.projectMemberInfo = response;
-        this.hasPermissionToWorkspace = true;
+        this.hasPermissionToProject = {
+          ...this.hasPermissionToProject,
+          [projectId]: true,
+        };
       });
       return response;
     } catch (error: any) {
       runInAction(() => {
-        this.hasPermissionToWorkspace = false;
+        this.hasPermissionToProject = {
+          ...this.hasPermissionToProject,
+          [projectId]: false,
+        };
       });
-      if (error?.status === 404) {
+
-        runInAction(() => {
-          this.projectNotFound = true;
-        });
-      }
       throw error;
     }
   };