@kelpie/ui 0.7.0 → 0.9.0

package/src/pages/OpportunityDetail.tsx

@@ -1,16 +1,19 @@
 import type { Opportunity, OpportunityInput, PipelineStage } from '@kelpie/schemas'
 import { useState } from 'react'
+import type { FormEvent } from 'react'
 import { Link, useNavigate, useParams } from 'react-router'
 
 import { usePatch } from '../api/resource.ts'
 import type { PatchResult } from '../api/resource.ts'
 import { useCompanies, useCompany } from '../api/resources/companies.ts'
+import { useFormSubmissionsForRecord } from '../api/resources/forms.ts'
 import { useMembers } from '../api/resources/members.ts'
 import {
   useDeleteOpportunity,
   useOpportunity,
   useUpdateOpportunity,
 } from '../api/resources/opportunities.ts'
+import { usePeople } from '../api/resources/people.ts'
 import { usePipelineStages } from '../api/resources/pipelineStages.ts'
 import { useRecordPlanItems } from '../api/resources/planItems.ts'
 import { ActivitiesPanel, LatestActivity } from '../components/ActivitiesPanel.tsx'
@@ -20,13 +23,18 @@ import type { ChipTone } from '../components/Chip.tsx'
 import { DecisionsPanel } from '../components/DecisionsPanel.tsx'
 import { DeleteRecord } from '../components/DeleteRecord.tsx'
 import { EntitySearch } from '../components/EntitySearch.tsx'
+import { FormsPanel } from '../components/FormsPanel.tsx'
+import { CustomFieldsPanel } from '../components/CustomFieldsPanel.tsx'
+import { useHasCustomFields } from '../components/useHasCustomFields.ts'
 import { InlineEdit } from '../components/InlineEdit.tsx'
+import { ListsPanel } from '../components/ListsPanel.tsx'
 import { NotesPanel } from '../components/NotesPanel.tsx'
 import { PlanAttention } from '../components/PlanAttention.tsx'
 import { PlanPanel } from '../components/PlanPanel.tsx'
 import { ErrorPanel, LoadingPanel, NotFoundPanel } from '../components/QueryState.tsx'
 import { RecordTabs } from '../components/RecordTabs.tsx'
 import type { RecordTabDescriptor } from '../components/RecordTabs.tsx'
+import { SectionHeader } from '../components/SectionHeader.tsx'
 import { SidebarField } from '../components/SidebarField.tsx'
 import { SummaryBlock } from '../components/SummaryBlock.tsx'
 import { formatDay } from '../lib/dates.ts'
@@ -38,8 +46,10 @@ import { toTags } from './fields.ts'
  * One opportunity.
  *
  * The same shape as `DealDetail` minus what an opportunity does not have: no
