Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

fix(core): handle errors on the invite page (#9167)

JimmFly8eafc057facc
diff --git a/packages/frontend/core/src/desktop/pages/expired/index.tsx b/packages/frontend/core/src/desktop/pages/expired/index.tsx
index 027cf24804..45d5ab4d76 100644
--- a/packages/frontend/core/src/desktop/pages/expired/index.tsx
+++ b/packages/frontend/core/src/desktop/pages/expired/index.tsx
@@ -23,7 +23,7 @@ export const Component = () => {
return (
<AuthPageContainer
title={t['com.affine.expired.page.title']()}
- subtitle={t['com.affine.expired.page.subtitle']()}
+ subtitle={t['com.affine.expired.page.new-subtitle']()}
>
<Button variant="primary" size="large" onClick={onOpenAffine}>
{t['com.affine.auth.open.affine']()}
diff --git a/packages/frontend/core/src/desktop/pages/invite/index.tsx b/packages/frontend/core/src/desktop/pages/invite/index.tsx
index 2f97fe26e8..3fdd1e7ffd 100644
--- a/packages/frontend/core/src/desktop/pages/invite/index.tsx
+++ b/packages/frontend/core/src/desktop/pages/invite/index.tsx
@@ -2,7 +2,9 @@ import { AcceptInvitePage } from '@affine/component/member-components';
import type { GetInviteInfoQuery } from '@affine/graphql';
import {
acceptInviteByInviteIdMutation,
+ ErrorNames,
getInviteInfoQuery,
+ UserFriendlyError,
} from '@affine/graphql';
import { useLiveData, useService } from '@toeverything/infra';
import { useCallback, useEffect, useState } from 'react';
@@ -103,9 +105,19 @@ export const Middle = () => {
inviteInfo: res.getInviteInfo,
});
return;
- })().catch(err => {
- // TODO: handle error
- console.error(err);
+ })().catch(error => {
+ const userFriendlyError = UserFriendlyError.fromAnyError(error);
+ console.error(userFriendlyError);
+ if (userFriendlyError.name === ErrorNames.ALREADY_IN_SPACE) {
+ return navigateHelper.jumpToIndex();
+ }
+ if (
+ userFriendlyError.name === ErrorNames.USER_NOT_FOUND ||
+ userFriendlyError.name === ErrorNames.SPACE_OWNER_NOT_FOUND
+ ) {
+ return navigateHelper.jumpToExpired();
+ }
+ return navigateHelper.jumpTo404();
});
}, [graphqlService, navigateHelper, params.inviteId]);
diff --git a/packages/frontend/i18n/src/resources/en.json b/packages/frontend/i18n/src/resources/en.json
index bb4578d816..83f282d2ae 100644
--- a/packages/frontend/i18n/src/resources/en.json
+++ b/packages/frontend/i18n/src/resources/en.json
@@ -487,6 +487,7 @@
"com.affine.error.retry": "Refresh",
"com.affine.error.unexpected-error.title": "Something is wrong...",
"com.affine.expired.page.subtitle": "Please request a new reset password link.",
+ "com.affine.expired.page.new-subtitle": "Please request a new link.",
"com.affine.expired.page.title": "This link has expired...",
"com.affine.export.error.message": "Please try it again later.",
"com.affine.export.error.title": "Export failed due to an unexpected error",