Moheeb Zara
4c9b55147b
Finishes all remaining tracked work from the full-app audit. - types/database.ts synced: added the 8 missing tables (forum_threads, comments, space_tiers, space_invites, space_onboarding_steps, space_role_labels, space_custom_roles, space_member_custom_roles), the comment_entity_type enum (type + Constants), and the missing columns (space_members.tier_id/onboarding_completed_at/ onboarding_progress, secrets.encrypted_value/encryption_version, knowledge_base.render_markdown). - Email canonicalization: new emailField() helper (trim+lowercase) applied to signIn/signUp/addMember/updateMember/createContact and the import path; prevents case-variant duplicates and sign-in mismatches. - Members directory: per-row "make area lead" picker (admin/board) assigns a member to any area-lead role; mirrors Customize. - Docs refreshed and re-dated: DATABASE_SCHEMA.md (migrations 014-024 summary), DB_SCHEMA_MAP.md (new-table quick map), API_REFERENCE.md (all server actions from migrations 016-024). schema.sql named as source of truth. Backlog is now empty. 271/271 tests pass, build clean. No migration.
79 lines
2.7 KiB
TypeScript
79 lines
2.7 KiB
TypeScript
import { createClient } from '@/lib/supabase/server'
|
|
import { MembersClient } from './members-client'
|
|
|
|
// member_directory_visibility values come from space settings:
|
|
// admin_only — only admins see the directory
|
|
// board_visible — admins + board + treasurer see the directory
|
|
// members_visible — every member of the space sees the directory (default)
|
|
const ELEVATED_ROLES = new Set(['admin', 'board', 'treasurer'])
|
|
|
|
export default async function MembersPage() {
|
|
const supabase = await createClient()
|
|
const { data: { user } } = await supabase.auth.getUser()
|
|
if (!user) return null
|
|
|
|
const { data: self } = await supabase
|
|
.from('space_members')
|
|
.select('space_id, role')
|
|
.eq('user_id', user.id)
|
|
.in('status', ['current', 'unverified', 'late'])
|
|
.single()
|
|
|
|
if (!self) return null
|
|
|
|
const { data: space } = await supabase
|
|
.from('spaces')
|
|
.select('member_directory_visibility')
|
|
.eq('id', self.space_id)
|
|
.single()
|
|
|
|
const visibility = space?.member_directory_visibility ?? 'members_visible'
|
|
const isAdmin = self.role === 'admin'
|
|
const isElevated = ELEVATED_ROLES.has(self.role)
|
|
|
|
const allowed =
|
|
visibility === 'members_visible' ||
|
|
(visibility === 'board_visible' && isElevated) ||
|
|
(visibility === 'admin_only' && isAdmin)
|
|
|
|
if (!allowed) {
|
|
return (
|
|
<div className="p-8 max-w-2xl">
|
|
<h1 className="font-mono text-sm tracking-widest uppercase text-muted-foreground mb-3">Members</h1>
|
|
<div className="bg-card border border-border rounded p-6">
|
|
<p className="font-sans text-sm text-foreground mb-2">The member directory is restricted in this space.</p>
|
|
<p className="font-sans text-sm text-muted-foreground">
|
|
A space admin has set member directory visibility to <code className="font-mono text-xs px-1 py-0.5 bg-muted rounded">{visibility}</code>.
|
|
Contact an admin if you need access.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
const { data: members } = await supabase
|
|
.from('space_members')
|
|
.select('*')
|
|
.eq('space_id', self.space_id)
|
|
.order('joined_at')
|
|
|
|
// Area-lead roles, so admin/board can assign a lead straight from a member
|
|
// row (the same capability also lives in Customize -> Area leads).
|
|
const canManageLeads = self.role === 'admin' || self.role === 'board'
|
|
const { data: areaLeadRoles } = canManageLeads
|
|
? await supabase
|
|
.from('area_leads')
|
|
.select('id, area_name, lead_id')
|
|
.eq('space_id', self.space_id)
|
|
.order('area_name')
|
|
: { data: [] }
|
|
|
|
return (
|
|
<MembersClient
|
|
members={members ?? []}
|
|
currentRole={self.role}
|
|
areaLeadRoles={(areaLeadRoles ?? []) as Array<{ id: string; area_name: string; lead_id: string | null }>}
|
|
/>
|
|
)
|
|
}
|