Big feature batch driven by the super-audit findings and the user's follow-up requests. Schema migration 021 (folded into schema.sql Section 13): - forum_threads + polymorphic comments table keyed on (entity_type, entity_id). Entity types: forum_thread, proposal, incident, policy. Trigger maintains forum_threads.comment_count and last_comment_at. - space_tiers per-space with monthly_price_cents, billing_cadence, is_system, sort_order. Trigger seeds plus/basic/associate on every space INSERT and backfills existing spaces. space_members.tier_id FK added and backfilled from the legacy enum value. - space_role_labels (rename/recolor built-in roles per space). space_custom_roles + space_member_custom_roles for non-privileged extra labels. RLS gates by admin/board. - space_invites: multi-code invites with expires_at, max_uses, uses_count, is_enabled. Legacy spaces.invite_code backfilled as a permanent enabled invite. - secrets.encrypted_value bytea + encryption_version. Secrets RLS tightened. New comms_channels INSERT policy: any member can create; default channels are protected from deletion. - knowledge_base.render_markdown boolean (default true). Secrets encryption-at-rest: - AES-256-GCM in lib/secrets/crypto.ts. Master key from SECRETS_ENCRYPTION_KEY env (64 hex chars). - New revealSecret(id) server action: only path to plaintext, writes secret.revealed to activity_log. - /ops/page.tsx no longer selects value or encrypted_value on the list endpoint - the original screenshot bug where ciphertext was already in the page bundle before "Reveal" is fixed. UI: - /forum index, /forum/new, /forum/[id]. Pin/lock/delete actions for admin/board. - CommentThread component embedded on /proposals/[id], /incidents/[id], /policies/[slug]. Markdown rendering via react-markdown + remark-gfm. - /comms sidebar: inline "+ New channel" form. - /ops KB: row click opens markdown-rendering viewer modal. - /settings: new Tiers tab and Invites tab. Inline price edit and archive/delete on tiers; copy/enable/disable/delete on invites. - AtlasLogo replaces the terminal icon on the landing nav and footer. public/logo.svg wired as the favicon in app/layout.tsx metadata. - Sidebar has a Forum nav link. Server actions added: - lib/actions/forum.ts, comms.ts, tiers.ts, roles.ts, invites.ts. - lib/actions/secrets.ts rewritten with updateSecret + revealSecret. Auth flow: - joinSpace honors codes from space_invites first (enabled, expiry, use cap), falls back to legacy spaces.invite_code, increments uses_count on success. Env: - SECRETS_ENCRYPTION_KEY documented in .env.example and set on the Droplet's /opt/hackerspace-ops/.env.production. README: live site link added (https://hackerspace.sh). 266/266 unit tests pass. Production build clean. Migration 021 will be applied on the next deploy via /opt/hackerspace-ops/deploy.sh's idempotent migration runner.
188 lines
7.9 KiB
TypeScript
188 lines
7.9 KiB
TypeScript
import Link from 'next/link'
|
|
import { redirect, notFound } from 'next/navigation'
|
|
import { createClient } from '@/lib/supabase/server'
|
|
import type { Proposal, ProposalVote } from '@/lib/types'
|
|
import { ProposalStatusBadge } from '../proposal-badges'
|
|
import { ProposalActions } from './proposal-actions'
|
|
import { MarkdownBody } from '@/components/markdown'
|
|
import { CommentThread } from '@/components/comments/comment-thread'
|
|
import { loadComments } from '@/components/comments/load-comments'
|
|
|
|
export const dynamic = 'force-dynamic'
|
|
|
|
export default async function ProposalDetailPage({ params }: { params: Promise<{ id: string }> }) {
|
|
const { id } = await params
|
|
const supabase = await createClient()
|
|
const { data: { user } } = await supabase.auth.getUser()
|
|
if (!user) redirect('/login')
|
|
|
|
const { data: member } = await supabase
|
|
.from('space_members')
|
|
.select('id, space_id, role, display_name')
|
|
.eq('user_id', user.id)
|
|
.in('status', ['current', 'unverified', 'late'])
|
|
.maybeSingle()
|
|
if (!member?.space_id) redirect('/signup')
|
|
|
|
const { data: proposalRaw } = await supabase
|
|
.from('proposals')
|
|
.select('*')
|
|
.eq('id', id)
|
|
.eq('space_id', member.space_id)
|
|
.maybeSingle()
|
|
if (!proposalRaw) notFound()
|
|
|
|
const proposal = proposalRaw as unknown as Proposal
|
|
|
|
const { data: votesRaw } = await supabase
|
|
.from('proposal_votes')
|
|
.select('*')
|
|
.eq('proposal_id', proposal.id)
|
|
.order('voted_at', { ascending: false })
|
|
|
|
const votes = (votesRaw ?? []) as unknown as ProposalVote[]
|
|
|
|
// Resolve voter display names from space_members.
|
|
const voterIds = Array.from(new Set(votes.map(v => v.member_id)))
|
|
const { data: voters } = voterIds.length
|
|
? await supabase
|
|
.from('space_members')
|
|
.select('id, display_name')
|
|
.in('id', voterIds)
|
|
: { data: [] as Array<{ id: string; display_name: string | null }> }
|
|
|
|
const voterNames = new Map((voters ?? []).map(m => [m.id, m.display_name]))
|
|
|
|
const myVote = votes.find(v => v.member_id === (member as { id: string }).id) ?? null
|
|
const isAdminOrBoard = member.role === 'admin' || member.role === 'board'
|
|
const votingOpen =
|
|
proposal.status === 'open' &&
|
|
proposal.voting_opens_at !== null &&
|
|
proposal.voting_closes_at !== null &&
|
|
new Date(proposal.voting_opens_at) <= new Date() &&
|
|
new Date(proposal.voting_closes_at) > new Date()
|
|
|
|
const totalCounted = proposal.outcome_yes + proposal.outcome_no + proposal.outcome_abstain
|
|
const quorumPct = proposal.quorum_required > 0
|
|
? Math.min(100, Math.round((totalCounted / proposal.quorum_required) * 100))
|
|
: 0
|
|
|
|
const comments = await loadComments(supabase, 'proposal', proposal.id)
|
|
|
|
return (
|
|
<div className="min-h-screen bg-background">
|
|
<div className="bg-sidebar px-4 md:px-6 py-3 flex items-center gap-3">
|
|
<Link href="/proposals" className="text-white/70 hover:text-white font-sans text-sm">
|
|
← Proposals
|
|
</Link>
|
|
</div>
|
|
|
|
<div className="p-4 md:p-6 max-w-4xl space-y-6">
|
|
<header className="bg-card rounded border border-border p-5">
|
|
<div className="flex items-start justify-between gap-3 mb-3">
|
|
<h1 className="font-sans text-xl font-semibold text-foreground flex-1">{proposal.title}</h1>
|
|
<ProposalStatusBadge status={proposal.status} />
|
|
</div>
|
|
<p className="font-mono text-[10px] text-muted-foreground">
|
|
{proposal.proposal_type.replace(/_/g, ' ')}
|
|
{proposal.proposer_name ? ` · proposed by ${proposal.proposer_name}` : ''}
|
|
{' · '}
|
|
{proposal.threshold.replace(/_/g, ' ')} required
|
|
</p>
|
|
{proposal.body && <MarkdownBody className="mt-4" content={proposal.body} />}
|
|
</header>
|
|
|
|
<section className="bg-card rounded border border-border p-5">
|
|
<p className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase mb-3">
|
|
Tally
|
|
</p>
|
|
<div className="grid grid-cols-2 sm:grid-cols-4 gap-3 mb-4">
|
|
<Tally label="Yes" value={proposal.outcome_yes} accent="text-primary" />
|
|
<Tally label="No" value={proposal.outcome_no} accent="text-orange-600" />
|
|
<Tally label="Abstain" value={proposal.outcome_abstain} accent="text-muted-foreground" />
|
|
<Tally label="Recused" value={proposal.outcome_recused} accent="text-muted-foreground" />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<div className="flex items-center justify-between">
|
|
<span className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase">
|
|
Quorum
|
|
</span>
|
|
<span className="font-sans text-xs">
|
|
{totalCounted} of {proposal.quorum_required}
|
|
{' · '}
|
|
<span className={proposal.quorum_met ? 'text-primary' : 'text-orange-600'}>
|
|
{proposal.quorum_met ? 'met' : 'not met'}
|
|
</span>
|
|
</span>
|
|
</div>
|
|
<div className="h-1 bg-border rounded-full overflow-hidden">
|
|
<div className={`h-full rounded-full ${proposal.quorum_met ? 'bg-primary' : 'bg-orange-400'}`} style={{ width: `${quorumPct}%` }} />
|
|
</div>
|
|
{proposal.status === 'decided' && (
|
|
<p className="font-mono text-[10px] text-muted-foreground pt-1">
|
|
Outcome: <span className={proposal.passed ? 'text-primary' : 'text-orange-600'}>{proposal.passed ? 'PASSED' : 'DID NOT PASS'}</span>
|
|
{proposal.decided_at ? ` · ${new Date(proposal.decided_at).toLocaleString()}` : ''}
|
|
</p>
|
|
)}
|
|
</div>
|
|
</section>
|
|
|
|
<ProposalActions
|
|
proposalId={proposal.id}
|
|
status={proposal.status}
|
|
isAdminOrBoard={isAdminOrBoard}
|
|
isProposer={proposal.proposer_id === member.id}
|
|
votingOpen={votingOpen}
|
|
myVote={myVote}
|
|
/>
|
|
|
|
<section className="bg-card rounded border border-border p-5">
|
|
<p className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase mb-3">
|
|
Votes ({votes.length})
|
|
</p>
|
|
{votes.length === 0 ? (
|
|
<p className="font-sans text-sm text-muted-foreground">No votes cast yet.</p>
|
|
) : (
|
|
<ul className="divide-y divide-border">
|
|
{votes.map(v => (
|
|
<li key={v.id} className="py-2 flex items-start gap-3">
|
|
<span className="font-mono text-[10px] tracking-widest uppercase w-16 flex-shrink-0 mt-1">
|
|
{v.position}
|
|
</span>
|
|
<div className="flex-1 min-w-0">
|
|
<p className="font-sans text-sm text-foreground">{voterNames.get(v.member_id) ?? 'Unknown member'}</p>
|
|
{v.comment && <p className="font-sans text-xs text-muted-foreground mt-0.5">{v.comment}</p>}
|
|
{v.recusal_reason && (
|
|
<p className="font-sans text-xs text-muted-foreground italic mt-0.5">Recused: {v.recusal_reason}</p>
|
|
)}
|
|
</div>
|
|
<span className="font-mono text-[10px] text-muted-foreground/60 flex-shrink-0 mt-1">
|
|
{new Date(v.voted_at).toLocaleString('en-US', { month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit' })}
|
|
</span>
|
|
</li>
|
|
))}
|
|
</ul>
|
|
)}
|
|
</section>
|
|
|
|
<CommentThread
|
|
entityType="proposal"
|
|
entityId={proposal.id}
|
|
comments={comments}
|
|
currentMemberId={(member as { id: string }).id}
|
|
canModerate={isAdminOrBoard}
|
|
/>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
function Tally({ label, value, accent }: { label: string; value: number; accent: string }) {
|
|
return (
|
|
<div>
|
|
<p className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase mb-1">{label}</p>
|
|
<p className={`font-sans text-2xl font-semibold ${accent}`}>{value}</p>
|
|
</div>
|
|
)
|
|
}
|