fix: workspace members store added and implemented across the app (#2732)

* fix: minor changes

* fix: workspace members store added and implemnted across the app

web/pages/[workspaceSlug]/analytics.tsx

@@ -28,38 +28,36 @@ const AnalyticsPage: NextPageWithLayout = observer(() => {
   const router = useRouter();
   const { workspaceSlug } = router.query;
   // store
-  const { project: projectStore, user: userStore, commandPalette: commandPaletteStore } = useMobxStore();
-
-  const user = userStore.currentUser;
-  const projects = workspaceSlug ? projectStore.projects[workspaceSlug?.toString()] : null;
+  const {
+    project: { workspaceProjects },
+    user: { currentUser },
+    commandPalette: { toggleCreateProjectModal },
+  } = useMobxStore();
 
   const trackAnalyticsEvent = (tab: string) => {
-    if (!user) return;
-
+    if (!currentUser) return;
     const eventPayload = {
       workspaceSlug: workspaceSlug?.toString(),
     };
-
     const eventType =
       tab === "scope_and_demand" ? "WORKSPACE_SCOPE_AND_DEMAND_ANALYTICS" : "WORKSPACE_CUSTOM_ANALYTICS";
-
-    trackEventService.trackAnalyticsEvent(eventPayload, eventType, user);
+    trackEventService.trackAnalyticsEvent(eventPayload, eventType, currentUser);
   };
 
   useEffect(() => {
     if (!workspaceSlug) return;
 
-    if (user && workspaceSlug)
+    if (currentUser && workspaceSlug)
       trackEventService.trackAnalyticsEvent(
         { workspaceSlug: workspaceSlug?.toString() },
         "WORKSPACE_SCOPE_AND_DEMAND_ANALYTICS",
-        user
+        currentUser
       );
-  }, [user, workspaceSlug]);
+  }, [currentUser, workspaceSlug]);
 
   return (
     <>
-      {projects && projects.length > 0 ? (
+      {workspaceProjects && workspaceProjects.length > 0 ? (
         <div className="h-full flex flex-col overflow-hidden bg-custom-background-100">
           <Tab.Group as={Fragment}>
             <Tab.List as="div" className="space-x-2 border-b border-custom-border-200 px-5 py-3">
@@ -96,7 +94,7 @@ const AnalyticsPage: NextPageWithLayout = observer(() => {
             primaryButton={{
               icon: <Plus className="h-4 w-4" />,
               text: "New Project",
-              onClick: () => commandPaletteStore.toggleCreateProjectModal(true),
+              onClick: () => toggleCreateProjectModal(true),
             }}
           />
         </>

web/pages/[workspaceSlug]/me/profile/preferences.tsx

@@ -18,11 +18,13 @@ import { I_THEME_OPTION, THEME_OPTIONS } from "constants/themes";
 import { NextPageWithLayout } from "types/app";
 
 const ProfilePreferencesPage: NextPageWithLayout = observer(() => {
-  const { user: userStore } = useMobxStore();
+  const {
+    user: { currentUser, updateCurrentUserTheme },
+  } = useMobxStore();
   // states
   const [currentTheme, setCurrentTheme] = useState<I_THEME_OPTION | null>(null);
   // computed
-  const userTheme = userStore.currentUser?.theme;
+  const userTheme = currentUser?.theme;
   // hooks
   const { setTheme } = useTheme();
   const { setToastAlert } = useToast();
@@ -38,7 +40,7 @@ const ProfilePreferencesPage: NextPageWithLayout = observer(() => {
 
   const handleThemeChange = (themeOption: I_THEME_OPTION) => {
     setTheme(themeOption.value);
-    userStore.updateCurrentUserTheme(themeOption.value).catch(() => {
+    updateCurrentUserTheme(themeOption.value).catch(() => {
       setToastAlert({
         title: "Failed to Update the theme",
         type: "error",
@@ -48,7 +50,7 @@ const ProfilePreferencesPage: NextPageWithLayout = observer(() => {
 
   return (
     <>
-      {userStore.currentUser ? (
+      {currentUser ? (
         <div className="pr-9 py-8 w-full overflow-y-auto">
           <div className="flex items-center py-3.5 border-b border-custom-border-100">
             <h3 className="text-xl font-medium">Preferences</h3>

web/pages/[workspaceSlug]/settings/members.tsx

@@ -1,7 +1,9 @@
 import { useState, ReactElement } from "react";
 import { useRouter } from "next/router";
+import { observer } from "mobx-react-lite";
 // hooks
-import useUser from "hooks/use-user";
+import useToast from "hooks/use-toast";
+import { useMobxStore } from "lib/mobx/store-provider";
 // layouts
 import { AppLayout } from "layouts/app-layout";
 import { WorkspaceSettingLayout } from "layouts/settings-layout";
@@ -14,15 +16,41 @@ import { Button } from "@plane/ui";
 import { Search } from "lucide-react";
 // types
 import { NextPageWithLayout } from "types/app";
+import { IWorkspaceBulkInviteFormData } from "types";
 
-const WorkspaceMembersSettingsPage: NextPageWithLayout = () => {
+const WorkspaceMembersSettingsPage: NextPageWithLayout = observer(() => {
   const router = useRouter();
   const { workspaceSlug } = router.query;
+  // store
+  const {
+    workspaceMember: { inviteMembersToWorkspace },
+  } = useMobxStore();
   // states
   const [inviteModal, setInviteModal] = useState(false);
   const [searchQuery, setSearchQuery] = useState<string>("");
   // hooks
-  const { user } = useUser();
+  const { setToastAlert } = useToast();
+
+  const handleWorkspaceInvite = (data: IWorkspaceBulkInviteFormData) => {
+    if (!workspaceSlug) return;
+
+    return inviteMembersToWorkspace(workspaceSlug.toString(), data)
+      .then(async () => {
+        setInviteModal(false);
+        setToastAlert({
+          type: "success",
+          title: "Success!",
+          message: "Invitations sent successfully.",
+        });
+      })
+      .catch((err) =>
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: `${err.error ?? "Something went wrong. Please try again."}`,
+        })
+      );
+  };
 
   return (
     <>
@@ -30,8 +58,7 @@ const WorkspaceMembersSettingsPage: NextPageWithLayout = () => {
         <SendWorkspaceInvitationModal
           isOpen={inviteModal}
           onClose={() => setInviteModal(false)}
-          workspaceSlug={workspaceSlug.toString()}
-          user={user}
+          onSubmit={handleWorkspaceInvite}
         />
       )}
       <section className="pr-9 py-8 w-full overflow-y-auto">
@@ -55,7 +82,7 @@ const WorkspaceMembersSettingsPage: NextPageWithLayout = () => {
       </section>
     </>
   );
-};
+});
 
 WorkspaceMembersSettingsPage.getLayout = function getLayout(page: ReactElement) {
   return (

web/pages/create-workspace.tsx

@@ -18,23 +18,23 @@ import { IWorkspace } from "types";
 import { NextPageWithLayout } from "types/app";
 
 const CreateWorkspacePage: NextPageWithLayout = observer(() => {
+  // router
+  const router = useRouter();
+  // store
+  const {
+    user: { currentUser, updateCurrentUser },
+  } = useMobxStore();
+  // states
   const [defaultValues, setDefaultValues] = useState({
     name: "",
     slug: "",
     organization_size: "",
   });
-
-  const router = useRouter();
-
-  const { user: userStore } = useMobxStore();
-  const user = userStore.currentUser;
-
+  // hooks
   const { theme } = useTheme();
 
   const onSubmit = async (workspace: IWorkspace) => {
-    await userStore
-      .updateCurrentUser({ last_workspace_id: workspace.id })
-      .then(() => router.push(`/${workspace.slug}`));
+    await updateCurrentUser({ last_workspace_id: workspace.id }).then(() => router.push(`/${workspace.slug}`));
   };
 
   return (
@@ -54,7 +54,7 @@ const CreateWorkspacePage: NextPageWithLayout = observer(() => {
           </div>
         </button>
         <div className="absolute sm:fixed text-custom-text-100 text-sm right-4 top-1/4 sm:top-12 -translate-y-1/2 sm:translate-y-0 sm:right-16 sm:py-5">
-          {user?.email}
+          {currentUser?.email}
         </div>
       </div>
       <div className="relative flex justify-center sm:justify-start sm:items-center h-full px-8 pb-8 sm:p-0 sm:pr-[8.33%] sm:w-10/12 md:w-9/12 lg:w-4/5">

web/pages/onboarding/index.tsx

@@ -30,9 +30,12 @@ const workspaceService = new WorkspaceService();
 const OnboardingPage: NextPageWithLayout = observer(() => {
   const [step, setStep] = useState<number | null>(null);
 
-  const { user: userStore, workspace: workspaceStore } = useMobxStore();
+  const {
+    user: { currentUser, updateCurrentUser, updateUserOnBoard },
+    workspace: workspaceStore,
+  } = useMobxStore();
 
-  const user = userStore.currentUser ?? undefined;
+  const user = currentUser ?? undefined;
   const workspaces = workspaceStore.workspaces;
   const userWorkspaces = workspaceStore.workspacesCreateByCurrentUser;
 
@@ -48,7 +51,7 @@ const OnboardingPage: NextPageWithLayout = observer(() => {
   const updateLastWorkspace = async () => {
     if (!workspaces) return;
 
-    await userStore.updateCurrentUser({
+    await updateCurrentUser({
       last_workspace_id: workspaces[0]?.id,
     });
   };
@@ -64,14 +67,14 @@ const OnboardingPage: NextPageWithLayout = observer(() => {
       },
     };
 
-    await userStore.updateCurrentUser(payload);
+    await updateCurrentUser(payload);
   };
 
   // complete onboarding
   const finishOnboarding = async () => {
     if (!user) return;
 
-    await userStore.updateUserOnBoard();
+    await updateUserOnBoard();
   };
 
   useEffect(() => {