@kelpie/ui 0.7.0 → 0.9.0

package/src/pages/PlanningPage.tsx

@@ -1,16 +1,28 @@
-import { PIPELINE_KIND_LABELS, PIPELINE_KINDS, PLAN_ITEM_STATUS_LABELS } from '@kelpie/schemas'
-import type { PipelineKind, PlanItem } from '@kelpie/schemas'
+import {
+  PIPELINE_KIND_LABELS,
+  PIPELINE_KINDS,
+  PLAN_ITEM_STATUS_LABELS,
+  PLAN_ITEM_STATUSES,
+} from '@kelpie/schemas'
+import type { PipelineKind, PlanItem, PlanItemStatus } from '@kelpie/schemas'
 import { useState } from 'react'
+import type { FormEvent } from 'react'
 
 import { useDeals } from '../api/resources/deals.ts'
+import { useEnquiries } from '../api/resources/enquiries.ts'
 import { useMembers } from '../api/resources/members.ts'
 import { useOpportunities } from '../api/resources/opportunities.ts'
 import { usePartnerships } from '../api/resources/partnerships.ts'
-import { MAX_PAGE_SIZE, usePlanItems } from '../api/resources/planItems.ts'
+import {
+  MAX_PAGE_SIZE,
+  useCreatePlanItem,
+  usePlanItems,
+} from '../api/resources/planItems.ts'
 import { useRaises } from '../api/resources/raises.ts'
 import { Chip } from '../components/Chip.tsx'
 import { PageHeader } from '../components/PageHeader.tsx'
 import { PlanTargetLink } from '../components/PlanAttention.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'
@@ -23,6 +35,9 @@ import { monthBounds, planStatusTone, todayIso } from '../lib/plan.ts'
  * upcoming and pages through it; the calendar wants one month, which is what
  * `?from=` and `?to=` are for, so moving between months is a request rather than
  * a filter over rows the page happens to hold.
+ *
+ * Adding a plan item lives here as well as on each record's Plan panel: the page
+ * is the workspace-wide view of the same resource, so create belongs here too.
  */
 
 type ViewMode = 'list' | 'calendar'
@@ -35,15 +50,27 @@ const CELL_ITEM_LIMIT = 3
 
 const MONTH_AND_YEAR = new Intl.DateTimeFormat(undefined, { month: 'long', year: 'numeric' })
 
