feat: AI assistant (HartBOT), demand filling, budget-per-role, project favorites, and UX improvements

AI Assistant (HartBOT):
- Chat panel with inline layout, session persistence, message history (up-arrow recall)
- OpenAI function calling with 20+ tools (search, navigate, create/cancel allocations, update status)
- RBAC-aware tool filtering, fuzzy search with word-level matching
- Navigation actions (router.push) and data invalidation after mutations
- Country/metro city/org unit/role filtering on resource search

Demand Filling Enhancements:
- Two-phase fill modal: plan multiple resources, then confirm & assign all at once
- Availability preview per resource (available/partial/conflict days, existing bookings)
- Coverage bar showing demand hours distribution across assigned resources
- Fill demand from project detail page (new Assign button per demand)
- Fixed: filled demands no longer shown on timeline, demand bars no longer overlap

Budget per Role:
- DemandRequirement.budgetCents field (schema + API + UI)
- Project wizard step 3: budget input per role with allocation summary bar
- Project detail: allocated vs booked budget per demand
- Fill demand modal: role budget display with cost estimates
- AllocationModal: budget field for demand editing

Project Favorites:
- User.favoriteProjectIds (JSONB) with toggle API
- Star button on projects list and detail page (optimistic updates)
- "My Projects" dashboard widget (favorites + responsible person projects)

Project Management:
- Edit project from detail page (ProjectModal integration)
- Edit demands from detail page (AllocationModal integration)
- Admin-only project deletion (cascades assignments + demands)
- Create user accounts from admin panel

Timeline Fixes:
- Country multi-select filter with backend support
- URL param sync for same-page navigation (AI assistant integration)
- Demand lane stacking (no more overlapping bars)
- Single-day booking resize handles (always visible, min 6px)
- Single-day resize allowed (start === end)
- "All Clients" toggle (select all / deselect all)

Other Fixes:
- crypto.randomUUID fallback for non-secure contexts
- Chat message limit raised (200 max, client sends last 40)
- Status dropdown portal (no longer clipped by table overflow)
- Cents display restored in budget views (2 decimal places)
- Allocations grouped view with project sub-groups (collapsed by default)
- Server-side resource search for project wizard (no 500 limit)

