Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-12 20:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): show SentRequestPage when invitation status is NeedMoreSeat (#11207)

Browse Source
This commit is contained in:
JimmFly
2025-03-27 03:00:14 +00:00
parent 2e5ce44e1b
commit 4fddf0d000
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/frontend/component/src/components/member-components/join-failed-page.tsx
View File

@@ -10,7 +10,7 @@ export const JoinFailedPage = ({
inviteInfo,
error,
}: {
inviteInfo: GetInviteInfoQuery['getInviteInfo'];
inviteInfo?: GetInviteInfoQuery['getInviteInfo'];
error?: any;
}) => {
const userFriendlyError = UserFriendlyError.fromAny(error);
@@ -27,8 +27,8 @@ export const JoinFailedPage = ({
1: (
<div className={styles.avatarWrapper}>
<Avatar
url={`data:image/png;base64,${inviteInfo.workspace.avatar}`}
name={inviteInfo.workspace.name}
url={`data:image/png;base64,${inviteInfo?.workspace.avatar}`}
name={inviteInfo?.workspace.name}
size={20}
colorfulFallback
/>
@@ -37,7 +37,7 @@ export const JoinFailedPage = ({
2: <span className={styles.inviteName} />,
}}
values={{
workspaceName: inviteInfo.workspace.name,
workspaceName: inviteInfo?.workspace.name,
}}
/>
<div>{t['com.affine.fail-to-join-workspace.description-2']()}</div>

14
packages/frontend/component/src/components/member-components/request-to-join-page.tsx
View File

@@ -16,7 +16,7 @@ export const RequestToJoinPage = ({
onSignOut,
}: {
user: User | null;
inviteInfo: GetInviteInfoQuery['getInviteInfo'];
inviteInfo?: GetInviteInfoQuery['getInviteInfo'];
requestToJoin: () => void;
onSignOut: () => void;
}) => {
@@ -28,23 +28,23 @@ export const RequestToJoinPage = ({
<div className={styles.content}>
<div className={styles.userWrapper}>
<Avatar
url={inviteInfo.user.avatarUrl || ''}
name={inviteInfo.user.name}
url={inviteInfo?.user.avatarUrl || ''}
name={inviteInfo?.user.name}
size={20}
/>
<span className={styles.inviteName}>{inviteInfo.user.name}</span>
<span className={styles.inviteName}>{inviteInfo?.user.name}</span>
</div>
<div>{t['invited you to join']()}</div>
<div className={styles.userWrapper}>
<Avatar
url={`data:image/png;base64,${inviteInfo.workspace.avatar}`}
name={inviteInfo.workspace.name}
url={`data:image/png;base64,${inviteInfo?.workspace.avatar}`}
name={inviteInfo?.workspace.name}
size={20}
style={{ marginLeft: 4 }}
colorfulFallback
/>
<span className={styles.inviteName}>
{inviteInfo.workspace.name}
{inviteInfo?.workspace.name}
</span>
</div>
</div>

21
packages/frontend/core/src/desktop/pages/invite/index.tsx
View File

@@ -2,7 +2,6 @@ import { notify } from '@affine/component';
import {
AcceptInvitePage,
ExpiredPage,
FailedToSendPage,
JoinFailedPage,
RequestToJoinPage,
SentRequestPage,
@@ -35,6 +34,7 @@ const AcceptInvite = ({ inviteId: targetInviteId }: { inviteId: string }) => {
const workspaces = useLiveData(workspacesService.list.workspaces$);
const navigateHelper = useNavigateHelper();
const [accepted, setAccepted] = useState(false);
const [requestToJoinLoading, setRequestToJoinLoading] = useState(false);
const [acceptError, setAcceptError] = useState<UserFriendlyError | null>(
null
);
@@ -63,6 +63,7 @@ const AcceptInvite = ({ inviteId: targetInviteId }: { inviteId: string }) => {
}, [accepted, inviteInfo?.workspace.id, openWorkspace, workspaces]);
const requestToJoin = useAsyncCallback(async () => {
setRequestToJoinLoading(true);
await invitationService
.acceptInvite(targetInviteId)
.then(() => {
@@ -77,17 +78,18 @@ const AcceptInvite = ({ inviteId: targetInviteId }: { inviteId: string }) => {
setAcceptError(err);
notify.error(err);
});
setRequestToJoinLoading(false);
}, [invitationService, openWorkspace, targetInviteId]);
const onSignOut = useAsyncCallback(async () => {
await authService.signOut();
}, [authService]);
if (loading || inviteId !== targetInviteId) {
if ((loading && !requestToJoinLoading) || inviteId !== targetInviteId) {
return null;
}
if (!inviteInfo) {
if (!inviteInfo && !loading) {
return <ExpiredPage onOpenAffine={onOpenAffine} />;
}
@@ -98,7 +100,7 @@ const AcceptInvite = ({ inviteId: targetInviteId }: { inviteId: string }) => {
}
// for email invite
if (accepted && inviteInfo.status === WorkspaceMemberStatus.Accepted) {
if (accepted && inviteInfo?.status === WorkspaceMemberStatus.Accepted) {
return (
<AcceptInvitePage
onOpenWorkspace={openWorkspace}
@@ -107,15 +109,12 @@ const AcceptInvite = ({ inviteId: targetInviteId }: { inviteId: string }) => {
);
}
if (inviteInfo.status === WorkspaceMemberStatus.UnderReview) {
return <SentRequestPage user={user} inviteInfo={inviteInfo} />;
}
if (
inviteInfo.status === WorkspaceMemberStatus.NeedMoreSeatAndReview ||
inviteInfo.status === WorkspaceMemberStatus.NeedMoreSeat
inviteInfo?.status === WorkspaceMemberStatus.UnderReview ||
inviteInfo?.status === WorkspaceMemberStatus.NeedMoreSeatAndReview ||
inviteInfo?.status === WorkspaceMemberStatus.NeedMoreSeat
) {
return <FailedToSendPage user={user} inviteInfo={inviteInfo} />;
return <SentRequestPage user={user} inviteInfo={inviteInfo} />;
}
return (