e7f9a6580a
Polish the role-aware UI surfaces wired up in #1303 so role / tenant context is discoverable from the main shell rather than buried in a hover-only switcher or the settings drawer. UserMenu sidebar trigger: - Replace username + email with `tenant name / username · role-icon role-name` so the active tenant + current role are always visible at the bottom of the sidebar; long usernames elide before the role label. - Single-tenant users keep the old username + email layout. UserMenu dropdown: - Promote the tenant switcher to a clickable header row at the top of the dropdown (tenant name + swap icon, role caption underneath). - Drop the standalone "Switch tenant" submenu entry — the header row hosts the same hover panel. - Switcher panel rows now lead the role label with a role icon (owner / admin / contributor / viewer) and surface the home tenant via a small home dot on the avatar instead of a separate badge, so the right-edge "current" badge column lines up across rows. Settings: - Add SECTION_MIN_ROLE so settings nav entries are gated by the same role matrix the backend enforces (chathistory + ollama + websearch + vectorstore + parser + storage + mcp → admin; api → owner; rest → viewer). UserMenu quickNav uses the same map. - Render a role-denied empty state when a user deep-links into a section their role can't reach. - Split account info (id / username / email / created_at) out of the owner-only API Info page into a new viewer-accessible UserProfile section. Composable: - New useRoleLabel composable centralises role → label and role → icon mapping (consumed by UserMenu trigger / dropdown / switcher panel). - useHomeTenant derives the home tenant id from `user.tenant_id` (the immutable signup-time field), not `tenant.id` which now reflects the active tenant after a switch. Lists: - KnowledgeBaseList / AgentList default the sidebar selection to "all" for viewers (who typically own nothing) so the empty "Mine" state no longer hides the shared content they actually have access to; contributor+ keeps "Mine" as the default. i18n: - Tenant role labels: 拥有者/贡献者/查看者 → 所有者/编辑/访客 (all four locales updated, plus new userProfile / roleDenied / homeBadge keys). The org-vs-tenant scope question raised during review is intentionally out of scope here — that needs an RFC before any UI/backend changes.
75 lines
3.1 KiB
TypeScript
75 lines
3.1 KiB
TypeScript
import { computed } from 'vue'
|
|
import { useI18n } from 'vue-i18n'
|
|
import { useAuthStore } from '@/stores/auth'
|
|
|
|
/**
|
|
* Format a tenant role enum value ('viewer' | 'contributor' | 'admin' | 'owner')
|
|
* into the user-facing label declared under tenantMember.role.* in the i18n
|
|
* bundle. Falls back to the raw role string when the locale does not carry
|
|
* the key — same behaviour as the inline helper this used to live in
|
|
* (UserMenu.vue), now extracted so role-aware UI gates across views can
|
|
* share one implementation.
|
|
*
|
|
* `roleIcon(role)` returns a TDesign icon name suitable for prefixing the
|
|
* role label (e.g. in tenant switcher rows). The mapping is intentionally
|
|
* limited to icons already known to ship in this codebase to avoid a
|
|
* runtime "icon not found" footgun on uncommon role names.
|
|
*/
|
|
export function useRoleLabel() {
|
|
const { t } = useI18n()
|
|
const formatRole = (role: string | null | undefined): string => {
|
|
if (!role) return ''
|
|
const key = `tenantMember.role.${role}`
|
|
const label = t(key)
|
|
return label === key ? role : label
|
|
}
|
|
const ROLE_ICONS: Record<string, string> = {
|
|
owner: 'secured',
|
|
admin: 'user-circle',
|
|
contributor: 'edit',
|
|
viewer: 'browse',
|
|
}
|
|
const roleIcon = (role: string | null | undefined): string =>
|
|
(role && ROLE_ICONS[role]) || ''
|
|
return { formatRole, roleIcon }
|
|
}
|
|
|
|
/**
|
|
* Derive home-tenant identity helpers off the auth store. The home tenant
|
|
* is the tenant the user was registered into — the row id stored on the
|
|
* users table at signup time, exposed via `authStore.user.tenant_id` and
|
|
* never mutated by /auth/switch-tenant.
|
|
*
|
|
* IMPORTANT: do NOT read `authStore.tenant?.id` here. That field is the
|
|
* *active* tenant returned by /auth/me (see internal/handler/auth.go
|
|
* GetCurrentUser — it deliberately reflects the X-Tenant-ID override).
|
|
* After a tenant switch, `authStore.tenant.id` becomes the peer tenant
|
|
* id; treating it as "home" makes the home badge follow the user across
|
|
* switches and incorrectly mark whichever tenant they're currently in.
|
|
*
|
|
* `activeTenantId` is the currently selected tenant (= home id when no
|
|
* override is in play), used by `isHomeTenantActive` to answer "am I
|
|
* sitting in my home tenant right now?".
|
|
*/
|
|
export function useHomeTenant() {
|
|
const authStore = useAuthStore()
|
|
const homeTenantId = computed<number | null>(() => {
|
|
const raw = authStore.user?.tenant_id
|
|
if (raw === null || raw === undefined || raw === '') return null
|
|
const n = Number(raw)
|
|
return Number.isFinite(n) && n > 0 ? n : null
|
|
})
|
|
const activeTenantId = computed<number | null>(() => authStore.effectiveTenantId)
|
|
const isHomeTenantActive = computed(() => {
|
|
const home = homeTenantId.value
|
|
const active = activeTenantId.value
|
|
return home !== null && active !== null && home === active
|
|
})
|
|
const isHomeTenant = (id: number | string | null | undefined): boolean => {
|
|
if (id === null || id === undefined || id === '') return false
|
|
const home = homeTenantId.value
|
|
return home !== null && Number(id) === home
|
|
}
|
|
return { homeTenantId, activeTenantId, isHomeTenantActive, isHomeTenant }
|
|
}
|