From 97bcca21c6ea429663082f3702b11dbd36398475 Mon Sep 17 00:00:00 2001 From: ttommybot Date: Thu, 23 Jul 2026 11:49:02 +0800 Subject: [PATCH] fix: refresh pending join request counts after review --- .../OrganizationSettingsModal.test.mjs | 15 +++++++++++++++ .../organization/OrganizationSettingsModal.vue | 15 +++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 frontend/src/views/organization/OrganizationSettingsModal.test.mjs diff --git a/frontend/src/views/organization/OrganizationSettingsModal.test.mjs b/frontend/src/views/organization/OrganizationSettingsModal.test.mjs new file mode 100644 index 00000000..304542b8 --- /dev/null +++ b/frontend/src/views/organization/OrganizationSettingsModal.test.mjs @@ -0,0 +1,15 @@ +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import test from 'node:test' + +const source = readFileSync(new URL('./OrganizationSettingsModal.vue', import.meta.url), 'utf8') + +test('reviewing join requests refreshes local and cached global organization data', () => { + assert.match( + source, + /const refreshOrganizationAfterReview = async \(\) => \{\s*await Promise\.all\(\[\s*fetchOrgDetail\(\),\s*orgStore\.fetchOrganizations\(\{ force: true \}\)\s*\]\)\s*\}/ + ) + + const refreshCalls = source.match(/await refreshOrganizationAfterReview\(\)/g) ?? [] + assert.equal(refreshCalls.length, 2) +}) diff --git a/frontend/src/views/organization/OrganizationSettingsModal.vue b/frontend/src/views/organization/OrganizationSettingsModal.vue index d576027b..2d4fa648 100644 --- a/frontend/src/views/organization/OrganizationSettingsModal.vue +++ b/frontend/src/views/organization/OrganizationSettingsModal.vue @@ -1071,6 +1071,17 @@ const fetchJoinRequests = async () => { } } +/** + * 审批结果会同时影响设置弹窗、空间卡片和全局侧栏中的待审批数量。 + * 后两处读取的是 organization store,因此必须绕过列表缓存并同步最新计数。 + */ +const refreshOrganizationAfterReview = async () => { + await Promise.all([ + fetchOrgDetail(), + orgStore.fetchOrganizations({ force: true }) + ]) +} + const handleApproveRequest = async (req: JoinRequestResponse) => { if (!props.orgId) return reviewingRequestId.value = req.id @@ -1080,7 +1091,7 @@ const handleApproveRequest = async (req: JoinRequestResponse) => { if (res.success) { MessagePlugin.success(t('organization.settings.approveSuccess')) joinRequests.value = joinRequests.value.filter(r => r.id !== req.id) - await fetchOrgDetail() + await refreshOrganizationAfterReview() } else { MessagePlugin.error(res.message || t('organization.settings.reviewFailed')) } @@ -1099,7 +1110,7 @@ const handleRejectRequest = async (req: JoinRequestResponse) => { if (res.success) { MessagePlugin.success(t('organization.settings.rejectSuccess')) joinRequests.value = joinRequests.value.filter(r => r.id !== req.id) - await fetchOrgDetail() + await refreshOrganizationAfterReview() } else { MessagePlugin.error(res.message || t('organization.settings.reviewFailed')) }