+const inputClass =
+  'h-9 w-full rounded-md border border-border bg-surface-raised px-2.5 text-[13px] outline-none focus:border-accent'
+
+interface PipelineTarget {
+  readonly id: string
+  readonly name: string
+}
+
 export function PlanningPage(): React.JSX.Element {
   const [view, setView] = useState<ViewMode>('list')
   const [typeFilter, setTypeFilter] = useState<TypeFilter>('all')
+  const [adding, setAdding] = useState(false)
   const [month, setMonth] = useState(() => {
     const now = new Date()
 
     return { year: now.getFullYear(), month: now.getMonth() }
   })
 
+  const targets = usePipelineTargets()
+  const createItem = useCreatePlanItem()
+
   const typeQuery = typeFilter === 'all' ? {} : { targetType: typeFilter }
   // A month is a bounded question, so the calendar asks for it at the largest
   // page size and draws the answer whole. The list pages the ordinary way.
@@ -65,6 +92,10 @@ export function PlanningPage(): React.JSX.Element {
     <div className="animate-fade-in">
       <PageHeader
         title="Planning"
+        onAdd={() => {
+          setAdding((current) => !current)
+        }}
+        addLabel="Add plan item"
         actions={
           <>
             <label className="sr-only" htmlFor="plan-type-filter">
@@ -98,6 +129,33 @@ export function PlanningPage(): React.JSX.Element {
         }
       />
 
+      {adding && (
+        <AddPlanItemForm
+          initialTargetType={typeFilter === 'all' ? 'deal' : typeFilter}
+          targetsByKind={targets.byKind}
+          isPending={createItem.isPending}
+          error={createItem.error}
+          onCancel={() => {
+            setAdding(false)
+          }}
+          onSubmit={(fields) => {
+            createItem
+              .runAsync({
+                targetType: fields.targetType,
+                targetId: fields.targetId,
+                date: fields.date,
+                title: fields.title,
+                ownerId: fields.ownerId.length === 0 ? null : fields.ownerId,
+                status: fields.status,
+              })
+              .then(() => {
+                setAdding(false)
+              })
+              .catch(() => undefined)
+          }}
+        />
+      )}
+
       {view === 'calendar' && (
         <div className="mb-4 flex items-center gap-2">
           <button
@@ -131,47 +189,219 @@ export function PlanningPage(): React.JSX.Element {
       ) : items.isLoading ? (
         <LoadingPanel label="Loading plan…" />
       ) : view === 'list' ? (
-        <PlanList items={items.records} />
+        <>
+          <Paginator list={items} placement="top" />
+          <PlanList items={items.records} targetNames={targets.nameById} />
+        </>
       ) : (
         <PlanCalendar year={month.year} month={month.month} items={items.records} />
       )}
 
-      {items.hasMore && (
-        <button
-          type="button"
-          onClick={items.loadMore}
-          disabled={items.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"
-        >
-          {items.isLoadingMore ? 'Loading…' : 'Load more'}
-        </button>
-      )}
+      {view === 'list' && <Paginator list={items} />}
     </div>
   )
 }
 
 /**
- * Names for the records the loaded items point at.
- *
- * The directory is one page per pipeline, matching the Deal contacts precedent:
- * past it a row still says what kind of record it belongs to.
+ * Pipeline records the add form can attach to, and the name map the list uses
+ * for PlanTargetLink. One page per kind, same ceiling as the rest of Planning.
  */
-function useTargetNames(): ReadonlyMap<string, string> {
-  const deals = useDeals({ limit: 200 })
-  const opportunities = useOpportunities({ limit: 200 })
-  const raises = useRaises({ limit: 200 })
-  const partnerships = usePartnerships({ limit: 200 })
-
-  return new Map(
-    [...deals.records, ...opportunities.records, ...raises.records, ...partnerships.records].map(
-      (record) => [record.id, record.name],
+function usePipelineTargets(): {
+  readonly byKind: Readonly<Record<PipelineKind, readonly PipelineTarget[]>>
+  readonly nameById: ReadonlyMap<string, string>
+} {
+  const deals = useDeals({ limit: MAX_PAGE_SIZE })
+  const opportunities = useOpportunities({ limit: MAX_PAGE_SIZE })
+  const raises = useRaises({ limit: MAX_PAGE_SIZE })
+  const partnerships = usePartnerships({ limit: MAX_PAGE_SIZE })
+  const enquiries = useEnquiries({ limit: MAX_PAGE_SIZE })
+
+  const byKind: Readonly<Record<PipelineKind, readonly PipelineTarget[]>> = {
+    enquiry: enquiries.records.map((record) => ({ id: record.id, name: record.name })),
+    deal: deals.records.map((record) => ({ id: record.id, name: record.name })),
+    opportunity: opportunities.records.map((record) => ({ id: record.id, name: record.name })),
+    raise: raises.records.map((record) => ({ id: record.id, name: record.name })),
+    partnership: partnerships.records.map((record) => ({ id: record.id, name: record.name })),
+  }
+
+  return {
+    byKind,
+    nameById: new Map(
+      Object.values(byKind)
+        .flat()
+        .map((record) => [record.id, record.name]),
     ),
+  }
+}
+
+interface AddPlanItemFields {
+  readonly targetType: PipelineKind
+  readonly targetId: string
+  readonly date: string
+  readonly title: string
+  readonly ownerId: string
+  readonly status: PlanItemStatus
+}
+
+function AddPlanItemForm({
+  initialTargetType,
+  targetsByKind,
+  isPending,
+  error,
+  onSubmit,
+  onCancel,
+}: {
+  readonly initialTargetType: PipelineKind
+  readonly targetsByKind: Readonly<Record<PipelineKind, readonly PipelineTarget[]>>
+  readonly isPending: boolean
+  readonly error: Error | null
+  readonly onSubmit: (fields: AddPlanItemFields) => void
+  readonly onCancel: () => void
+}): React.JSX.Element {
+  const members = useMembers()
+  const [draft, setDraft] = useState<AddPlanItemFields>({
+    targetType: initialTargetType,
+    targetId: '',
+    date: todayIso(),
+    title: '',
+    ownerId: '',
+    status: 'todo',
+  })
+
+  const targets = targetsByKind[draft.targetType]
+
+  function submit(event: FormEvent): void {
+    event.preventDefault()
+
+    const title = draft.title.trim()
+
+    if (title.length === 0 || draft.date.length === 0 || draft.targetId.length === 0) {
+      return
+    }
+
+    onSubmit({ ...draft, title })
+  }
+
+  return (
+    <form onSubmit={submit} className="mb-4 space-y-3 rounded-md border border-border p-3">
+      <div className="grid grid-cols-1 gap-2 sm:grid-cols-[11rem_minmax(0,1fr)]">
+        <select
+          value={draft.targetType}
+          onChange={(event) => {
+            const targetType = event.target.value as PipelineKind
+
+            setDraft((current) => ({ ...current, targetType, targetId: '' }))
+          }}
+          aria-label="Record type"
+          className={inputClass}
+        >
+          {PIPELINE_KINDS.map((kind) => (
+            <option key={kind} value={kind}>
+              {PIPELINE_KIND_LABELS[kind]}
+            </option>
+          ))}
+        </select>
+        <select
+          value={draft.targetId}
+          onChange={(event) => {
+            setDraft((current) => ({ ...current, targetId: event.target.value }))
+          }}
+          required
+          aria-label="Record"
+          className={inputClass}
+        >
+          <option value="">{targets.length === 0 ? 'No records' : 'Select…'}</option>
+          {targets.map((target) => (
+            <option key={target.id} value={target.id}>
+              {target.name}
+            </option>
+          ))}
+        </select>
+
+        <input
+          type="date"
+          value={draft.date}
+          onChange={(event) => {
+            setDraft((current) => ({ ...current, date: event.target.value }))
+          }}
+          required
+          aria-label="Date"
+          className={inputClass}
+        />
+        <input
+          value={draft.title}
+          onChange={(event) => {
+            setDraft((current) => ({ ...current, title: event.target.value }))
+          }}
+          placeholder="What happens…"
+          required
+          autoFocus
+          aria-label="What happens"
+          className={inputClass}
+        />
+
+        <select
+          value={draft.ownerId}
+          onChange={(event) => {
+            setDraft((current) => ({ ...current, ownerId: event.target.value }))
+          }}
+          aria-label="Owner"
+          className={inputClass}
+        >
+          <option value="">Unassigned</option>
+          {members.members.map((member) => (
+            <option key={member.id} value={member.id}>
+              {member.name}
+            </option>
+          ))}
+        </select>
+        <select
+          value={draft.status}
+          onChange={(event) => {
+            setDraft((current) => ({
+              ...current,
+              status: event.target.value as PlanItemStatus,
+            }))
+          }}
+          aria-label="Status"
+          className={inputClass}
+        >
+          {PLAN_ITEM_STATUSES.map((status) => (
+            <option key={status} value={status}>
+              {PLAN_ITEM_STATUS_LABELS[status]}
+            </option>
+          ))}
+        </select>
+      </div>
+      {error !== null && <ErrorPanel error={error} />}
+      <div className="flex justify-end gap-2">
+        <button
+          type="button"
+          onClick={onCancel}
+          className="rounded-md px-2.5 py-1.5 text-[12px] font-medium text-ink-muted hover:text-ink"
+        >
+          Cancel
+        </button>
+        <button
+          type="submit"
+          disabled={isPending || targets.length === 0}
+          className="h-9 rounded-md bg-accent px-3 text-[12px] font-semibold text-accent-fg hover:bg-accent-hover disabled:opacity-50"
+        >
+          {isPending ? 'Adding…' : 'Add'}
+        </button>
+      </div>
+    </form>
   )
 }
 
-function PlanList({ items }: { readonly items: readonly PlanItem[] }): React.JSX.Element {
+function PlanList({
+  items,
+  targetNames,
+}: {
+  readonly items: readonly PlanItem[]
+  readonly targetNames: ReadonlyMap<string, string>
+}): React.JSX.Element {
   const members = useMembers()
-  const targetNames = useTargetNames()
 
   if (items.length === 0) {
     return <p className="text-[13px] text-ink-faint">No plan items match this filter.</p>

package/src/pages/RaiseDetail.tsx

@@ -18,7 +18,10 @@ 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 { 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'
@@ -59,6 +62,7 @@ export function RaiseDetail(): React.JSX.Element {
   const { record, isLoading, isNotFound, error } = useRaise(id)
   const deleteRaise = useDeleteRaise()
   const moduleTabs = inSlotOrder(useRecordTabs('raise'))
+  const hasCustomFields = useHasCustomFields('raise')
   const [activeTab, setActiveTab] = useState('overview')
 
   if (isNotFound) {
@@ -75,10 +79,12 @@ export function RaiseDetail(): 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' },
     ...moduleTabs.map((tab) => ({ id: tab.id, label: tab.label })),
   ]
   const active = tabs.some((tab) => tab.id === activeTab) ? activeTab : 'overview'
@@ -115,10 +121,12 @@ export function RaiseDetail(): React.JSX.Element {
 
           <RecordTabs tabs={tabs} active={active} onChange={setActiveTab} ariaLabel="Raise sections">
             {active === 'overview' && <RaiseOverview raise={record} />}
+            {active === 'fields' && <RaiseFields raise={record} />}
             {active === 'plan' && <PlanPanel targetType="raise" targetId={record.id} />}
             {active === 'activity' && <ActivitiesPanel targetType="raise" targetId={record.id} />}
             {active === 'notes' && <NotesPanel targetType="raise" targetId={record.id} />}
             {active === 'decisions' && <DecisionsPanel targetType="raise" targetId={record.id} />}
+            {active === 'lists' && <ListsPanel targetType="raise" targetId={record.id} />}
             {moduleTab?.render({ objectType: 'raise', recordId: record.id })}
           </RecordTabs>
         </div>
@@ -381,6 +389,22 @@ function RaiseSidebar({ raise }: { readonly raise: Raise }): React.JSX.Element {
   )
 }
 
+function RaiseFields({ raise }: { readonly raise: Raise }): React.JSX.Element {
+  const { patch, error } = useRaisePatch(raise)
+  return (
+    <div className="space-y-4">
+      {error !== null && <ErrorPanel error={error} />}
+      <CustomFieldsPanel
+        objectType="raise"
+        values={raise.customFields}
+        onPatch={(customFields) => {
+          patch({ customFields })
+        }}
+      />
+    </div>
+  )
+}
+
 /** The key people on the raise, linked and unlinked by replacing `person_ids`. */
 function RaiseKeyPeople({ raise }: { readonly raise: Raise }): React.JSX.Element {
   const { patch, error } = useRaisePatch(raise)

package/src/pages/RoleDetail.tsx

@@ -15,6 +15,7 @@ import { Chip } from '../components/Chip.tsx'
 import { DeleteRecord } from '../components/DeleteRecord.tsx'
 import { EntitySearch } from '../components/EntitySearch.tsx'
 import { InlineEdit } from '../components/InlineEdit.tsx'
+import { Paginator } from '../components/Paginator.tsx'
 import { ErrorPanel, LoadingPanel, NotFoundPanel } from '../components/QueryState.tsx'
 import { SectionHeader } from '../components/SectionHeader.tsx'
 import {
@@ -240,34 +241,28 @@ function RoleCandidates({ role }: { readonly role: Role }): React.JSX.Element {
       ) : candidates.records.length === 0 && !adding ? (
         <p className="text-[13px] text-ink-faint">No candidates yet.</p>
       ) : (
-        <ul className="overflow-hidden rounded-md border border-border">
-          {candidates.records.map((candidate) => (
-            <CandidateRow
-              key={candidate.id}
-              candidate={candidate}
-              personName={names.nameFor(candidate.personId)}
-              referrerName={
-                candidate.referrerPersonId === null
-                  ? undefined
-                  : names.nameFor(candidate.referrerPersonId)
-              }
-              note={notes.noteFor(candidate.id)}
-              noteResolved={notes.isComplete || notes.noteFor(candidate.id) !== undefined}
-            />
-          ))}
-        </ul>
+        <>
+          <Paginator list={candidates} placement="top" />
+          <ul className="rounded-md border border-border">
+            {candidates.records.map((candidate) => (
+              <CandidateRow
+                key={candidate.id}
+                candidate={candidate}
+                personName={names.nameFor(candidate.personId)}
+                referrerName={
+                  candidate.referrerPersonId === null
+                    ? undefined
+                    : names.nameFor(candidate.referrerPersonId)
+                }
+                note={notes.noteFor(candidate.id)}
+                noteResolved={notes.isComplete || notes.noteFor(candidate.id) !== undefined}
+              />
+            ))}
+          </ul>
+        </>
       )}
 
-      {candidates.hasMore && (
-        <button
-          type="button"
-          onClick={candidates.loadMore}
-          disabled={candidates.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"
-        >
-          {candidates.isLoadingMore ? 'Loading…' : 'Load more'}
-        </button>
-      )}
+      <Paginator list={candidates} />
     </section>
   )
 }

package/src/pages/SearchPage.tsx

@@ -19,6 +19,7 @@ const COLLECTIONS: Readonly<Record<SearchCollection, { label: string; path: (id:
   person: { label: 'People', path: (id) => `/people/${id}` },
   role: { label: 'Roles', path: (id) => `/hiring/${id}` },
   company: { label: 'Companies', path: (id) => `/companies/${id}` },
+  enquiry: { label: 'Enquiries', path: (id) => `/enquiries/${id}` },
   deal: { label: 'Deals', path: (id) => `/deals/${id}` },
   opportunity: { label: 'Opportunities', path: (id) => `/opportunities/${id}` },
   raise: { label: 'Fundraising', path: (id) => `/fundraising/${id}` },