@manta-eu/react 0.2.1 → 0.4.0

package/src/graph/card-links.tsx

@@ -0,0 +1,43 @@
+import type { IRI } from "@manta-eu/rdf-lib/namespaces";
+import { createContext, type ReactNode, useContext } from "react";
+import type { NodeRelation } from "./types";
+
+// The named records a card links to, for the card to list at the top of its frame.
+export type CardLinks = { relations: NodeRelation[] };
+
+// A surface such as chat hands the card the records it links to; the canvas sets none.
+const CardLinksContext = createContext<CardLinks | null>(null);
+
+const noRecords: ReadonlySet<IRI> = new Set();
+
+// The records the card already shows above its content, so a property table leaves them out.
+const LinksShownAboveContext = createContext(noRecords);
+
+export type CardLinksProviderProps = { links: CardLinks | null; children: ReactNode };
+
+export function CardLinksProvider(props: CardLinksProviderProps) {
+  const { links, children } = props;
+
+  return <CardLinksContext.Provider value={links}>{children}</CardLinksContext.Provider>;
+}
+
+export function useCardLinks(): CardLinks | null {
+  return useContext(CardLinksContext);
+}
+
+export type CardContentProviderProps = { shown: ReadonlySet<IRI>; children: ReactNode };
+
+// Wraps a card's own content: nested cards get no links of their own, and tables learn what is shown above.
+export function CardContentProvider(props: CardContentProviderProps) {
+  const { shown, children } = props;
+
+  return (
+    <CardLinksContext.Provider value={null}>
+      <LinksShownAboveContext.Provider value={shown}>{children}</LinksShownAboveContext.Provider>
+    </CardLinksContext.Provider>
+  );
+}
+
+export function useLinksShownAbove(): ReadonlySet<IRI> {
+  return useContext(LinksShownAboveContext);
+}

package/src/graph/nodes/BrandAssetAnalysisView.tsx