Co-Authored-By: claude-flow <ruv@ruv.net>
This commit is contained in:
2026-03-16 15:31:48 +01:00
parent f5551e33c7
commit b0e55786c3
44 changed files with 4516 additions and 609 deletions
@@ -1,6 +1,6 @@
"use client";
import { useState, useEffect, useMemo } from "react";
import { useState, useEffect, useMemo, useCallback } from "react";
import { formatDate } from "~/lib/format.js";
import { trpc } from "~/lib/trpc/client.js";
import { AllocationModal } from "./AllocationModal.js";
@@ -22,6 +22,11 @@ import { useViewPrefs } from "~/hooks/useViewPrefs.js";
import { getPlanningEntryMutationId } from "~/lib/planningEntryIds.js";
import { ALLOCATION_STATUS_BADGE as STATUS_BADGE } from "~/lib/status-styles.js";
/** Fragment wrapper for grouped rows — avoids unnecessary DOM nodes */
function GroupRows({ children }: { children: React.ReactNode }) {
return <>{children}</>;
}
const ALL_ALLOC_STATUSES = [
{ value: "PROPOSED", label: "Proposed" },
{ value: "CONFIRMED", label: "Confirmed" },
@@ -168,6 +173,146 @@ export function AllocationsClient() {
[allocationMutationIdsByDisplayId, selection.selectedArray],
);
// ─── View mode: grouped (default) vs flat ──────────────────────────────────
const [viewMode, setViewMode] = useState<"grouped" | "flat">(() => {
if (typeof window === "undefined") return "grouped";
return (localStorage.getItem("planarchy:allocations:viewMode") as "grouped" | "flat") ?? "grouped";
});
const [collapsedGroups, setCollapsedGroups] = useState<Set<string> | "all">("all");
// Track expanded project sub-groups: key = "resourceId::projectId"
const [expandedSubGroups, setExpandedSubGroups] = useState<Set<string>>(new Set());
const toggleViewMode = useCallback(() => {
setViewMode((prev) => {
const next = prev === "grouped" ? "flat" : "grouped";
localStorage.setItem("planarchy:allocations:viewMode", next);
return next;
});
}, []);
type ProjectSubGroup = {
projectId: string;
projectName: string;
projectCode: string;
allocations: AllocationWithDetails[];
typicalHoursPerDay: number;
earliestStart: Date;
latestEnd: Date;
};
type AllocGroup = {
resourceId: string;
resourceName: string;
eid: string;
chapter: string | null;
allocations: AllocationWithDetails[];
projectSubGroups: ProjectSubGroup[];
};
const groups = useMemo<AllocGroup[]>(() => {
const map = new Map<string, AllocGroup>();
for (const alloc of sorted) {
const rid = alloc.resource?.id ?? "__unassigned__";
let group = map.get(rid);
if (!group) {
group = {
resourceId: rid,
resourceName: alloc.resource?.displayName ?? "Unassigned",
eid: alloc.resource?.eid ?? "",
chapter: (alloc.resource as { chapter?: string | null } | undefined)?.chapter ?? null,
allocations: [],
projectSubGroups: [],
};
map.set(rid, group);
}
group.allocations.push(alloc);
}
// Build project sub-groups within each person group
for (const group of map.values()) {
const projMap = new Map<string, AllocationWithDetails[]>();
for (const alloc of group.allocations) {
const pid = alloc.project?.id ?? "__no_project__";
let list = projMap.get(pid);
if (!list) { list = []; projMap.set(pid, list); }
list.push(alloc);
}
group.projectSubGroups = [...projMap.entries()].map(([pid, allocs]) => {
const first = allocs[0]!;
let earliest = new Date(first.startDate);
let latest = new Date(first.endDate);
// Find the most common hoursPerDay value across allocations
const hpdCounts = new Map<number, number>();
for (const a of allocs) {
const s = new Date(a.startDate);
const e = new Date(a.endDate);
if (s < earliest) earliest = s;
if (e > latest) latest = e;
hpdCounts.set(a.hoursPerDay, (hpdCounts.get(a.hoursPerDay) ?? 0) + 1);
}
// Pick the most frequent hoursPerDay; fall back to first
let typicalH = first.hoursPerDay;
let maxCount = 0;
for (const [h, count] of hpdCounts) {
if (count > maxCount) { typicalH = h; maxCount = count; }
}
return {
projectId: pid,
projectName: first.project?.name ?? "Unknown",
projectCode: first.project?.shortCode ?? "",
allocations: allocs,
typicalHoursPerDay: typicalH,
earliestStart: earliest,
latestEnd: latest,
};
});
group.projectSubGroups.sort((a, b) => a.projectName.localeCompare(b.projectName));
}
const arr = [...map.values()];
arr.sort((a, b) => {
if (a.resourceId === "__unassigned__") return 1;
if (b.resourceId === "__unassigned__") return -1;
return a.resourceName.localeCompare(b.resourceName);
});
return arr;
}, [sorted]);
const groupIds = useMemo(() => groups.map((g) => g.resourceId), [groups]);
const toggleGroup = useCallback((resourceId: string) => {
setCollapsedGroups((prev) => {
// "all" → expand just this one (materialize all IDs minus clicked)
if (prev === "all") {
const next = new Set(groupIds);
next.delete(resourceId);
return next;
}
const next = new Set(prev);
if (next.has(resourceId)) next.delete(resourceId);
else next.add(resourceId);
return next;
});
}, [groupIds]);
const collapseAll = useCallback(() => {
setCollapsedGroups("all");
}, []);
const expandAll = useCallback(() => {
setCollapsedGroups(new Set());
}, []);
const toggleSubGroup = useCallback((resourceId: string, projectId: string) => {
const key = `${resourceId}::${projectId}`;
setExpandedSubGroups((prev) => {
const next = new Set(prev);
if (next.has(key)) next.delete(key);
else next.add(key);
return next;
});
}, []);
function handleSort(field: string) {
if (field === "resource") {
toggle("resource", (a) => a.resource?.displayName ?? null);
@@ -213,6 +358,74 @@ export function AllocationsClient() {
const singleDeletePending = deleteDemandMutation.isPending || deleteAssignmentMutation.isPending;
// colSpan for empty/loading states: checkbox + visible columns + actions
const totalColSpan = 1 + visibleColumns.length + 1;
function renderAllocRow(alloc: AllocationWithDetails, isGrouped = false) {
const isSelected = selection.selectedIds.has(alloc.id);
return (
<tr key={alloc.id} className={`transition-colors hover:bg-gray-50/80 dark:hover:bg-gray-900/60 ${isSelected ? "bg-brand-50 dark:bg-brand-900/20" : ""}`}>
<td className="px-4 py-3">
<input
type="checkbox"
checked={isSelected}
onChange={() => selection.toggle(alloc.id)}
className="rounded border-gray-300 dark:border-gray-600"
/>
</td>
{visibleColumns.map((col) => {
switch (col.key) {
case "resource":
return (
<td key={col.key} className="px-4 py-3 text-sm font-medium text-gray-900 dark:text-gray-100">
{isGrouped ? <span className="text-gray-400 dark:text-gray-500"></span> : (alloc.resource?.displayName ?? "—")}
</td>
);
case "project":
return (
<td key={col.key} className="px-4 py-3 text-sm text-gray-600 dark:text-gray-300">
{alloc.project ? (
<><span className="font-mono text-xs">{alloc.project.shortCode}</span> {alloc.project.name}</>
) : "—"}
</td>
);
case "role":
return <td key={col.key} className="px-4 py-3 text-sm text-gray-600 dark:text-gray-300">{alloc.role}</td>;
case "dates":
return <td key={col.key} className="whitespace-nowrap px-4 py-3 text-xs text-gray-500 dark:text-gray-400">{formatPeriod(alloc)}</td>;
case "hoursPerDay":
return <td key={col.key} className="px-4 py-3 text-sm text-gray-900 dark:text-gray-100">{alloc.hoursPerDay}h</td>;
case "cost":
return <td key={col.key} className="px-4 py-3 text-sm text-gray-900 dark:text-gray-100">{(alloc.dailyCostCents / 100).toFixed(0)} </td>;
case "status":
return (
<td key={col.key} className="px-4 py-3">
<span className={`inline-block px-2 py-0.5 text-xs rounded-full font-medium ${STATUS_BADGE[alloc.status] ?? "bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-400"}`}>
{alloc.status}
</span>
</td>
);
default:
return <td key={col.key} className="px-4 py-3 text-sm text-gray-500 dark:text-gray-400"></td>;
}
})}
<td className="px-4 py-3">
<div className="flex items-center justify-end gap-2">
<button type="button" onClick={() => openEdit(alloc)} className="text-xs font-medium text-blue-600 hover:text-blue-800 hover:underline dark:text-blue-300 dark:hover:text-blue-200">Edit</button>
<button
type="button"
onClick={() => setConfirmDelete({ single: alloc })}
disabled={singleDeletePending}
className="text-xs font-medium text-red-500 hover:text-red-700 hover:underline disabled:opacity-50 dark:text-red-300 dark:hover:text-red-200"
>
Delete
</button>
</div>
</td>
</tr>
);
}
return (
<div className="app-page space-y-5 pb-24">
<div className="app-page-header gap-4">
@@ -311,6 +524,42 @@ export function AllocationsClient() {
onSetVisible={setVisible}
defaultKeys={defaultKeys}
/>
{/* View mode toggle */}
<div className="flex items-center rounded-lg border border-gray-300 dark:border-gray-600 overflow-hidden">
<button
type="button"
onClick={toggleViewMode}
title="Grouped by person"
className={`px-2.5 py-2 text-sm transition-colors ${viewMode === "grouped" ? "bg-brand-600 text-white" : "bg-white text-gray-600 hover:bg-gray-50 dark:bg-gray-900 dark:text-gray-300 dark:hover:bg-gray-800"}`}
>
<svg className="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0z" />
</svg>
</button>
<button
type="button"
onClick={toggleViewMode}
title="Flat list"
className={`px-2.5 py-2 text-sm transition-colors ${viewMode === "flat" ? "bg-brand-600 text-white" : "bg-white text-gray-600 hover:bg-gray-50 dark:bg-gray-900 dark:text-gray-300 dark:hover:bg-gray-800"}`}
>
<svg className="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 6h16M4 10h16M4 14h16M4 18h16" />
</svg>
</button>
</div>
{viewMode === "grouped" && groups.length > 1 && (
<div className="flex items-center gap-1">
<button type="button" onClick={expandAll} className="text-xs text-brand-600 hover:text-brand-800 dark:text-brand-400 dark:hover:text-brand-200 whitespace-nowrap">
Expand all
</button>
<span className="text-gray-300 dark:text-gray-600">|</span>
<button type="button" onClick={collapseAll} className="text-xs text-brand-600 hover:text-brand-800 dark:text-brand-400 dark:hover:text-brand-200 whitespace-nowrap">
Collapse all
</button>
</div>
)}
</FilterBar>
{/* Filter chips */}
@@ -363,75 +612,128 @@ export function AllocationsClient() {
<tbody className="divide-y divide-gray-100 dark:divide-gray-800">
{isLoading && (
<tr>
<td colSpan={9} className="py-12 text-center text-sm text-gray-500 dark:text-gray-400">Loading allocations</td>
<td colSpan={totalColSpan} className="py-12 text-center text-sm text-gray-500 dark:text-gray-400">Loading allocations</td>
</tr>
)}
{!isLoading && sorted.length === 0 && (
<tr>
<td colSpan={9} className="py-12 text-center text-sm text-gray-500 dark:text-gray-400">No assignments found.</td>
<td colSpan={totalColSpan} className="py-12 text-center text-sm text-gray-500 dark:text-gray-400">No assignments found.</td>
</tr>
)}
{!isLoading &&
sorted.map((alloc) => {
const isSelected = selection.selectedIds.has(alloc.id);
{!isLoading && viewMode === "flat" &&
sorted.map((alloc) => renderAllocRow(alloc))}
{!isLoading && viewMode === "grouped" &&
groups.map((group) => {
const isCollapsed = collapsedGroups === "all" || collapsedGroups.has(group.resourceId);
const groupAllocIds = group.allocations.map((a) => a.id);
const allGroupSelected = selection.isAllSelected(groupAllocIds);
const groupIndeterminate = !allGroupSelected && groupAllocIds.some((id) => selection.selectedIds.has(id));
return (
<tr key={alloc.id} className={`transition-colors hover:bg-gray-50/80 dark:hover:bg-gray-900/60 ${isSelected ? "bg-brand-50 dark:bg-brand-900/20" : ""}`}>
<td className="px-4 py-3">
<input
type="checkbox"
checked={isSelected}
onChange={() => selection.toggle(alloc.id)}
className="rounded border-gray-300 dark:border-gray-600"
/>
</td>
{visibleColumns.map((col) => {
switch (col.key) {
case "resource":
return <td key={col.key} className="px-4 py-3 text-sm font-medium text-gray-900 dark:text-gray-100">{alloc.resource?.displayName ?? "—"}</td>;
case "project":
return (
<td key={col.key} className="px-4 py-3 text-sm text-gray-600 dark:text-gray-300">
{alloc.project ? (
<><span className="font-mono text-xs">{alloc.project.shortCode}</span> {alloc.project.name}</>
) : "—"}
</td>
);
case "role":
return <td key={col.key} className="px-4 py-3 text-sm text-gray-600 dark:text-gray-300">{alloc.role}</td>;
case "dates":
return <td key={col.key} className="whitespace-nowrap px-4 py-3 text-xs text-gray-500 dark:text-gray-400">{formatPeriod(alloc)}</td>;
case "hoursPerDay":
return <td key={col.key} className="px-4 py-3 text-sm text-gray-900 dark:text-gray-100">{alloc.hoursPerDay}h</td>;
case "cost":
return <td key={col.key} className="px-4 py-3 text-sm text-gray-900 dark:text-gray-100">{(alloc.dailyCostCents / 100).toFixed(0)} </td>;
case "status":
return (
<td key={col.key} className="px-4 py-3">
<span className={`inline-block px-2 py-0.5 text-xs rounded-full font-medium ${STATUS_BADGE[alloc.status] ?? "bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-400"}`}>
{alloc.status}
</span>
</td>
);
default:
return <td key={col.key} className="px-4 py-3 text-sm text-gray-500 dark:text-gray-400"></td>;
<GroupRows key={group.resourceId}>
{/* Group header */}
<tr
className="bg-gray-50 dark:bg-gray-800/50 cursor-pointer select-none hover:bg-gray-100 dark:hover:bg-gray-800/80 transition-colors"
onClick={() => toggleGroup(group.resourceId)}
onKeyDown={(e) => { if (e.key === "Enter" || e.key === " ") { e.preventDefault(); toggleGroup(group.resourceId); } }}
tabIndex={0}
role="button"
aria-expanded={!isCollapsed}
>
<td className="px-4 py-2.5" onClick={(e) => e.stopPropagation()}>
<input
type="checkbox"
checked={allGroupSelected}
ref={(el) => { if (el) el.indeterminate = groupIndeterminate; }}
onChange={() => selection.toggleAll(groupAllocIds)}
className="rounded border-gray-300 dark:border-gray-600"
/>
</td>
<td colSpan={visibleColumns.length + 1} className="px-4 py-2.5">
<div className="flex items-center gap-2">
<span className="text-gray-400 dark:text-gray-500 text-xs">
{isCollapsed ? "▸" : "▾"}
</span>
<span className="text-sm font-semibold text-gray-900 dark:text-gray-100">
{group.resourceName}
</span>
{group.eid && (
<span className="text-xs font-mono text-gray-400 dark:text-gray-500">
{group.eid}
</span>
)}
{group.chapter && (
<span className="text-xs text-gray-400 dark:text-gray-500">
· {group.chapter}
</span>
)}
<span className="inline-flex items-center rounded-full bg-gray-200 px-2 py-0.5 text-xs font-medium text-gray-600 dark:bg-gray-700 dark:text-gray-300">
{group.allocations.length}
</span>
</div>
</td>
</tr>
{/* Project sub-groups within person */}
{!isCollapsed && group.projectSubGroups.map((subGroup) => {
const subKey = `${group.resourceId}::${subGroup.projectId}`;
const isSubExpanded = expandedSubGroups.has(subKey);
// Single allocation for this project — render directly, no sub-group header
if (subGroup.allocations.length === 1) {
return <GroupRows key={subKey}>{renderAllocRow(subGroup.allocations[0]!, true)}</GroupRows>;
}
// Multiple allocations — show collapsible project sub-group
return (
<GroupRows key={subKey}>
<tr
className="bg-gray-25 dark:bg-gray-850/30 cursor-pointer select-none hover:bg-gray-100/60 dark:hover:bg-gray-800/40 transition-colors"
onClick={() => toggleSubGroup(group.resourceId, subGroup.projectId)}
tabIndex={0}
role="button"
aria-expanded={isSubExpanded}
onKeyDown={(e) => { if (e.key === "Enter" || e.key === " ") { e.preventDefault(); toggleSubGroup(group.resourceId, subGroup.projectId); } }}
>
<td className="px-4 py-2" onClick={(e) => e.stopPropagation()}>
<input
type="checkbox"
checked={selection.isAllSelected(subGroup.allocations.map((a) => a.id))}
ref={(el) => {
if (el) {
const ids = subGroup.allocations.map((a) => a.id);
el.indeterminate = !selection.isAllSelected(ids) && ids.some((id) => selection.selectedIds.has(id));
}
}}
onChange={() => selection.toggleAll(subGroup.allocations.map((a) => a.id))}
className="rounded border-gray-300 dark:border-gray-600"
/>
</td>
<td colSpan={visibleColumns.length + 1} className="px-4 py-2">
<div className="flex items-center gap-2 pl-4">
<span className="text-gray-400 dark:text-gray-500 text-xs">
{isSubExpanded ? "▾" : "▸"}
</span>
<span className="font-mono text-xs text-gray-400 dark:text-gray-500">{subGroup.projectCode}</span>
<span className="text-sm text-gray-700 dark:text-gray-300">{subGroup.projectName}</span>
<span className="text-xs text-gray-400 dark:text-gray-500">
{formatDate(subGroup.earliestStart)} {formatDate(subGroup.latestEnd)}
</span>
<span className="text-xs text-gray-500 dark:text-gray-400">
{subGroup.typicalHoursPerDay}h/day
</span>
<span className="inline-flex items-center rounded-full bg-gray-200 px-1.5 py-0.5 text-[10px] font-medium text-gray-500 dark:bg-gray-700 dark:text-gray-400">
{subGroup.allocations.length}
</span>
</div>
</td>
</tr>
{isSubExpanded && subGroup.allocations.map((alloc) => renderAllocRow(alloc, true))}
</GroupRows>
);
})}
<td className="px-4 py-3">
<div className="flex items-center justify-end gap-2">
<button type="button" onClick={() => openEdit(alloc)} className="text-xs font-medium text-blue-600 hover:text-blue-800 hover:underline dark:text-blue-300 dark:hover:text-blue-200">Edit</button>
<button
type="button"
onClick={() => setConfirmDelete({ single: alloc })}
disabled={singleDeletePending}
className="text-xs font-medium text-red-500 hover:text-red-700 hover:underline disabled:opacity-50 dark:text-red-300 dark:hover:text-red-200"
>
Delete
</button>
</div>
</td>
</tr>
</GroupRows>
);
})}
</tbody>