- * value, no contacts, and a company that may be absent. A UI module can add its
- * own tab through the `opportunity` record-tab slot.
+ * value, and a company that may be absent. People attach through `person_links`
+ * the same way they do on a deal, and they are shown in the same contacts
+ * section in the aside. A UI module can add its own tab through the
+ * `opportunity` record-tab slot.
  */
 
 const STAGE_TONES: Readonly<Record<string, ChipTone>> = {
@@ -53,7 +63,9 @@ export function OpportunityDetail(): React.JSX.Element {
   const { record, isLoading, isNotFound, error } = useOpportunity(id)
   const deleteOpportunity = useDeleteOpportunity()
   const moduleTabs = inSlotOrder(useRecordTabs('opportunity'))
+  const hasCustomFields = useHasCustomFields('opportunity')
   const [activeTab, setActiveTab] = useState('overview')
+  const formSubmissions = useFormSubmissionsForRecord('opportunity', id)
 
   if (isNotFound) {
     return <NotFoundPanel label="Opportunity" backTo="/opportunities" />
@@ -69,10 +81,15 @@ export function OpportunityDetail(): React.JSX.Element {
 
   const tabs: readonly RecordTabDescriptor<string>[] = [
     { id: 'overview', label: 'Overview' },
+    ...(hasCustomFields ? [{ id: 'fields', label: 'Fields' }] : []),
     { id: 'plan', label: 'Plan' },
     { id: 'activity', label: 'Activity' },
     { id: 'notes', label: 'Notes' },
     { id: 'decisions', label: 'Decisions' },
+    { id: 'lists', label: 'Lists' },
+    ...(formSubmissions.records.length === 0
+      ? []
+      : [{ id: 'forms', label: 'Forms', count: formSubmissions.records.length }]),
     ...moduleTabs.map((tab) => ({ id: tab.id, label: tab.label })),
   ]
   const active = tabs.some((tab) => tab.id === activeTab) ? activeTab : 'overview'
@@ -114,6 +131,7 @@ export function OpportunityDetail(): React.JSX.Element {
             ariaLabel="Opportunity sections"
           >
             {active === 'overview' && <OpportunityOverview opportunity={record} />}
+            {active === 'fields' && <OpportunityFields opportunity={record} />}
             {active === 'plan' && <PlanPanel targetType="opportunity" targetId={record.id} />}
             {active === 'activity' && (
               <ActivitiesPanel targetType="opportunity" targetId={record.id} />
@@ -122,12 +140,15 @@ export function OpportunityDetail(): React.JSX.Element {
             {active === 'decisions' && (
               <DecisionsPanel targetType="opportunity" targetId={record.id} />
             )}
+            {active === 'lists' && <ListsPanel targetType="opportunity" targetId={record.id} />}
+            {active === 'forms' && <FormsPanel targetType="opportunity" targetId={record.id} />}
             {moduleTab?.render({ objectType: 'opportunity', recordId: record.id })}
           </RecordTabs>
         </div>
 
         <aside className="space-y-4 text-[12px] lg:sticky lg:top-6">
           <OpportunitySidebar opportunity={record} />
+          <OpportunityContacts opportunity={record} />
         </aside>
       </div>
     </div>
@@ -335,3 +356,148 @@ function OpportunitySidebar({
     </section>
   )
 }
+
+function OpportunityFields({
+  opportunity,
+}: {
+  readonly opportunity: Opportunity
+}): React.JSX.Element {
+  const { patch, error } = useOpportunityPatch(opportunity)
+  return (
+    <div className="space-y-4">
+      {error !== null && <ErrorPanel error={error} />}
+      <CustomFieldsPanel
+        objectType="opportunity"
+        values={opportunity.customFields}
+        onPatch={(customFields) => {
+          patch({ customFields })
+        }}
+      />
+    </div>
+  )
+}
+
+/** The people on the opportunity, linked and unlinked by replacing `person_ids`. */
+function OpportunityContacts({
+  opportunity,
+}: {
+  readonly opportunity: Opportunity
+}): React.JSX.Element {
+  const { patch, error } = useOpportunityPatch(opportunity)
+
+  const [adding, setAdding] = useState(false)
+  const [personId, setPersonId] = useState('')
+  const [search, setSearch] = useState('')
+
+  // No `?id=` filter exists on people, so names come from the directory's first
+  // page. Past it, a contact renders by id rather than silently vanishing.
+  const directory = usePeople({ limit: 200 })
+  const searchable = usePeople({ term: search.trim().length > 0 ? search.trim() : undefined })
+  const nameById = new Map(directory.records.map((person) => [person.id, person.name]))
+  const linked = new Set(opportunity.personIds)
+
+  function reset(): void {
+    setAdding(false)
+    setPersonId('')
+    setSearch('')
+  }
+
+  function submit(event: FormEvent): void {
+    event.preventDefault()
+
+    if (personId.length === 0 || linked.has(personId)) {
+      return
+    }
+
+    patch({ personIds: [...opportunity.personIds, personId] })
+    reset()
+  }
+
+  return (
+    <section className="rounded-md border border-border">
+      <div className="border-b border-border px-3.5 py-2.5">
+        <SectionHeader
+          title="Contacts"
+          onAdd={() => {
+            setAdding((current) => !current)
+          }}
+          addLabel="Add contact"
+          compact
+        />
+      </div>
+
+      {error !== null && (
+        <div className="px-3.5 py-2">
+          <ErrorPanel error={error} />
+        </div>
+      )}
+
+      <ul className="divide-y divide-border">
+        {opportunity.personIds.length === 0 && !adding && (
+          <li className="px-3.5 py-4 text-[12px] text-ink-faint">No contacts yet.</li>
+        )}
+        {opportunity.personIds.map((linkedPersonId) => (
+          <li
+            key={linkedPersonId}
+            className="flex items-start justify-between gap-2 px-3.5 py-2.5"
+          >
+            <Link
+              to={`/people/${linkedPersonId}`}
+              className="text-[13px] font-medium text-ink hover:text-accent"
+            >
+              {nameById.get(linkedPersonId) ?? linkedPersonId}
+            </Link>
+            <button
+              type="button"
+              onClick={() => {
+                patch({
+                  personIds: opportunity.personIds.filter(
+                    (candidate) => candidate !== linkedPersonId,
+                  ),
+                })
+              }}
+              className="text-[11px] font-medium text-danger hover:underline"
+            >
+              Remove
+            </button>
+          </li>
+        ))}
+      </ul>
+
+      {adding && (
+        <form onSubmit={submit} className="space-y-2 border-t border-border bg-surface px-3.5 py-3">
+          <EntitySearch
+            options={searchable.records
+              .filter((person) => !linked.has(person.id))
+              .map((person) => ({
+                id: person.id,
+                label: person.name,
+                meta: person.email ?? undefined,
+              }))}
+            value={personId}
+            onChange={setPersonId}
+            onQueryChange={setSearch}
+            placeholder="Search people…"
+            emptyMessage="No people match"
+            required
+          />
+          <div className="flex justify-end gap-2">
+            <button
+              type="button"
+              onClick={reset}
+              className="rounded-md px-2.5 py-1 text-[12px] font-medium text-ink-muted hover:text-ink"
+            >
+              Cancel
+            </button>
+            <button
+              type="submit"
+              className="rounded-md bg-accent px-3 py-1.5 text-[12px] font-semibold text-accent-fg hover:bg-accent-hover"
+            >
+              Add
+            </button>
+          </div>
+        </form>
+      )}
+    </section>
+  )
+}

package/src/pages/PartnershipDetail.tsx

@@ -6,6 +6,7 @@ import { Link, useNavigate, useParams } from 'react-router'
 import { usePatch } from '../api/resource.ts'
 import type { PatchResult } from '../api/resource.ts'
 import { useCompanies, useCompany } from '../api/resources/companies.ts'
+import { useFormSubmissionsForRecord } from '../api/resources/forms.ts'
 import { useMembers } from '../api/resources/members.ts'
 import {
   useDeletePartnership,
@@ -22,7 +23,11 @@ import type { ChipTone } from '../components/Chip.tsx'
 import { DecisionsPanel } from '../components/DecisionsPanel.tsx'
 import { DeleteRecord } from '../components/DeleteRecord.tsx'
 import { EntitySearch } from '../components/EntitySearch.tsx'
+import { FormsPanel } from '../components/FormsPanel.tsx'
+import { CustomFieldsPanel } from '../components/CustomFieldsPanel.tsx'
+import { useHasCustomFields } from '../components/useHasCustomFields.ts'
 import { InlineEdit } from '../components/InlineEdit.tsx'
+import { ListsPanel } from '../components/ListsPanel.tsx'
 import { NotesPanel } from '../components/NotesPanel.tsx'
 import { PlanAttention } from '../components/PlanAttention.tsx'
 import { PlanPanel } from '../components/PlanPanel.tsx'
@@ -58,7 +63,9 @@ export function PartnershipDetail(): React.JSX.Element {
   const { record, isLoading, isNotFound, error } = usePartnership(id)
   const deletePartnership = useDeletePartnership()
   const moduleTabs = inSlotOrder(useRecordTabs('partnership'))
+  const hasCustomFields = useHasCustomFields('partnership')
   const [activeTab, setActiveTab] = useState('overview')
+  const formSubmissions = useFormSubmissionsForRecord('partnership', id)
 
   if (isNotFound) {
     return <NotFoundPanel label="Partnership" backTo="/partnerships" />
@@ -74,10 +81,15 @@ export function PartnershipDetail(): React.JSX.Element {
 
   const tabs: readonly RecordTabDescriptor<string>[] = [
     { id: 'overview', label: 'Overview' },
+    ...(hasCustomFields ? [{ id: 'fields', label: 'Fields' }] : []),
     { id: 'plan', label: 'Plan' },
     { id: 'activity', label: 'Activity' },
     { id: 'notes', label: 'Notes' },
     { id: 'decisions', label: 'Decisions' },
+    { id: 'lists', label: 'Lists' },
+    ...(formSubmissions.records.length === 0
+      ? []
+      : [{ id: 'forms', label: 'Forms', count: formSubmissions.records.length }]),
     ...moduleTabs.map((tab) => ({ id: tab.id, label: tab.label })),
   ]
   const active = tabs.some((tab) => tab.id === activeTab) ? activeTab : 'overview'
@@ -119,6 +131,7 @@ export function PartnershipDetail(): React.JSX.Element {
             ariaLabel="Partnership sections"
           >
             {active === 'overview' && <PartnershipOverview partnership={record} />}
+            {active === 'fields' && <PartnershipFields partnership={record} />}
             {active === 'plan' && <PlanPanel targetType="partnership" targetId={record.id} />}
             {active === 'activity' && (
               <ActivitiesPanel targetType="partnership" targetId={record.id} />
@@ -127,6 +140,8 @@ export function PartnershipDetail(): React.JSX.Element {
             {active === 'decisions' && (
               <DecisionsPanel targetType="partnership" targetId={record.id} />
             )}
+            {active === 'lists' && <ListsPanel targetType="partnership" targetId={record.id} />}
+            {active === 'forms' && <FormsPanel targetType="partnership" targetId={record.id} />}
             {moduleTab?.render({ objectType: 'partnership', recordId: record.id })}
           </RecordTabs>
         </div>
@@ -364,6 +379,26 @@ function PartnershipSidebar({
   )
 }
 
+function PartnershipFields({
+  partnership,
+}: {
+  readonly partnership: Partnership
+}): React.JSX.Element {
+  const { patch, error } = usePartnershipPatch(partnership)
+  return (
+    <div className="space-y-4">
+      {error !== null && <ErrorPanel error={error} />}
+      <CustomFieldsPanel
+        objectType="partnership"
+        values={partnership.customFields}
+        onPatch={(customFields) => {
+          patch({ customFields })
+        }}
+      />
+    </div>
+  )
+}
+
 /** The key people on the partnership, linked and unlinked by replacing `person_ids`. */
 function PartnershipKeyPeople({
   partnership,

package/src/pages/PartnershipsPage.tsx

@@ -1,5 +1,4 @@
 import type { Partnership, PipelineStage } from '@kelpie/schemas'
-import { useState } from 'react'
 import { Link, useNavigate } from 'react-router'
 
 import { useCompanies } from '../api/resources/companies.ts'
@@ -11,16 +10,21 @@ import {
 } from '../api/resources/partnerships.ts'
 import { usePipelineStages } from '../api/resources/pipelineStages.ts'
 import { MAX_PAGE_SIZE, usePlanItems } from '../api/resources/planItems.ts'
+import { useTimezone } from '../api/resources/account.ts'
 import { Chip } from '../components/Chip.tsx'
 import type { ChipTone } from '../components/Chip.tsx'
+import { ColumnPicker } from '../components/ColumnPicker.tsx'
 import { DataTable } from '../components/DataTable.tsx'
 import type { Column, DataTableGroup } from '../components/DataTable.tsx'
 import { KanbanBoard } from '../components/KanbanBoard.tsx'
 import { PageHeader } from '../components/PageHeader.tsx'
+import { Paginator } from '../components/Paginator.tsx'
 import { ErrorPanel, LoadingPanel } from '../components/QueryState.tsx'
 import { SegmentedControl } from '../components/SegmentedControl.tsx'
-import { formatDay } from '../lib/dates.ts'
+import { formatDate, formatDay } from '../lib/dates.ts'
+import { useListView } from '../lib/listView.ts'
 import { DUE_BUCKETS, byDateThenTitle, dueBucketFor, nextOpenByTarget } from '../lib/plan.ts'
+import { serverSortOnly } from '../lib/sort.ts'
 
 /**
  * The Partnerships board: ongoing two-way relationships, grouped by status. The
@@ -32,6 +36,33 @@ type BoardView = 'list' | 'columns'
 type PipelineScope = 'open' | 'all'
 type ListGrouping = 'stage' | 'due'
 
+const SCOPES: readonly PipelineScope[] = ['open', 'all']
+const GROUPINGS: readonly ListGrouping[] = ['stage', 'due']
+
+function readScope(stored: string | undefined): PipelineScope {
+  return SCOPES.includes(stored as PipelineScope) ? (stored as PipelineScope) : 'open'
+}
+
+function readGrouping(stored: string | undefined): ListGrouping {
+  return GROUPINGS.includes(stored as ListGrouping) ? (stored as ListGrouping) : 'stage'
+}
+
+const COLUMN_KEYS: readonly string[] = [
+  'name',
+  'company',
+  'stage',
+  'kind',
+  'nextPlan',
+  'owner',
+  'next',
+  'goals',
+  'successLooksLike',
+  'tags',
+  'summary',
+  'createdAt',
+  'updatedAt',
+]
+
 /** Tones keyed by the seeded slugs. A renamed stage keeps its slug and its tone. */
 const STAGE_TONES: Readonly<Record<string, ChipTone>> = {
   active: 'success',
@@ -43,19 +74,33 @@ function stageTone(stage: PipelineStage): ChipTone {
   return STAGE_TONES[stage.slug] ?? 'neutral'
 }
 
+const DEFAULT_VISIBLE_KEYS: readonly string[] = [
+  'name',
+  'company',
+  'kind',
+  'nextPlan',
+  'owner',
+  'next',
+]
+
+const SERVER_SORT_KEYS: readonly string[] = ['name', 'created_at', 'updated_at']
+
 export function PartnershipsPage(): React.JSX.Element {
   const navigate = useNavigate()
-  const [view, setView] = useState<BoardView>('list')
-  const [scope, setScope] = useState<PipelineScope>('open')
-  const [grouping, setGrouping] = useState<ListGrouping>('stage')
-  const [sort, setSort] = useState<string | undefined>(undefined)
+
+  const listView = useListView('partnerships', COLUMN_KEYS, DEFAULT_VISIBLE_KEYS)
+  const view: BoardView = listView.mode ?? 'columns'
+  const scope = readScope(listView.scope)
+  const grouping = readGrouping(listView.grouping)
+  const sort = listView.sort
 
   const stages = usePipelineStages('partnership')
-  const partnerships = usePartnerships({ sort })
+  const partnerships = usePartnerships({ sort: serverSortOnly(sort, SERVER_SORT_KEYS) })
   const companies = useCompanies({ limit: 200 })
   const members = useMembers()
   const createPartnership = useCreatePartnership()
   const updatePartnership = useUpdatePartnership()
+  const timezone = useTimezone()
 
   const allStages = [...stages.records].sort((a, b) => a.sortOrder - b.sortOrder)
   const visibleStages = scope === 'open' ? allStages.filter((stage) => stage.open) : allStages
@@ -78,7 +123,7 @@ export function PartnershipsPage(): React.JSX.Element {
     { enabled: askedIds.length > 0 },
   )
   const nextPlanByPartnership = nextOpenByTarget(planItems.records)
-  const plansTruncated = visiblePartnerships.length > MAX_PAGE_SIZE || planItems.hasMore
+  const plansTruncated = visiblePartnerships.length > MAX_PAGE_SIZE || planItems.hasNext
 
   const companyNameById = new Map(companies.records.map((company) => [company.id, company.name]))
 
@@ -97,6 +142,8 @@ export function PartnershipsPage(): React.JSX.Element {
     await navigate(`/partnerships/${partnership.id}`)
   }
 
+  const stageLabelById = new Map(allStages.map((stage) => [stage.id, stage.label]))
+
   const columns: readonly Column<Partnership>[] = [
     {
       key: 'name',
@@ -107,16 +154,25 @@ export function PartnershipsPage(): React.JSX.Element {
     {
       key: 'company',
       header: 'Company',
+      getSortValue: (partnership) => companyNameById.get(partnership.companyId) ?? null,
       render: (partnership) => companyNameById.get(partnership.companyId) ?? '—',
     },
+    {
+      key: 'stage',
+      header: 'Stage',
+      getSortValue: (partnership) => stageLabelById.get(partnership.stageId) ?? null,
+      render: (partnership) => stageLabelById.get(partnership.stageId) ?? '—',
+    },
     {
       key: 'kind',
       header: 'Kind',
+      getSortValue: (partnership) => partnership.kind || null,
       render: (partnership) => (partnership.kind.length > 0 ? partnership.kind : '—'),
     },
     {
       key: 'nextPlan',
       header: 'Next plan',
+      getSortValue: (partnership) => nextPlanByPartnership.get(partnership.id)?.date ?? null,
       render: (partnership) => {
         const next = nextPlanByPartnership.get(partnership.id)
 
@@ -137,6 +193,10 @@ export function PartnershipsPage(): React.JSX.Element {
     {
       key: 'owner',
       header: 'Owner',
+      getSortValue: (partnership) =>
+        partnership.ownerId === null
+          ? null
+          : (members.nameById.get(partnership.ownerId) ?? 'Unknown'),
       render: (partnership) =>
         partnership.ownerId === null
           ? '—'
@@ -146,14 +206,71 @@ export function PartnershipsPage(): React.JSX.Element {
       key: 'next',
       header: 'Next touch',
       className: 'w-28',
+      getSortValue: (partnership) => partnership.nextTouchpoint,
       render: (partnership) => (
         <span className="font-mono text-[12px] text-ink-muted">
           {partnership.nextTouchpoint === null ? '—' : formatDay(partnership.nextTouchpoint)}
         </span>
       ),
     },
+    {
+      key: 'goals',
+      header: 'Goals',
+      getSortValue: (partnership) => partnership.goals || null,
+      render: (partnership) =>
+        partnership.goals.length === 0 ? '—' : (
+          <span className="text-ink-muted">{partnership.goals}</span>
+        ),
+    },
+    {
+      key: 'successLooksLike',
+      header: 'Success looks like',
+      getSortValue: (partnership) => partnership.successLooksLike || null,
+      render: (partnership) =>
+        partnership.successLooksLike.length === 0 ? '—' : (
+          <span className="text-ink-muted">{partnership.successLooksLike}</span>
+        ),
+    },
+    {
+      key: 'tags',
+      header: 'Tags',
+      getSortValue: (partnership) => partnership.tags.join(', ') || null,
+      render: (partnership) =>
+        partnership.tags.length === 0 ? '—' : (
+          <span className="flex flex-wrap gap-1">
+            {partnership.tags.map((tag) => (
+              <Chip key={tag}>
+                <span className="text-[10px]">{tag}</span>
+              </Chip>
+            ))}
+          </span>
+        ),
+    },
+    {
+      key: 'summary',
+      header: 'Summary',
+      getSortValue: (partnership) => partnership.summary || null,
+      render: (partnership) =>
+        partnership.summary.length === 0 ? '—' : (
+          <span className="text-ink-muted">{partnership.summary}</span>
+        ),
+    },
+    {
+      key: 'createdAt',
+      header: 'Created',
+      sortKey: 'created_at',
+      render: (partnership) => formatDate(partnership.createdAt, timezone),
+    },
+    {
+      key: 'updatedAt',
+      header: 'Updated',
+      sortKey: 'updated_at',
+      render: (partnership) => formatDate(partnership.updatedAt, timezone),
+    },
   ]
 
+  const pickerOptions = columns.map((column) => ({ key: column.key, label: column.header }))
+
   const stageGroups: readonly DataTableGroup<Partnership>[] = visibleStages.map((stage) => ({
     id: stage.id,
     label: <Chip tone={stageTone(stage)}>{stage.label}</Chip>,
@@ -217,7 +334,9 @@ export function PartnershipsPage(): React.JSX.Element {
             <SegmentedControl
               ariaLabel="Status scope"
               value={scope}
-              onChange={setScope}
+              onChange={(next) => {
+                listView.setScope(next)
+              }}
               options={[
                 { id: 'open', label: 'Open' },
                 { id: 'all', label: 'All' },
@@ -227,7 +346,9 @@ export function PartnershipsPage(): React.JSX.Element {
               <SegmentedControl
                 ariaLabel="Group the list"
                 value={grouping}
-                onChange={setGrouping}
+                onChange={(next) => {
+                  listView.setGrouping(next)
+                }}
                 options={[
                   { id: 'stage', label: 'By status' },
                   { id: 'due', label: 'By due' },
@@ -237,12 +358,21 @@ export function PartnershipsPage(): React.JSX.Element {
             <SegmentedControl
               ariaLabel="Board or list"
               value={view}
-              onChange={setView}
+              onChange={(next) => {
+                listView.setMode(next)
+              }}
               options={[
                 { id: 'list', label: 'List' },
                 { id: 'columns', label: 'Board' },
               ]}
             />
+            {view === 'list' && (
+              <ColumnPicker
+                options={pickerOptions}
+                visibleKeys={listView.visibleKeys}
+                onChange={listView.setVisibleKeys}
+              />
+            )}
           </>
         }
       />
@@ -265,6 +395,7 @@ export function PartnershipsPage(): React.JSX.Element {
         <LoadingPanel label="Loading partnerships…" />
       ) : (
         <>
+          {view === 'list' && <Paginator list={partnerships} placement="top" />}
           {view === 'columns' ? (
             <KanbanBoard
               stages={visibleStages.map((stage) => ({ id: stage.id, label: stage.label }))}
@@ -311,13 +442,16 @@ export function PartnershipsPage(): React.JSX.Element {
                     ? {
                         label: 'Show all partnerships',
                         onClick: () => {
-                          setScope('all')
+                          listView.setScope('all')
                         },
                       }
                     : undefined
               }
               sort={sort}
-              onSortChange={setSort}
+              onSortChange={(next) => {
+                listView.setSort(next)
+              }}
+              visibleColumnKeys={listView.visibleKeys}
             />
           )}
           {updatePartnership.error !== null && (
@@ -325,17 +459,8 @@ export function PartnershipsPage(): React.JSX.Element {
               <ErrorPanel error={updatePartnership.error} />
             </div>
           )}
-          {partnerships.hasMore && (
-            <button
-              type="button"
-              onClick={partnerships.loadMore}
-              disabled={partnerships.isLoadingMore}
-              className="mt-3 rounded-md border border-border px-3 py-1.5 text-[12px] font-medium text-ink transition hover:border-border-strong hover:bg-surface-sunken disabled:opacity-50"
-            >
-              {partnerships.isLoadingMore ? 'Loading…' : 'Load more'}
-            </button>
-          )}
-          {companies.hasMore && (
+          {view === 'list' && <Paginator list={partnerships} />}
+          {companies.hasNext && (
             <p className="mt-2 text-[11px] text-ink-faint">
               More companies exist than one page returns, so some company names may show as “—”.
             </p>