Pivot to text-first column-stack workspace + merge-with-review across AI artifacts
Workspace - Pivot from "set of open panes" to a Finder-style miller column stack: TopBar / LeftSidebar / [section → entity → entity ...] / pinned text editor. openPanesStore is now an ordered Column[] with pushFrom / closeFrom / setStack; only one top-level section is rooted at a time. - New entity column panes: Term, Block, Association, Constraint, Requirement, Finding. Click-through navigation truncates deeper columns automatically. - LeftSidebar surfaces a pending-count chip per section (single-glance navigation cue) and spins its analyze ↻ via SVG Spinner whenever the LLM is working — including server-initiated runs caught by the runs poll, not just user-triggered ones. Analyze pipeline + persistence - Unified `concepts` pass (taxonomy + glossary in one LLM call) replaces the two-pass setup. Server still accepts ?section=taxonomy|glossary and normalizes them for back-compat. - model / requirements / detection (assumptions, risks, inconsistencies) + cross-layer validation rules (X1–X4: stale term link, unlinked formalism, undefined linked term, prose-only term). - Persistence: NarrativeDocument, ModelSnapshot, ChangelogEntry, TaxonomyTerm, RequirementEntry, Finding, AnalysisRun. Re-runs MERGE instead of replace: gentle update on existing items, suggested on new, deprecated on missing — same idiom for every artifact kind. User pins preserve "kept" decisions across re-analyses. - Migrations: pivot_text_first, add_requirement_linked_term, term_review_state, review_state_for_reqs_and_findings, add_term_definition_pinned. Concept ↔ ontology integration - linkedTermId on Block / Association / Constraint / Requirement. PromoteToolbar lets the user formalize a concept inline: + Block / + Association / + Constraint / + Requirement, all routed through applyOps so undo/redo and SSE work for free. - decideElement op for in-canvas keep/discard on review-pending model elements. User-authored definitions - TermColumn definition is click-to-edit. Save (Cmd-Enter / blur), Cancel (Esc), Reset to AI suggestion when pinned. - definitionPinned flag on TaxonomyTerm: future Analyze runs leave the user's text alone. setTermDefinition repo function + POST /api/projects/[id]/terms/[termId]/definition endpoint. - mergeTaxonomySuggestion + applyGlossaryDefinitions both pin-aware. UX/UI - StatusChip: single component for all state idioms (suggested, deprecated, accepted, dismissed, resolved, severity, validation code, confidence, warn). Replaces 5+ ad-hoc badge classes. - PaneControls (PaneViewTabs + PaneFilterChip): separates view-mode toggles from filter chips so toggling Pending no longer flips you off the current view. - PaneEmpty: unified empty-state with title + hint + action. - PaneDrawer: collapsible groups for Pending / Discarded review; cards group as Kept (top) → Pending (bottom drawer) → Discarded (Findings only, hidden when empty). Restore action recovers dismissed/resolved findings. - ConceptCard unifies Tree and A–Z views in Concepts; only Tree parents carry the chevron (no empty placeholder offset). - Type + spacing tokens (--text-xs..xl, --space-1..6, --lh-tight/ui/ prose, --radius-*) replace every ad-hoc value. - Buttons standardized to body sans 500 (was a mishmash of mono / display). - Card shells unified across Concepts / Requirements / Findings. Cleanup - Removed: LeftRail, FindingsPanel, IssuesPanel, SocratesDock, ProposalCard, SlashMenu, SlashExtension, slashSuggestion, CanvasHeader, TaxonomyPane, GlossaryPane, TermDetail (popover; now TermColumn). - Section ids in openPanesStore: dropped taxonomy/glossary, added concepts. localStorage migration runs on hydrate. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -56,7 +56,7 @@ import {
|
||||
type ModelOp,
|
||||
} from "../../lib/sync/ops";
|
||||
import type { ValidationIssue } from "../../lib/sysml/validate";
|
||||
import type { Density } from "../socrates/SocratesDock";
|
||||
import type { Density } from "../../lib/workspace/types";
|
||||
import type { FixtureData, BlockKind } from "../../lib/fixtures/aristotle";
|
||||
import type { Block, Property, PropertyType, SysMLModel } from "../../lib/sysml/model";
|
||||
|
||||
@@ -69,6 +69,8 @@ interface DiagramCanvasProps {
|
||||
focusBlockId: string | null;
|
||||
onSelect?: (id: string | null) => void;
|
||||
issuesByElement?: Map<string, ValidationIssue[]>;
|
||||
/** When set, term-drop on the canvas links the chosen term server-side. */
|
||||
projectId?: string;
|
||||
}
|
||||
|
||||
const nodeTypes = { sysmlBlock: BlockNode };
|
||||
@@ -93,7 +95,7 @@ export function DiagramCanvas(props: DiagramCanvasProps) {
|
||||
);
|
||||
}
|
||||
|
||||
function DiagramInner({ data, focusBlockId, onSelect, issuesByElement }: DiagramCanvasProps) {
|
||||
function DiagramInner({ data, focusBlockId, onSelect, issuesByElement, projectId }: DiagramCanvasProps) {
|
||||
const model = useModel();
|
||||
const apply = useApply();
|
||||
const wrapperRef = useRef<HTMLDivElement | null>(null);
|
||||
@@ -130,14 +132,29 @@ function DiagramInner({ data, focusBlockId, onSelect, issuesByElement }: Diagram
|
||||
const dataChanged =
|
||||
existing.data?.label !== b.label ||
|
||||
existing.data?.kind !== b.kind ||
|
||||
!sameStringArray(existing.data?.properties ?? [], propNames);
|
||||
!sameStringArray(existing.data?.properties ?? [], propNames) ||
|
||||
existing.data?.reviewStatus !== b.reviewStatus;
|
||||
if (dataChanged) {
|
||||
next.push({ ...existing, data: { ...existing.data, label: b.label, kind: b.kind, properties: propNames } });
|
||||
next.push({
|
||||
...existing,
|
||||
data: {
|
||||
...existing.data,
|
||||
label: b.label,
|
||||
kind: b.kind,
|
||||
properties: propNames,
|
||||
reviewStatus: b.reviewStatus,
|
||||
},
|
||||
});
|
||||
} else {
|
||||
next.push(existing);
|
||||
}
|
||||
} else {
|
||||
next.push({ ...makeNodeForBlock(b), position: placeNew() });
|
||||
const created = makeNodeForBlock(b);
|
||||
next.push({
|
||||
...created,
|
||||
position: placeNew(),
|
||||
data: { ...created.data, reviewStatus: b.reviewStatus },
|
||||
});
|
||||
}
|
||||
}
|
||||
for (const c of model.constraints) {
|
||||
@@ -146,14 +163,30 @@ function DiagramInner({ data, focusBlockId, onSelect, issuesByElement }: Diagram
|
||||
const expr = c.expression || "{ }";
|
||||
const dataChanged =
|
||||
existing.data?.label !== c.label ||
|
||||
existing.data?.expression !== expr;
|
||||
existing.data?.expression !== expr ||
|
||||
existing.data?.reviewStatus !== c.reviewStatus;
|
||||
if (dataChanged) {
|
||||
next.push({ ...existing, data: { ...existing.data, label: c.label, kind: "constraint", properties: [], expression: expr } });
|
||||
next.push({
|
||||
...existing,
|
||||
data: {
|
||||
...existing.data,
|
||||
label: c.label,
|
||||
kind: "constraint",
|
||||
properties: [],
|
||||
expression: expr,
|
||||
reviewStatus: c.reviewStatus,
|
||||
},
|
||||
});
|
||||
} else {
|
||||
next.push(existing);
|
||||
}
|
||||
} else {
|
||||
next.push({ ...makeNodeForConstraint(c), position: placeNew() });
|
||||
const created = makeNodeForConstraint(c);
|
||||
next.push({
|
||||
...created,
|
||||
position: placeNew(),
|
||||
data: { ...created.data, reviewStatus: c.reviewStatus },
|
||||
});
|
||||
}
|
||||
}
|
||||
return next;
|
||||
@@ -295,9 +328,47 @@ function DiagramInner({ data, focusBlockId, onSelect, issuesByElement }: Diagram
|
||||
const onDrop = useCallback(
|
||||
(event: React.DragEvent) => {
|
||||
event.preventDefault();
|
||||
const position = screenToFlowPosition({ x: event.clientX, y: event.clientY });
|
||||
|
||||
// Taxonomy/glossary term drop → block stamped from the term.
|
||||
const termRaw = event.dataTransfer.getData("application/x-socrata-term");
|
||||
if (termRaw) {
|
||||
try {
|
||||
const t = JSON.parse(termRaw) as { termId?: string; label?: string; definition?: string };
|
||||
if (!t.label || !t.termId) return;
|
||||
const bid = tempId("b");
|
||||
const block: Block = {
|
||||
id: bid,
|
||||
label: t.label,
|
||||
kind: "block",
|
||||
stereotypes: ["block"],
|
||||
properties: [],
|
||||
description: t.definition ?? undefined,
|
||||
linkedTermId: t.termId,
|
||||
};
|
||||
const result = apply([addBlockOp(block, bid)]);
|
||||
if (result.applied) {
|
||||
const final = result.idMapping[bid] ?? bid;
|
||||
setNodes(curr => curr.map(n => (n.id === final ? { ...n, position } : n)));
|
||||
onSelect?.(final);
|
||||
// Persist the term → block link server-side so it survives reload
|
||||
// and so other UI can show the "linked" indicator immediately.
|
||||
if (projectId) {
|
||||
void fetch(`/api/projects/${encodeURIComponent(projectId)}/term-link`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ termId: t.termId, blockId: final }),
|
||||
}).catch(() => {});
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("[DiagramCanvas] term drop parse:", err);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const kindRaw = event.dataTransfer.getData("application/sysml-kind");
|
||||
if (!kindRaw) return;
|
||||
const position = screenToFlowPosition({ x: event.clientX, y: event.clientY });
|
||||
|
||||
if (kindRaw === "constraint") {
|
||||
const cid = tempId("c");
|
||||
@@ -332,7 +403,7 @@ function DiagramInner({ data, focusBlockId, onSelect, issuesByElement }: Diagram
|
||||
onSelect?.(final);
|
||||
}
|
||||
},
|
||||
[apply, onSelect, screenToFlowPosition, setNodes]
|
||||
[apply, onSelect, screenToFlowPosition, setNodes, projectId]
|
||||
);
|
||||
|
||||
function patchSelected(patch: Partial<BlockNodeData>) {
|
||||
|
||||
Reference in New Issue
Block a user