Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

chore: workspace invite loader improvement (#4152)

Anmol Singh Bhatiaf805acbcef6f
diff --git a/web/layouts/auth-layout/workspace-wrapper.tsx b/web/layouts/auth-layout/workspace-wrapper.tsx
index 8787a36dc3..8b40597b2c 100644
--- a/web/layouts/auth-layout/workspace-wrapper.tsx
+++ b/web/layouts/auth-layout/workspace-wrapper.tsx
@@ -32,7 +32,7 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)
const {
workspace: { fetchWorkspaceMembers },
} = useMember();
- const { workspaces, loader } = useWorkspace();
+ const { workspaces } = useWorkspace();
const { isMobile } = usePlatformOS();
const planeLogo = resolvedTheme === "dark" ? PlaneWhiteLogo : PlaneBlackLogo;
@@ -84,7 +84,7 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)
};
// if list of workspaces are not there then we have to render the spinner
- if (allWorkspaces === undefined || loader) {
+ if (allWorkspaces === undefined) {
return (
<div className="grid h-screen place-items-center bg-custom-background-100 p-4">
<div className="flex flex-col items-center gap-3 text-center">
diff --git a/web/pages/invitations/index.tsx b/web/pages/invitations/index.tsx
index 5d22ab5875..b9b24694b7 100644
--- a/web/pages/invitations/index.tsx
+++ b/web/pages/invitations/index.tsx
@@ -15,7 +15,7 @@ import { MEMBER_ACCEPTED } from "@/constants/event-tracker";
import { ROLE } from "@/constants/workspace";
import { truncateText } from "@/helpers/string.helper";
import { getUserRole } from "@/helpers/user.helper";
-import { useEventTracker, useUser } from "@/hooks/store";
+import { useEventTracker, useUser, useWorkspace } from "@/hooks/store";
import { UserAuthWrapper } from "@/layouts/auth-layout";
import DefaultLayout from "@/layouts/default-layout";
import { NextPageWithLayout } from "@/lib/types";
@@ -43,6 +43,7 @@ const UserInvitationsPage: NextPageWithLayout = observer(() => {
// store hooks
const { captureEvent, joinWorkspaceMetricGroup } = useEventTracker();
const { currentUser, currentUserSettings } = useUser();
+ const { fetchWorkspaces } = useWorkspace();
// router
const router = useRouter();
// next-themes
@@ -96,7 +97,9 @@ const UserInvitationsPage: NextPageWithLayout = observer(() => {
.updateUser({ last_workspace_id: redirectWorkspace?.id })
.then(() => {
setIsJoiningWorkspaces(false);
- router.push(`/${redirectWorkspace?.slug}`);
+ fetchWorkspaces().then(() => {
+ router.push(`/${redirectWorkspace?.slug}`);
+ });
})
.catch(() => {
setToast({