From cbf07416cdcf0acdfd4d204bad8c69f12686babf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=85=E8=86=80?= Date: Fri, 23 Oct 2026 23:23:54 +0800 Subject: [PATCH] fix(console): show invite loading failures Failed invite loads must not look like no pending invites. Show the error and discard responses from a previously shown group. --- app/components/MembersPanel.vue | 25 ++++++++++++++++++++++--- app/composables/useI18n.ts | 2 ++ app/composables/useInvites.ts | 3 ++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/components/MembersPanel.vue b/app/components/MembersPanel.vue index 0349dd6..ab5b38f 100644 --- a/app/components/MembersPanel.vue +++ b/app/components/MembersPanel.vue @@ -77,6 +77,9 @@ {{ t("members.createInvite") }} +

+ {{ t("members.invitesFailed", { error: invitesError }) }} +

-

{{ t("members.noInvites") }}

+

{{ t("members.noInvites") }}

{{ formError }}
@@ -116,6 +119,8 @@ const emit = defineEmits<{ (e: "save", group: Group): void }>(); const invitesApi = useInvitesApi(); const members = ref([]); const invites = ref([]); +/** The last list load failed (the list shown, if any, is the one before). */ +const invitesError = ref(""); const newLogin = ref(""); const newRole = ref("admin"); const inviteRole = ref<"admin" | "viewer">("admin"); @@ -133,20 +138,34 @@ const inviteRoleOptions = computed(() => watch( () => props.group, - (g) => { + (g, prev) => { // A group from before member roles lists its owners in `adminIds` only: // read as owners (as the server does), so a save never drops them. members.value = g.members?.length ? g.members.map((m) => ({ ...m })) : (g.adminIds ?? []).map((login) => ({ login, role: "owner" as const })); formError.value = ""; + // Another group's invites are never shown, not even while loading. + if (g.id !== prev?.id) { + invites.value = []; + invitesError.value = ""; + } if (props.canEdit) loadInvites(); }, { immediate: true }, ); async function loadInvites(): Promise { - invites.value = await invitesApi.list(props.group.id); + const groupId = props.group.id; + try { + const list = await invitesApi.list(groupId); + if (props.group.id !== groupId) return; + invites.value = list; + invitesError.value = ""; + } catch (err) { + if (props.group.id !== groupId) return; + invitesError.value = err instanceof Error ? err.message : String(err); + } } function ownerCount(): number { diff --git a/app/composables/useI18n.ts b/app/composables/useI18n.ts index 198bf34..79e8823 100644 --- a/app/composables/useI18n.ts +++ b/app/composables/useI18n.ts @@ -107,6 +107,7 @@ const en: Dict = { "members.copied": "Copied!", "members.revoke": "Revoke", "members.noInvites": "No pending invites.", + "members.invitesFailed": "Could not load invites: {error}", "members.errSelfOwner": "You must remain an owner of this group.", "members.errOwner": "A group needs at least one owner.", "members.errLastOwner": "Cannot remove the last owner.", @@ -561,6 +562,7 @@ const zh: Dict = { "members.copied": "已复制!", "members.revoke": "撤销", "members.noInvites": "暂无待接受的邀请。", + "members.invitesFailed": "邀请列表加载失败:{error}", "members.errSelfOwner": "你必须保留本组的 owner 身份。", "members.errOwner": "分组至少需要一位 owner。", "members.errLastOwner": "不能移除最后一位 owner。", diff --git a/app/composables/useInvites.ts b/app/composables/useInvites.ts index 983c895..b2bb24c 100644 --- a/app/composables/useInvites.ts +++ b/app/composables/useInvites.ts @@ -21,6 +21,7 @@ export function useInvitesApi() { } } + /** Throws when the list cannot be read: never shown as "no invites". */ async function list(groupId: string): Promise { loading.value = true; error.value = ""; @@ -31,7 +32,7 @@ export function useInvitesApi() { return data.invites ?? []; } catch (err) { error.value = err instanceof Error ? err.message : String(err); - return []; + throw err; } finally { loading.value = false; }