From 2818a4fe8f242b4d6be8311aa6258e0af3ec6157 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Fri, 30 Jan 2026 19:20:52 +0800 Subject: [PATCH] feat(organization): implement searchable organizations feature - Added a 'searchable' flag to organizations, allowing them to be discoverable and joinable by ID without an invite code. - Introduced API endpoints for searching and joining searchable organizations. - Updated UI components to support searching for organizations and displaying results. - Enhanced localization for new search-related features in both English and Chinese. This update improves user experience by enabling easier discovery and joining of organizations. --- frontend/src/api/organization/index.ts | 56 + frontend/src/i18n/locales/en-US.ts | 9 + frontend/src/i18n/locales/zh-CN.ts | 9 + .../views/organization/OrganizationList.vue | 1027 ++++++++++++----- .../OrganizationSettingsModal.vue | 41 +- .../application/repository/organization.go | 20 +- internal/application/service/organization.go | 82 ++ internal/handler/organization.go | 86 ++ internal/router/router.go | 4 + internal/types/interfaces/organization.go | 4 + internal/types/organization.go | 29 + .../000012_organizations_searchable.down.sql | 2 + .../000012_organizations_searchable.up.sql | 8 + 13 files changed, 1065 insertions(+), 312 deletions(-) create mode 100644 migrations/versioned/000012_organizations_searchable.down.sql create mode 100644 migrations/versioned/000012_organizations_searchable.up.sql diff --git a/frontend/src/api/organization/index.ts b/frontend/src/api/organization/index.ts index 19c16b7a..c733e211 100644 --- a/frontend/src/api/organization/index.ts +++ b/frontend/src/api/organization/index.ts @@ -11,6 +11,7 @@ export interface Organization { invite_code_expires_at?: string | null invite_code_validity_days?: number require_approval?: boolean + searchable?: boolean member_count?: number share_count?: number pending_join_request_count?: number @@ -82,6 +83,18 @@ export interface OrganizationPreview { created_at: string } +/** Searchable (discoverable) organization item for join flow */ +export interface SearchableOrganizationItem { + id: string + name: string + description: string + avatar?: string + member_count: number + share_count: number + is_already_member: boolean + require_approval: boolean +} + // Request types export interface CreateOrganizationRequest { name: string @@ -95,6 +108,7 @@ export interface UpdateOrganizationRequest { description?: string avatar?: string require_approval?: boolean + searchable?: boolean invite_code_validity_days?: number // 0=never, 1, 7, 30 } @@ -284,6 +298,48 @@ export async function previewOrganization(inviteCode: string): Promise> { + try { + const params = new URLSearchParams() + if (q) params.set('q', q) + params.set('limit', String(limit)) + const response = await get(`/api/v1/organizations/search?${params.toString()}`) + const res = response as unknown as { success: boolean; data?: SearchableOrganizationItem[]; total?: number; message?: string } + return { + success: res.success, + data: res.success ? { data: res.data || [], total: res.total ?? 0 } : undefined, + message: res.message, + } + } catch (error: any) { + return { success: false, message: error.message || 'Failed to search organizations' } + } +} + +/** + * Join a searchable organization by ID (no invite code) + */ +export async function joinOrganizationById( + organizationId: string, + message?: string, + role?: 'admin' | 'editor' | 'viewer' +): Promise> { + try { + const body: { organization_id: string; message?: string; role?: string } = { organization_id: organizationId } + if (message) body.message = message + if (role) body.role = role + const response = await post('/api/v1/organizations/join-by-id', body) + return response as unknown as ApiResponse + } catch (error: any) { + return { success: false, message: error.message || 'Failed to join organization' } + } +} + /** * Leave organization */ diff --git a/frontend/src/i18n/locales/en-US.ts b/frontend/src/i18n/locales/en-US.ts index a5963bf7..8262d4b0 100755 --- a/frontend/src/i18n/locales/en-US.ts +++ b/frontend/src/i18n/locales/en-US.ts @@ -2370,6 +2370,12 @@ export default { shareCount: '{count} shared knowledge bases', alreadyMember: 'You are already a member of this space', invalidCode: 'Invalid invite code', + byInviteCode: 'Enter invite code', + searchSpaces: 'Search spaces', + searchSpacesDesc: 'Browse or search spaces that are open for discovery; join without an invite code', + searchSpacesPlaceholder: 'Search by space name or description', + noSearchResult: 'No matching spaces', + noSearchableSpaces: 'No discoverable spaces yet, or try a search', }, invite: { loading: 'Loading...', @@ -2394,6 +2400,7 @@ export default { requestRole: 'Requested role', selectRole: 'Select role', messagePlaceholder: 'Optional: message (e.g. intro or reason to join)', + applicationNote: 'Application note (optional)', joinSuccess: 'Successfully joined space!', joinFailed: 'Failed to join, please try again', requestSubmitted: 'Request submitted, please wait for admin approval', @@ -2473,6 +2480,8 @@ export default { removeShareFailed: 'Failed to remove, please try again', requireApproval: 'Require Approval', requireApprovalDesc: 'When enabled, new members need admin approval to join', + searchable: 'Open for search', + searchableDesc: 'When enabled, this space appears in the "Join Space" search list; others can search and request to join without an invite code', joinRequests: 'Join Requests', joinRequestsDesc: 'Review pending requests to join the space', noPendingRequests: 'No pending requests', diff --git a/frontend/src/i18n/locales/zh-CN.ts b/frontend/src/i18n/locales/zh-CN.ts index eda50c63..b54c9d54 100755 --- a/frontend/src/i18n/locales/zh-CN.ts +++ b/frontend/src/i18n/locales/zh-CN.ts @@ -2375,6 +2375,12 @@ export default { shareCount: "{count} 个共享知识库", alreadyMember: "您已经是该空间的成员", invalidCode: "无效的邀请码", + byInviteCode: "输入邀请码", + searchSpaces: "搜索空间", + searchSpacesDesc: "浏览或搜索已开放可被搜索的空间,无需邀请码即可加入", + searchSpacesPlaceholder: "按空间名称或描述搜索", + noSearchResult: "未找到匹配的空间", + noSearchableSpaces: "暂无开放可被搜索的空间,或输入关键词搜索", }, invite: { loading: "加载中...", @@ -2399,6 +2405,7 @@ export default { requestRole: "申请角色", selectRole: "选择角色", messagePlaceholder: "选填:申请说明(如自我介绍或加入原因)", + applicationNote: "申请说明(选填)", joinSuccess: "成功加入空间!", joinFailed: "加入失败,请稍后重试", requestSubmitted: "申请已提交,请等待管理员审核", @@ -2478,6 +2485,8 @@ export default { removeShareFailed: "移除失败,请重试", requireApproval: "需要审核", requireApprovalDesc: "开启后,新成员加入需要管理员审核", + searchable: "开放可被搜索", + searchableDesc: "开启后,空间将出现在「加入空间」的搜索列表中,他人可搜索并申请加入,无需邀请码", joinRequests: "加入申请", joinRequestsDesc: "审核待加入空间的申请", noPendingRequests: "暂无待审核的申请", diff --git a/frontend/src/views/organization/OrganizationList.vue b/frontend/src/views/organization/OrganizationList.vue index 71ab68fa..0946f1db 100644 --- a/frontend/src/views/organization/OrganizationList.vue +++ b/frontend/src/views/organization/OrganizationList.vue @@ -222,46 +222,142 @@ - +
- - - -
@@ -273,65 +369,51 @@