Skip to content

fix: workspace accepted invitation redirects to the workspace #1971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sriramveeraghanta merged 4 commits into from
Aug 28, 2023
Merged

fix: workspace accepted invitation redirects to the workspace #1971

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
721beb2
fix: workspace accepted invitation redirects to the workspace
sriramveeraghanta Aug 24, 2023
b6e6fe1
chore: removing logs
sriramveeraghanta Aug 24, 2023
5bb6e4d
fix: updating user last workspace id with newly joined one
sriramveeraghanta Aug 24, 2023
d0be94f
adding error toast
sriramveeraghanta Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions apps/app/pages/invitations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import type { IWorkspaceMemberInvitation } from "types";
import { USER_WORKSPACE_INVITATIONS } from "constants/fetch-keys";
// constants
import { ROLE } from "constants/workspace";
import userService from "services/user.service";

const OnBoard: NextPage = () => {
const [invitationsRespond, setInvitationsRespond] = useState<string[]>([]);
Expand Down Expand Up @@ -78,12 +79,32 @@ const OnBoard: NextPage = () => {
workspaceService
.joinWorkspaces({ invitations: invitationsRespond })
.then(() => {
mutateInvitations();
mutate("USER_WORKSPACES");

setIsJoiningWorkspaces(false);
const firstInviteId = invitationsRespond[0];
const redirectWorkspace = invitations?.find((i) => i.id === firstInviteId)?.workspace;
userService
.updateUser({ last_workspace_id: redirectWorkspace?.id })
.then(() => {
setIsJoiningWorkspaces(false);
router.push(`/${redirectWorkspace?.slug}`);
})
.catch(() => {
setToastAlert({
type: "error",
title: "Error!",
message: "Something went wrong, Please try again.",
});
setIsJoiningWorkspaces(false);
});
})
.catch(() => setIsJoiningWorkspaces(false));
.catch(() => {
setToastAlert({
type: "error",
title: "Error!",
message: "Something went wrong, Please try again.",
});
setIsJoiningWorkspaces(false);
});
};

return (
Expand Down Expand Up @@ -167,6 +188,7 @@ const OnBoard: NextPage = () => {
size="md"
onClick={submitInvitations}
disabled={isJoiningWorkspaces || invitationsRespond.length === 0}
loading={isJoiningWorkspaces}
>
Accept & Join
</PrimaryButton>
Expand Down