mirror of
https://github.com/Elysola/WebHooker.git
synced 2026-11-21 01:23:40 +00:00
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.
This commit is contained in:
1 parent
2710de7446
commit
cbf07416cd
3 files changed
+26
-4
No files matched your search
@@ -77,6 +77,9 @@
|
|||||||
{{ t("members.createInvite") }}
|
{{ t("members.createInvite") }}
|
||||||
</RcButton>
|
</RcButton>
|
||||||
</div>
|
</div>
|
||||||
|
<p v-if="invitesError" class="err">
|
||||||
|
{{ t("members.invitesFailed", { error: invitesError }) }}
|
||||||
|
</p>
|
||||||
<ul v-if="invites.length" class="invite-list">
|
<ul v-if="invites.length" class="invite-list">
|
||||||
<li v-for="inv in invites" :key="inv.token" class="invite-row">
|
<li v-for="inv in invites" :key="inv.token" class="invite-row">
|
||||||
<code class="invite-token">{{ shortToken(inv.token) }}</code>
|
<code class="invite-token">{{ shortToken(inv.token) }}</code>
|
||||||
@@ -94,7 +97,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<p v-else class="empty-log">{{ t("members.noInvites") }}</p>
|
<p v-else-if="!invitesError" class="empty-log">{{ t("members.noInvites") }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="err">{{ formError }}</div>
|
<div class="err">{{ formError }}</div>
|
||||||
@@ -116,6 +119,8 @@ const emit = defineEmits<{ (e: "save", group: Group): void }>();
|
|||||||
const invitesApi = useInvitesApi();
|
const invitesApi = useInvitesApi();
|
||||||
const members = ref<GroupMember[]>([]);
|
const members = ref<GroupMember[]>([]);
|
||||||
const invites = ref<GroupInvite[]>([]);
|
const invites = ref<GroupInvite[]>([]);
|
||||||
|
/** The last list load failed (the list shown, if any, is the one before). */
|
||||||
|
const invitesError = ref("");
|
||||||
const newLogin = ref("");
|
const newLogin = ref("");
|
||||||
const newRole = ref<GroupRole>("admin");
|
const newRole = ref<GroupRole>("admin");
|
||||||
const inviteRole = ref<"admin" | "viewer">("admin");
|
const inviteRole = ref<"admin" | "viewer">("admin");
|
||||||
@@ -133,20 +138,34 @@ const inviteRoleOptions = computed(() =>
|
|||||||
|
|
||||||
watch(
|
watch(
|
||||||
() => props.group,
|
() => props.group,
|
||||||
(g) => {
|
(g, prev) => {
|
||||||
// A group from before member roles lists its owners in `adminIds` only:
|
// 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.
|
// read as owners (as the server does), so a save never drops them.
|
||||||
members.value = g.members?.length
|
members.value = g.members?.length
|
||||||
? g.members.map((m) => ({ ...m }))
|
? g.members.map((m) => ({ ...m }))
|
||||||
: (g.adminIds ?? []).map((login) => ({ login, role: "owner" as const }));
|
: (g.adminIds ?? []).map((login) => ({ login, role: "owner" as const }));
|
||||||
formError.value = "";
|
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();
|
if (props.canEdit) loadInvites();
|
||||||
},
|
},
|
||||||
{ immediate: true },
|
{ immediate: true },
|
||||||
);
|
);
|
||||||
|
|
||||||
async function loadInvites(): Promise<void> {
|
async function loadInvites(): Promise<void> {
|
||||||
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 {
|
function ownerCount(): number {
|
||||||
|
|||||||
@@ -107,6 +107,7 @@ const en: Dict = {
|
|||||||
"members.copied": "Copied!",
|
"members.copied": "Copied!",
|
||||||
"members.revoke": "Revoke",
|
"members.revoke": "Revoke",
|
||||||
"members.noInvites": "No pending invites.",
|
"members.noInvites": "No pending invites.",
|
||||||
|
"members.invitesFailed": "Could not load invites: {error}",
|
||||||
"members.errSelfOwner": "You must remain an owner of this group.",
|
"members.errSelfOwner": "You must remain an owner of this group.",
|
||||||
"members.errOwner": "A group needs at least one owner.",
|
"members.errOwner": "A group needs at least one owner.",
|
||||||
"members.errLastOwner": "Cannot remove the last owner.",
|
"members.errLastOwner": "Cannot remove the last owner.",
|
||||||
@@ -561,6 +562,7 @@ const zh: Dict = {
|
|||||||
"members.copied": "已复制!",
|
"members.copied": "已复制!",
|
||||||
"members.revoke": "撤销",
|
"members.revoke": "撤销",
|
||||||
"members.noInvites": "暂无待接受的邀请。",
|
"members.noInvites": "暂无待接受的邀请。",
|
||||||
|
"members.invitesFailed": "邀请列表加载失败:{error}",
|
||||||
"members.errSelfOwner": "你必须保留本组的 owner 身份。",
|
"members.errSelfOwner": "你必须保留本组的 owner 身份。",
|
||||||
"members.errOwner": "分组至少需要一位 owner。",
|
"members.errOwner": "分组至少需要一位 owner。",
|
||||||
"members.errLastOwner": "不能移除最后一位 owner。",
|
"members.errLastOwner": "不能移除最后一位 owner。",
|
||||||
|
|||||||
@@ -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<GroupInvite[]> {
|
async function list(groupId: string): Promise<GroupInvite[]> {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
error.value = "";
|
error.value = "";
|
||||||
@@ -31,7 +32,7 @@ export function useInvitesApi() {
|
|||||||
return data.invites ?? [];
|
return data.invites ?? [];
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
error.value = err instanceof Error ? err.message : String(err);
|
error.value = err instanceof Error ? err.message : String(err);
|
||||||
return [];
|
throw err;
|
||||||
} finally {
|
} finally {
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user