@@ -32,6 +32,7 @@ export const BrandAssetAnalysisView = memo(function BrandAssetAnalysisView(props
       icon={ScanEye}
       label={`Asset Analysis: ${displayName}`}
       labelMaxWidth="max-w-140"
+      omitPredicates={listedElsewhere}
       selected={selected}
       ringColor={ringColor}
       onContextMenu={onContextMenu}

package/src/graph/nodes/BrandFontSuggestionView.tsx

@@ -101,6 +101,7 @@ export const BrandFontSuggestionView = memo(function BrandFontSuggestionView(pro
       icon={Type}
       label={`Font Suggestion: ${family}`}
       labelMaxWidth="max-w-140"
+      omitPredicates={listedElsewhere}
       selected={selected}
       ringColor={ringColor}
       onContextMenu={onContextMenu}

package/src/graph/nodes/EntityCardShell.tsx

@@ -1,5 +1,10 @@
+import { isPresent } from "@manta-eu/lib/present";
+import type { IRI } from "@manta-eu/rdf-lib/namespaces";
 import type { LucideIcon } from "lucide-react";
-import { memo, type MouseEvent, type ReactNode } from "react";
+import { memo, type MouseEvent, type ReactNode, useMemo } from "react";
+import { CardContentProvider, useCardLinks } from "../card-links";
+import { RelatedSection } from "../special-nodes/RelatedSection";
+import type { NodeRelation } from "../types";
 import { cn } from "#style";
 
 export type EntityCardShellProps = {
@@ -9,11 +14,31 @@ export type EntityCardShellProps = {
   selected?: boolean;
   ringColor?: string;
   onContextMenu?: (e: MouseEvent) => void;
+  // Fields the card body shows itself (an image, a weights list), so the links section leaves them out too.
+  omitPredicates?: readonly IRI[];
   children: ReactNode;
 };
 
+const noRelations: NodeRelation[] = [];
+
 export const EntityCardShell = memo(function EntityCardShell(props: EntityCardShellProps) {
-  const { icon: Icon, label, labelMaxWidth = "max-w-50", selected = false, ringColor, onContextMenu, children } = props;
+  const {
+    icon: Icon,
+    label,
+    labelMaxWidth = "max-w-50",
+    selected = false,
+    ringColor,
+    onContextMenu,
+    omitPredicates,
+    children,
+  } = props;
+  const links = useCardLinks();
+
+  const listed = useMemo(() => {
+    const omitted = new Set(omitPredicates);
+    return (links?.relations ?? noRelations).filter((relation) => !omitted.has(relation.predicate));
+  }, [links, omitPredicates]);
+  const shown = useMemo(() => new Set(listed.map((relation) => relation.target)), [listed]);
 
   return (
     <div className="w-fit flex flex-col items-start gap-1" onContextMenu={onContextMenu}>
@@ -34,7 +59,16 @@ export const EntityCardShell = memo(function EntityCardShell(props: EntityCardSh
         )}
         style={selected && ringColor ? { boxShadow: `0 0 0 1.5px ${ringColor}` } : undefined}
       >
-        {children}
+        <CardContentProvider shown={shown}>
+          {isPresent(listed) ? (
+            <div className="overflow-hidden rounded-md bg-muted">
+              <RelatedSection relations={listed} />
+              {children}
+            </div>
+          ) : (
+            children
+          )}
+        </CardContentProvider>
       </div>
     </div>
   );

package/src/graph/nodes/NodePropertyTable.tsx

@@ -1,4 +1,7 @@
+import { isPresent } from "@manta-eu/lib/present";
+import type { IRI } from "@manta-eu/rdf-lib/namespaces";
 import { useCallback, useMemo } from "react";
+import { useLinksShownAbove } from "../card-links";
 import { shouldHidePreviewField } from "../graph-list-utils";
 import { AttributeList, useAttributeFacts } from "../special-nodes/AttributeList";
 import type { NodeProperty, NodeRelation } from "../types";
@@ -17,7 +20,7 @@ export type NodePropertyTableProps = {
   // The node's raw values, so a multi-valued property renders as tags rather than a joined string.
   jsonLd?: Record<string, unknown>;
   // Rendered above the table by the card itself, so the table skips them.
-  omitPredicates?: readonly string[];
+  omitPredicates?: readonly IRI[];
   relations?: NodeRelation[];
 };
 
@@ -45,6 +48,17 @@ export function NodePropertyTable(props: NodePropertyTableProps) {
   );
 
   const { facts, previewCount } = useAttributeFacts({ properties, relations: visibleRelations, jsonLd, include });
+  const shownAbove = useLinksShownAbove();
+  const shown = useMemo(
+    () =>
+      facts.flatMap((fact) => {
+        if (!isPresent(fact.entityIris)) return [fact];
+
+        const rest = fact.entityIris.filter((iri) => !shownAbove.has(iri));
+        return isPresent(rest) ? [{ ...fact, entityIris: rest }] : [];
+      }),
+    [facts, shownAbove],
+  );
 
-  return <AttributeList facts={facts} previewCount={previewCount} showAll />;
+  return <AttributeList facts={shown} previewCount={previewCount} showAll />;
 }

package/src/graph/nodes/node-property-display.ts

@@ -1,3 +1,4 @@
+import { isHexColor } from "@manta-eu/lib/color";
 import { formatPercent, parseNumeric } from "../property-formatters";
 
 export type PropertyDisplay =
@@ -9,12 +10,6 @@ export type PropertyDisplay =
   | { kind: "prose"; text: string }
   | { kind: "text"; text: string };
 
-const hexPattern = /^#(?:[0-9a-f]{3}|[0-9a-f]{4}|[0-9a-f]{6}|[0-9a-f]{8})$/i;
-
-// Shared with the palette swatch: both guard a style sink, so the two must not drift.
-export function isHexColor(value: string): boolean {
-  return hexPattern.test(value);
-}
 const prosePhraseLength = 60;
 
 // Wider than formatDisplayValue's isPercentLabel, which excludes score — merging them would change both.
@@ -36,7 +31,7 @@ export function classifyPropertyDisplay(args: { label: string; formatted: string
     if (values.length > 1) return { kind: "tags", values };
   }
 
-  if (hexPattern.test(formatted)) return { kind: "color", hex: formatted };
+  if (isHexColor(formatted)) return { kind: "color", hex: formatted };
 
   // RDF booleans arrive as the literals "true"/"false" from the graph, as real booleans from fixtures.
   if (raw === true || raw === false) return { kind: "boolean", value: raw };

package/src/graph/special-nodes/AttributeList.tsx

@@ -97,8 +97,10 @@ export function AttributeList(props: AttributeListProps) {
   );
 
   const visibleFacts = searching || expanded ? matchingFacts : facts.slice(0, previewCount);
-  const hasHiddenChips = visibleFacts.some((fact) => visibleChips(fact.entityIris, expanded).hiddenCount > 0);
   const hiddenCount = facts.length - previewCount;
+  const collapsible =
+    hiddenCount > 0 ||
+    facts.slice(0, previewCount).some((fact) => visibleChips(fact.entityIris, false).hiddenCount > 0);
 
   if (!isPresent(facts)) return null;
 
@@ -161,7 +163,7 @@ export function AttributeList(props: AttributeListProps) {
         {searching && !isPresent(visibleFacts) && (
           <span className="typography-tiny py-1 text-muted-foreground">No matching attributes.</span>
         )}
-        {!showAll && (hiddenCount > 0 || hasHiddenChips || expanded) && (
+        {!showAll && collapsible && (
           <NodePropertyExpander
             expanded={expanded}
             collapsedLabel={hiddenCount > 0 ? `Show all ${facts.length}` : "Show all"}

package/src/graph/special-nodes/RelatedSection.tsx

@@ -0,0 +1,29 @@
+import { isPresent } from "@manta-eu/lib/present";
+import { useMemo } from "react";
+import type { NodeProperty, NodeRelation } from "../types";
+import { AttributeList, useAttributeFacts } from "./AttributeList";
+import { singleLinksFirst } from "./card-facts";
+
+export type RelatedSectionProps = { relations: NodeRelation[] };
+
+const noProperties: NodeProperty[] = [];
+const noJsonLd: Record<string, unknown> = {};
+
+export function RelatedSection(props: RelatedSectionProps) {
+  const { relations } = props;
+
+  const { facts, previewCount } = useAttributeFacts({ properties: noProperties, relations, jsonLd: noJsonLd });
+  const ordered = useMemo(() => singleLinksFirst(facts), [facts]);
+
+  if (!isPresent(ordered)) return null;
+
+  return (
+    <div
+      role="group"
+      aria-label="Related records"
+      className="flex max-w-90 flex-col border-b border-muted-border px-3 pb-2 pt-2.5 text-default-foreground"
+    >
+      <AttributeList facts={ordered} previewCount={previewCount} />
+    </div>
+  );
+}

package/src/graph/special-nodes/card-facts.ts

@@ -107,6 +107,19 @@ export function keyWords(key: string): string[] {
     .map((word) => word.toLowerCase());
 }
 
+// Links to records with a name of their own, so unnamed sub-records (an insight's action rows) stay off the card.
+export function namedRelations(relations: NodeRelation[], instanceLabels: Map<string, string | null>): NodeRelation[] {
+  return relations.filter((relation) => isPresent(instanceLabels.get(relation.target)));
+}
+
+// What the record belongs to (one campaign, one account) reads before what it has many of.
+export function singleLinksFirst(facts: CardFact[]): CardFact[] {
+  return [
+    ...facts.filter((fact) => fact.entityIris.length <= 1),
+    ...facts.filter((fact) => fact.entityIris.length > 1),
+  ];
+}
+
 export function relationFacts(
   relations: NodeRelation[],
   terms: Map<string, OntologyTerm>,

package/src/graph/types.ts

@@ -11,7 +11,7 @@ export type NodeProperty = {
 };
 
 // A property whose value is another entity in the graph; the canvas draws it as an edge instead.
-export type NodeRelation = { predicate: string; target: string };
+export type NodeRelation = { predicate: IRI; target: IRI };
 
 export type RDFNodeData = {
   label: string;

package/src/hooks/use-approve-anyway.ts

@@ -1,4 +1,6 @@
 import { useExecuteAgentActionAdditionMutation } from "@manta-eu/client";
+import { entityActionInput } from "@manta-eu/client/shared/action-document";
+import { BrandAssetDecisionSchema } from "@manta-eu/ldo/schemas/brand";
 import { isPresent } from "@manta-eu/lib/present";
 import { isValidFullIri, namespaces } from "@manta-eu/rdf-lib/namespaces";
 import { useQueryClient } from "@tanstack/react-query";
@@ -8,13 +10,12 @@ import { useCallback, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 import type { ManualAction } from "./use-manual-actions";
 import { useSparqlSelect } from "./use-sparql-construct";
-import { buildActionDocument, mintSubjectIri } from "#lib/action-document";
+import { mintSubjectIri } from "#lib/action-document";
 import { useMantaClient } from "#providers/MantaClientProvider";
 import { invalidateActionPlanQueries } from "#shared/query-keys";
 
 const df = new DataFactory();
 const assetAnalysis = `${namespaces.brand}AssetAnalysis`;
-const assetDecision = `${namespaces.brand}AssetDecision`;
 const decideAssetShape = `${namespaces.brand}DecideAssetShape`;
 
 export type ApproveAnywayHandle = {
@@ -68,16 +69,12 @@ export function useApproveAnyway(planGraphIri: string): ApproveAnywayHandle {
       if (inFlight.current.has(analysisIri)) return;
       inFlight.current.add(analysisIri);
       setApproving(new Set(inFlight.current));
-      const subjectIri = mintSubjectIri(assetDecision);
-      const properties = buildActionDocument(
-        { subjectIri, rdfType: assetDecision },
-        {
-          [`${namespaces.brand}decisionOnAsset`]: { "@id": analysisIri },
-          [`${namespaces.brand}decision`]: "approved",
-        },
-      );
       void startAddition({
-        input: { subjectIri, rdfType: assetDecision, actionShape: decideAssetShape, properties },
+        input: entityActionInput(BrandAssetDecisionSchema, decideAssetShape, {
+          $id: mintSubjectIri(BrandAssetDecisionSchema["@type"]),
+          decisionOnAsset: analysisIri,
+          decision: "approved",
+        }),
       })
         .then(({ executeActionAddition }) => {
           if (!executeActionAddition.success) throw new Error(executeActionAddition.error ?? "The approval failed");

package/src/ldo-ui.ts

@@ -344,6 +344,7 @@ export {
 export { NodeFrame, type NodeFrameProps } from "./graph/special-nodes/NodeFrame";
 
 export { EntityCard, findEntityNode, type EntityCardProps } from "./graph/EntityCard";
+export { EntityViewWithLinks, type EntityViewWithLinksProps } from "./graph/EntityViewWithLinks";
 export { findDetailViewForTypes, findPluralViewForTypes, type DetailView, type PluralView } from "./graph/detail-views";
 export { EntityStripDisplay, type EntityStripDisplayProps } from "./graph/EntityStripDisplay";
 export { stubNodeData } from "./graph/stub-node";

package/src/lib/find-latest-staged-rule.ts

@@ -3,5 +3,5 @@ import { isStagedManageRulesResult } from "../components/tool-invocation-card/ty
 import { findLatestToolOutput } from "./find-latest-tool-output";
 
 export function findLatestStagedRuleIri(messages: ChatUIMessage[]): string | null {
-  return findLatestToolOutput(messages, "tool-manageRDFoxRules", isStagedManageRulesResult)?.ruleIri ?? null;
+  return findLatestToolOutput(messages, "tool-manageRules", isStagedManageRulesResult)?.ruleIri ?? null;
 }

package/src/lib/tool-icons.ts

@@ -27,12 +27,12 @@ import {
 import { match } from "ts-pattern";
 
 const toolIconMap: Record<ToolName, LucideIcon> = {
-  getRDFoxFacts: Database,
-  addRDFoxFacts: Database,
-  manageRDFoxFacts: Database,
-  getRDFoxRules: Brain,
-  explainRDFoxRules: Brain,
-  manageRDFoxRules: Brain,
+  queryKnowledgeGraph: Database,
+  addFacts: Database,
+  manageFacts: Database,
+  getRules: Brain,
+  explainFact: Brain,
+  manageRules: Brain,
   generateChart: TrendingUp,
   scheduleTask: Clock,
   listScheduledTasks: Clock,

package/src/lib/tool-names.ts

@@ -1,7 +1,6 @@
 export function formatToolName(toolType: string): string {
   const name = toolType.replace("tool-", "");
   return name
-    .replace(/RDFox/gi, "")
     .replace(/([A-Z])/g, " $1")
     .replace(/^./, (str) => str.toUpperCase())
     .replace(/\s+/g, " ")

package/src/ontology/skolem.ts

@@ -5,7 +5,7 @@ export type SkolemPart = { type: "iri"; value: string } | { type: "literal"; val
 const blankNodePrefixes = ["_:", "_."];
 const segmentTagLength = 2;
 
-// RDFox datatype tags: "02" = IRI, "05" = string; other datatypes are binary-encoded.
+// The datastore datatype tags: "02" = IRI, "05" = string; other datatypes are binary-encoded.
 const segmentTypeByTag: Record<string, SkolemPart["type"]> = {
   "02": "iri",
   "05": "literal",
@@ -29,7 +29,7 @@ function decodeSegment(segment: string): string | undefined {
   }
 }
 
-// RDFox skolem labels: dot-separated base64 segments, each prefixed with a 2-char type tag.
+// The datastore skolem labels: dot-separated base64 segments, each prefixed with a 2-char type tag.
 export function decodeSkolem(term: string): SkolemPart[] | undefined {
   const prefix = blankNodePrefixes.find((candidate) => term.startsWith(candidate));
 

package/src/providers/KnowledgeGraphStateProvider.tsx

@@ -135,7 +135,7 @@ export function KnowledgeGraphStateProvider(props: KnowledgeGraphStateProviderPr
 
     if (currentDataVersion && isPresent(previousDataVersion) && previousDataVersion !== currentDataVersion) {
       void invalidateGraphDerivedQueries(queryClient);
-      console.debug("Knowledge graph dataVersion changed, invalidating RDFox-related queries");
+      console.debug("Knowledge graph dataVersion changed, invalidating the knowledge graph queries");
     }
 
     if (currentDataVersion && currentDataVersion !== previousDataVersion) {

package/src/routes/data-explorer/class-properties.ts

@@ -1,4 +1,4 @@
-import { ontologyGraphIri, shaclGraphIri } from "@manta-eu/client/shared/rdf-namespaces";
+import { ontologyGraphIri, shaclGraph } from "@manta-eu/client/shared/rdf-namespaces";
 import { isPresent } from "@manta-eu/lib/present";
 import { DataFactory } from "ldkit/rdf";
 import { SELECT } from "ldkit/sparql";
@@ -32,7 +32,7 @@ function classPropertiesQuery(classIri: string): string {
 
 function shapeConstraintsQuery(classIri: string): string {
   return `${prefixes}${SELECT`?path ?minCount ?allowedValue`.WHERE`
-  VALUES ?shapeGraph { ${df.namedNode(ontologyGraphIri)} ${df.namedNode(shaclGraphIri)} }
+  VALUES ?shapeGraph { ${df.namedNode(ontologyGraphIri)} ${df.namedNode(shaclGraph)} }
   GRAPH ?shapeGraph {
     ?shape sh:targetClass ${df.namedNode(safeIri(classIri))} ; sh:property ?propertyShape .
     ?propertyShape sh:path ?path .

package/src/routes/data-explorer/classes.ts

@@ -1,4 +1,4 @@
-import { ontologyGraphIri, shaclGraphIri } from "@manta-eu/client/shared/rdf-namespaces";
+import { ontologyGraphIri, shaclGraph } from "@manta-eu/client/shared/rdf-namespaces";
 import { isPresent } from "@manta-eu/lib/present";
 import { DataFactory, type RDF } from "ldkit/rdf";
 import { SELECT } from "ldkit/sparql";
@@ -33,7 +33,7 @@ const classesQuery = `${prefixes}${SELECT.DISTINCT`?class ?label ?comment`.WHERE
     }
   }
   UNION {
-    GRAPH ${df.namedNode(shaclGraphIri)} { ?shapeInShaclGraph sh:targetClass ?class }
+    GRAPH ${df.namedNode(shaclGraph)} { ?shapeInShaclGraph sh:targetClass ?class }
   }
   OPTIONAL { GRAPH ${df.namedNode(ontologyGraphIri)} { ?class rdfs:label ?label } }
   OPTIONAL { GRAPH ${df.namedNode(ontologyGraphIri)} { ?class rdfs:comment ?comment } }

package/src/routes/data-explorer/components/record-detail/ActionFormDialog.tsx

@@ -59,7 +59,6 @@ export function ActionFormDialog(props: ActionFormDialogProps) {
   const baselineRef = useRef<PropertyMap | null>(null);
   const [refusal, setRefusal] = useState<string | null>(null);
   const [formElement, setFormElement] = useState<ShaclFormElement | null>(null);
-  const [isReadingForm, setIsReadingForm] = useState(false);
 
   const attachForm = useCallback((element: ShaclFormElement | null) => setFormElement(element), []);
 
@@ -77,29 +76,20 @@ export function ActionFormDialog(props: ActionFormDialogProps) {
   useEffect(() => {
     if (!formElement || !isUpdate) return;
 
-    let cancelled = false;
-
     // Baseline is the form's own serialization: its editors normalize literals, the triples do not.
-    async function captureBaseline() {
+    function onReady() {
       const store = formElement?.toRDF();
-      const baseline = store ? await baselineFromStore(store, subjectIri) : null;
-
-      if (baseline && !cancelled) baselineRef.current = baseline;
-    }
+      const baseline = store ? baselineFromStore(store, subjectIri) : null;
 
-    function onReady() {
-      void captureBaseline();
+      if (baseline) baselineRef.current = baseline;
     }
 
     onReady();
     formElement.addEventListener("ready", onReady);
-    return () => {
-      cancelled = true;
-      formElement.removeEventListener("ready", onReady);
-    };
+    return () => formElement.removeEventListener("ready", onReady);
   }, [formElement, isUpdate, subjectIri]);
 
-  async function submit() {
+  function submit() {
     const store = formElement?.toRDF();
     const baseline = baselineRef.current;
 
@@ -108,14 +98,7 @@ export function ActionFormDialog(props: ActionFormDialogProps) {
       return;
     }
 
-    setIsReadingForm(true);
-    const edited = await propertiesFromStore(store, subjectIri).catch(() => null);
-    setIsReadingForm(false);
-
-    if (!edited) {
-      setRefusal("The form could not be read.");
-      return;
-    }
+    const edited = propertiesFromStore(store, subjectIri);
 
     if (isUpdate && baseline) {
       const cleared = removedPredicates(baseline, edited);
@@ -176,12 +159,7 @@ export function ActionFormDialog(props: ActionFormDialogProps) {
           <Button variant="tertiary" size="sm" onClick={() => onOpenChange(false)}>
             Cancel
           </Button>
-          <Button
-            size="sm"
-            onClick={() => void submit()}
-            isLoading={isPending || isReadingForm}
-            disabled={!shapesTurtle}
-          >
+          <Button size="sm" onClick={submit} isLoading={isPending} disabled={!shapesTurtle}>
             {copy.submitLabel}
           </Button>
         </DialogFooter>

package/src/routes/data-explorer/components/record-detail/ChatPreview.tsx

@@ -7,6 +7,7 @@ import { actionShapesForTypes } from "./action-shapes";
 import { Badge } from "#components/badge/index";
 import {
   type ActionShapeSpec,
+  EntityViewWithLinks,
   findEntityNode,
   GenericView,
   getEntityView,
@@ -97,7 +98,11 @@ export function ChatPreview(props: ChatPreviewProps) {
       <section>
         <h3 className={cn(sectionLabelClass, "mb-1.5 text-muted-foreground")}>Chat rendering</h3>
         <div className="max-w-md">
-          {EntityView ? <EntityView data={node.data} /> : <GenericView data={node.data} defaultExpanded />}
+          {EntityView ? (
+            <EntityViewWithLinks view={EntityView} data={node.data} />
+          ) : (
+            <GenericView data={node.data} defaultExpanded />
+          )}
         </div>
       </section>
 

package/src/routes/data-explorer/components/record-detail/action-properties.ts

@@ -7,14 +7,14 @@ export type PropertyMap = Record<string, unknown>;
 // The form stamps this on every serialization
 const conformsTo = `${namespaces.dcterms}conformsTo`;
 
-export async function propertiesFromStore(store: ShaclFormStore, subjectIri: string): Promise<PropertyMap> {
+export function propertiesFromStore(store: ShaclFormStore, subjectIri: string): PropertyMap {
   const quads = [...store].filter((quad) => quad.predicate.value !== conformsTo);
-  const { "@id": _id, "@type": _type, ...properties } = await documentFromQuads(quads, subjectIri);
+  const { "@id": _id, "@type": _type, ...properties } = documentFromQuads(quads, subjectIri);
 
   return properties;
 }
 
-export async function baselineFromStore(store: ShaclFormStore, subjectIri: string): Promise<PropertyMap | null> {
+export function baselineFromStore(store: ShaclFormStore, subjectIri: string): PropertyMap | null {
   if (store.size === 0) return null;
 
   return propertiesFromStore(store, subjectIri);

package/src/routes/data-explorer/recents.ts

@@ -19,7 +19,7 @@ const df = new DataFactory();
 
 export const recentTypesLimit = 10;
 
-// STR() ordering because sources mix xsd:date and xsd:dateTime, which RDFox will not compare as temporals
+// STR() ordering because sources mix xsd:date and xsd:dateTime, which the datastore will not compare as temporals
 const recentlyModifiedTypesSubquery = SELECT`?type (MAX(STR(?modified)) AS ?lastModified)`.WHERE`
   ?dated schema:dateModified ?modified .
   ?dated a ?type .

package/src/routes/data-explorer/shapes.ts

@@ -1,4 +1,4 @@
-import { ontologyGraphIri, shaclGraphIri } from "@manta-eu/client/shared/rdf-namespaces";
+import { ontologyGraphIri, shaclGraph } from "@manta-eu/client/shared/rdf-namespaces";
 import { isPresent } from "@manta-eu/lib/present";
 import { DataFactory, type RDF } from "ldkit/rdf";
 import { SELECT } from "ldkit/sparql";
@@ -62,7 +62,7 @@ export function groupShapeConstraints(rows: ShapeConstraintRow[]): ClassShape[]
 
 function shapeDetailsQuery(classIri: string): string {
   return `${prefixes}${SELECT.DISTINCT`?shape ?path ?constraint ?value ?listValue`.WHERE`
-  VALUES ?shapeGraph { ${df.namedNode(ontologyGraphIri)} ${df.namedNode(shaclGraphIri)} }
+  VALUES ?shapeGraph { ${df.namedNode(ontologyGraphIri)} ${df.namedNode(shaclGraph)} }
   GRAPH ?shapeGraph {
     ?shape sh:targetClass ${df.namedNode(safeIri(classIri))} ; sh:property ?propertyShape .
     ?propertyShape sh:path ?path ; ?constraint ?value .

package/src/routes/datastores/flatten.ts

@@ -22,7 +22,7 @@ export type DatastoreRow = {
   // Org roots carry their own datastore but are also the container the rest hang off.
   isOrganization: boolean;
   mirrored?: boolean;
-  // Real in RDFox, but no Keycloak node behind it, so it can only be selected.
+  // Real in the datastore, but no Keycloak node behind it, so it can only be selected.
   isRealmDefault?: boolean;
   isUnlinked?: boolean;
 };

package/src/routes/integrations/catalog-shape.ts

@@ -22,6 +22,8 @@ export type OAuthConnectionMethod = ConnectionMethodBase & {
   source: "oauth";
   integration: GQLIntegration;
   callbackProvider?: string;
+  // Further oauth_provider values whose callback resumes this same method, e.g. a second identity provider.
+  alternateCallbackProviders?: readonly string[];
   resumesSetupAfterOAuth?: boolean;
   connectedAction?: ComponentType;
 };

package/src/routes/integrations/components/connect-forms/CanvaConnectForm.tsx

@@ -0,0 +1,26 @@
+import { GQLIntegration } from "@manta-eu/client";
+import { OAuthSingleAccountConnectForm } from "./OAuthSingleAccountConnectForm";
+import type { ConnectFormProps } from "./types";
+
+const canvaPermissions = [
+  "Read your designs, the folders they live in, and your uploaded assets.",
+  "Export your designs so their pages can be analyzed.",
+  "Read your brand templates and the comments on your designs.",
+];
+
+export function CanvaConnectForm(props: ConnectFormProps) {
+  return (
+    <OAuthSingleAccountConnectForm
+      {...props}
+      integration={GQLIntegration.Canva}
+      startHref="/oauth/canva/start"
+      ctaLabel="Continue with Canva"
+      stepTitle="Connect your Canva account"
+      stepDescription="Manta will take you to Canva to ask for permission, then bring you back here."
+      supportingInfo="You'll be taken to Canva to approve access. You can revoke it any time from your Canva account settings."
+      permissions={canvaPermissions}
+      waitingLabel="Waiting for you to finish connecting to Canva…"
+      connectedToastLabel="Canva connected"
+    />
+  );
+}