@arpproject/recrate 0.1.51 → 0.1.52

package/dist/crate-builder/RenderEntity/EntityId.d.ts

@@ -11,6 +11,13 @@ interface EntityIdProps {
     }) => void;
     aiEdited?: boolean;
     aiEditedVariant?: AiEditedFieldBadgeVariant;
+    aiReview?: {
+        operation?: string;
+        previousValue?: any;
+        previousValueDiffers?: boolean;
+        onApprove: () => void;
+        onReject: () => void;
+    };
 }
 export declare const EntityId: React.FC<EntityIdProps>;
 export default EntityId;

package/dist/crate-builder/RenderEntity/EntityId.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/crate-builder/RenderEntity/Shell2.d.ts

@@ -5,7 +5,7 @@ interface RenderEntityProps {
         id: string;
         updateState?: boolean;
     }) => void;
-    onSaveCrate: () => void;
+    onSaveCrate: (activeEntityId?: string) => void;
     onSaveEntityTemplate: () => void;
     onWarning: () => void;
     onError: () => void;

package/dist/crate-builder/RenderEntity/approval-utils.d.ts

@@ -3,7 +3,9 @@ export declare const CONTEXT_APPROVAL_PROPERTY_NAME = "@context";
 export declare const getApprovalEntities: (approvalData: any) => any[];
 export declare const getEntityIdAliases: (id: string | undefined) => string[];
 export declare const entityIdsMatch: (left: string | undefined, right: string | undefined) => boolean;
+export declare const resolveEntityByIdAliases: <T>(id: string | undefined, getEntity: (candidateId: string) => T | undefined, indexedEntityIds?: Iterable<string>) => T | undefined;
 export declare const isPendingEntityDeleteApproval: (entityApproval: any) => boolean;
+export declare const isPendingEntityCreateApproval: (entityApproval: any) => boolean;
 export declare const getDeletedEntityFromApproval: (entityApproval: any) => any | undefined;
 export declare const getPendingDeletedEntityFromApproval: (approvalData: any, entityId: string | undefined) => any | undefined;
 export declare const getPendingDeletedEntitiesForReverseProperty: (approvalData: any, sourceEntityId: string | undefined, property: string) => any[];

package/dist/crate-builder/RenderEntity/useEntityMutationHandlers.d.ts

@@ -9,7 +9,7 @@ interface UseEntityMutationHandlersOptions {
         updateState?: boolean;
     }) => void;
     refresh: () => void;
-    saveCratePreservingView: () => void;
+    saveCratePreservingView: (activeEntityId?: string) => void;
     notifySave: (property: string) => void;
     onWarning: () => void;
     onError: () => void;

package/dist/crate-builder/RenderEntity/useEntityNavigationState.d.ts

@@ -10,7 +10,7 @@ interface UseEntityNavigationStateOptions {
     highlightRequiredProperties: boolean;
     iconView: boolean;
     tabPaneWidth: number;
-    onSaveCrate: () => void;
+    onSaveCrate: (activeEntityId?: string) => void;
     debugScroll?: (...args: any[]) => void;
 }
 interface CaptureViewContextOptions {
@@ -19,7 +19,7 @@ interface CaptureViewContextOptions {
 declare const useEntityNavigationState: ({ activeTab, activeContentRef, contextEntity, state, restoreInProgressRef, showAddPanel, reverseSidebarVisible, highlightRequiredProperties, iconView, tabPaneWidth, onSaveCrate, debugScroll, }: UseEntityNavigationStateOptions) => {
     captureCurrentViewContext: (tabName?: string) => void;
     captureViewContext: (tabName?: string, explicitScrollTop?: number, options?: CaptureViewContextOptions) => void;
-    saveCratePreservingView: () => void;
+    saveCratePreservingView: (activeEntityId?: string) => void;
     saveTabToState: (tabName: string) => void;
 };
 export default useEntityNavigationState;

package/dist/crate-builder/Shell.navigation.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/crate-builder/Shell.reject-id-change.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/recrate.es.js

@@ -74334,55 +74334,6 @@ const AiEditedFieldBadge = ({
   const label = variant === "deleted" ? t2("ai_deleted_by_ai") : t2("ai_edited_by_ai");
   return /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip2, { title: title ?? label, children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: `recrate-ai-edited-icon ${className}`, "aria-label": ariaLabel ?? label, children: "✦" }) });
 };
-const EntityId = ({
-  entity,
-  onUpdate,
-  aiEdited = false,
-  aiEditedVariant = "edited"
-}) => {
-  var _a2;
-  const { t: t2 } = useTranslation();
-  const state = useStateStore();
-  const handleSave = async (data) => {
-    onUpdate(data);
-  };
-  const openInNewTab = (url2) => {
-    window.open(url2, "_blank");
-  };
-  const isDatasetOrFile = () => {
-    const types2 = Array.isArray(entity["@type"]) ? entity["@type"] : [entity["@type"]];
-    return entity["@id"] === "./" || types2.some((type4) => ["Dataset", "File"].includes(type4));
-  };
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-row", children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "min-w-32 w-1/3 xl:w-1/5 recrate-property-name recrate-property-name-with-ai", children: [
-      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "@id" }),
-      aiEdited && /* @__PURE__ */ jsxRuntimeExports.jsx(AiEditedFieldBadge, { variant: aiEditedVariant })
-    ] }),
-    !((_a2 = state.configuration) == null ? void 0 : _a2.readonly) ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "w-2/3 xl:w-4/5 flex flex-row recrate-property-value", children: [
-      isURL(entity["@id"]) && /* @__PURE__ */ jsxRuntimeExports.jsx(
-        Button$1,
-        {
-          type: "link",
-          icon: /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$7, {}),
-          onClick: () => openInNewTab(entity["@id"]),
-          title: String(t2("open_in_new_tab"))
-        }
-      ),
-      isDatasetOrFile() ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: entity["@id"] }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-grow", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-        Text$2,
-        {
-          property: "@id",
-          value: entity["@id"],
-          onSaveProperty: handleSave
-        }
-      ) })
-    ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-2/3 xl:w-4/5 flex flex-row recrate-property-value", children: isURL(entity["@id"]) ? /* @__PURE__ */ jsxRuntimeExports.jsxs(Typography.Link, { className: "text-large", style: { fontSize: "1em" }, href: entity["@id"], target: "_blank", rel: "noopener noreferrer", children: [
-      entity["@id"],
-      " ",
-      /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$7, {})
-    ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: entity["@id"] }) })
-  ] });
-};
 const valueIsEmpty$1 = (value) => {
   if (value === void 0 || value === null) return true;
   if (typeof value === "string") return value.trim().length === 0;
@@ -74425,6 +74376,109 @@ const AiFieldDiffView = ({
     ] })
   ] });
 };
+const EntityId = ({
+  entity,
+  onUpdate,
+  aiEdited = false,
+  aiEditedVariant = "edited",
+  aiReview
+}) => {
+  var _a2;
+  const { t: t2 } = useTranslation();
+  const state = useStateStore();
+  const [showAiDiff, setShowAiDiff] = useState(false);
+  const showAiReview = Boolean(aiReview);
+  const isAiDelete = (aiReview == null ? void 0 : aiReview.operation) === "delete";
+  const handleSave = async (data) => {
+    onUpdate(data);
+  };
+  const openInNewTab = (url2) => {
+    window.open(url2, "_blank");
+  };
+  const isDatasetOrFile = () => {
+    const types2 = Array.isArray(entity["@type"]) ? entity["@type"] : [entity["@type"]];
+    return entity["@id"] === "./" || types2.some((type4) => ["Dataset", "File"].includes(type4));
+  };
+  return /* @__PURE__ */ jsxRuntimeExports.jsxs(
+    "div",
+    {
+      className: `flex flex-row flex-grow ${showAiReview ? `p-2 recrate-property-background recrate-ai-review ${isAiDelete ? "recrate-ai-delete" : "recrate-ai-suggestion"}` : ""} recrate-property recrate-property-name-id`,
+      children: [
+        showAiReview && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "recrate-ai-suggestion-badge", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "recrate-ai-suggestion-badge-icon", children: "✦" }),
+          isAiDelete ? t2("ai_delete_badge") : t2("ai_suggestion_badge")
+        ] }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "min-w-32 w-1/3 xl:w-1/5 flex flex-col recrate-property-heading", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "recrate-property-name recrate-property-name-with-ai", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "@id" }),
+          aiEdited && /* @__PURE__ */ jsxRuntimeExports.jsx(AiEditedFieldBadge, { variant: aiEditedVariant })
+        ] }) }),
+        !((_a2 = state.configuration) == null ? void 0 : _a2.readonly) ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-2/3 xl:w-4/5 flex flex-col flex-grow recrate-property-value", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: `flex flex-row gap-2 ${showAiReview ? "recrate-ai-field-row" : ""}`, children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: `flex flex-row flex-grow min-w-0 ${showAiReview ? "recrate-ai-field-control" : ""}`, children: showAiDiff && (aiReview == null ? void 0 : aiReview.previousValueDiffers) ? /* @__PURE__ */ jsxRuntimeExports.jsx(
+            AiFieldDiffView,
+            {
+              previousValue: aiReview.previousValue,
+              currentValue: entity["@id"],
+              operation: aiReview.operation
+            }
+          ) : /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
+            isURL(entity["@id"]) && /* @__PURE__ */ jsxRuntimeExports.jsx(
+              Button$1,
+              {
+                type: "link",
+                icon: /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$7, {}),
+                onClick: () => openInNewTab(entity["@id"]),
+                title: String(t2("open_in_new_tab"))
+              }
+            ),
+            isDatasetOrFile() ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: entity["@id"] }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-grow", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+              Text$2,
+              {
+                property: "@id",
+                value: entity["@id"],
+                onSaveProperty: handleSave
+              }
+            ) })
+          ] }) }),
+          showAiReview && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "recrate-ai-actions", children: [
+            (aiReview == null ? void 0 : aiReview.previousValueDiffers) && /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip2, { title: showAiDiff ? t2("ai_hide_diff") : t2("ai_show_diff"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+              Button$1,
+              {
+                size: "middle",
+                className: "recrate-ai-action-diff",
+                icon: /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$9, {}),
+                "aria-label": showAiDiff ? String(t2("ai_hide_ai_diff_aria")) : String(t2("ai_show_ai_diff_aria")),
+                "aria-pressed": showAiDiff,
+                onClick: () => setShowAiDiff((visible) => !visible)
+              }
+            ) }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip2, { title: isAiDelete ? t2("ai_approve_deletion_tooltip") : t2("ai_approve_suggested_value_tooltip"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+              Button$1,
+              {
+                size: "middle",
+                className: "recrate-ai-action-approve",
+                onClick: aiReview == null ? void 0 : aiReview.onApprove,
+                children: isAiDelete ? t2("ai_delete") : t2("ai_accept")
+              }
+            ) }),
+            (aiReview == null ? void 0 : aiReview.previousValueDiffers) && /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip2, { title: t2("ai_restore_previous_value_tooltip"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+              Button$1,
+              {
+                size: "middle",
+                className: "recrate-ai-action-reject",
+                onClick: aiReview == null ? void 0 : aiReview.onReject,
+                children: isAiDelete ? t2("ai_restore") : t2("ai_reject")
+              }
+            ) })
+          ] })
+        ] }) }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-2/3 xl:w-4/5 flex flex-row recrate-property-value", children: isURL(entity["@id"]) ? /* @__PURE__ */ jsxRuntimeExports.jsxs(Typography.Link, { className: "text-large", style: { fontSize: "1em" }, href: entity["@id"], target: "_blank", rel: "noopener noreferrer", children: [
+          entity["@id"],
+          " ",
+          /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$7, {})
+        ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: entity["@id"] }) })
+      ]
+    }
+  );
+};
 var ttl2jsonld$1 = { exports: {} };
 var ttl2jsonld = ttl2jsonld$1.exports;
 var hasRequiredTtl2jsonld;
@@ -79817,6 +79871,7 @@ const CoreEntityFields = ({
 }) => {
   const renderRequiredWarning = !readonly && missingRequiredData;
   const idIsVisible = shouldRenderCoreField("@id");
+  const idAiReview = getCoreAiReviewProps("@id");
   const typeAiReview = getCoreAiReviewProps("@type");
   const nameAiReview = getCoreAiReviewProps("name");
   const typeWrapperClassName = typeAiReview ? "" : `p-2 recrate-property recrate-property-name-type ${selectedAiApprovalProperty === "@type" ? "recrate-ai-review-current" : ""}`;
@@ -79825,19 +79880,20 @@ const CoreEntityFields = ({
     const untabbedTypeWrapperClassName = typeAiReview ? "" : `my-2 ${typeWrapperClassName}`;
     const untabbedNameWrapperClassName = nameAiReview ? "" : `my-2 p-2 recrate-property recrate-property-name-name ${savedProperty === "name" ? untabbedNameSavedClassName : ""}`;
     return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-      idIsVisible && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-row space-x-2 my-2 p-2", children: [
+      idIsVisible && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: idAiReview ? "flex flex-row space-x-2" : "flex flex-row space-x-2 my-2 p-2", children: [
         /* @__PURE__ */ jsxRuntimeExports.jsx(
           "div",
           {
             "data-recrate-property": "@id",
-            className: `flex-grow recrate-property recrate-property-name-id ${savedProperty === "@id" ? "bg-green-200 rounded p-1 my-1" : ""} ${selectedAiApprovalProperty === "@id" ? "recrate-ai-review-current" : ""}`,
+            className: idAiReview ? "flex-grow" : `flex-grow recrate-property recrate-property-name-id ${savedProperty === "@id" ? "bg-green-200 rounded p-1 my-1" : ""} ${selectedAiApprovalProperty === "@id" ? "recrate-ai-review-current" : ""}`,
             children: /* @__PURE__ */ jsxRuntimeExports.jsx(
               EntityId,
               {
                 entity,
                 onUpdate: onUpdateCoreProperty,
                 aiEdited: fieldWasAiEdited("@id"),
-                aiEditedVariant: fieldAiEditedVariant("@id")
+                aiEditedVariant: fieldAiEditedVariant("@id"),
+                aiReview: idAiReview
               }
             )
           }
@@ -79883,14 +79939,15 @@ const CoreEntityFields = ({
       "div",
       {
         "data-recrate-property": "@id",
-        className: `p-2 recrate-property recrate-property-name-id ${savedProperty === "@id" ? "bg-green-200 rounded" : ""} ${selectedAiApprovalProperty === "@id" ? "recrate-ai-review-current" : ""}`,
+        className: idAiReview ? "" : `p-2 recrate-property recrate-property-name-id ${savedProperty === "@id" ? "bg-green-200 rounded" : ""} ${selectedAiApprovalProperty === "@id" ? "recrate-ai-review-current" : ""}`,
         children: /* @__PURE__ */ jsxRuntimeExports.jsx(
           EntityId,
           {
             entity,
             onUpdate: onUpdateCoreProperty,
             aiEdited: fieldWasAiEdited("@id"),
-            aiEditedVariant: fieldAiEditedVariant("@id")
+            aiEditedVariant: fieldAiEditedVariant("@id"),
+            aiReview: idAiReview
           }
         )
       }
@@ -91952,6 +92009,7 @@ const DeletedLinkedEntityCard = ({
     label: field.label,
     value: field.previousValue
   }));
+  const reviewEntityId = entity.__aiDeleteSourceEntityId ?? entity["@id"];
   if (showDeletedFields) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(
       AiEntityDiffView,
@@ -91978,7 +92036,7 @@ const DeletedLinkedEntityCard = ({
       },
       styles: { body: { padding: "22px 12px 8px" } },
       hoverable: true,
-      onClick: () => onLoadEntity({ id: entity["@id"] }),
+      onClick: () => onLoadEntity({ id: reviewEntityId }),
       children: [
         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "recrate-ai-suggestion-badge recrate-ai-entity-status-badge", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "recrate-ai-suggestion-badge-icon", children: "✦" }),
@@ -92093,7 +92151,7 @@ const UnlinkedLinkedEntityCard = ({
       },
       styles: { body: { padding: "22px 12px 8px" } },
       hoverable: true,
-      onClick: () => onLoadEntity({ id: targetEntityId }),
+      onClick: () => onLoadEntity({ id: sourceEntityId }),
       children: [
         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "recrate-ai-suggestion-badge recrate-ai-entity-status-badge", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "recrate-ai-suggestion-badge-icon", children: "✦" }),
@@ -92278,6 +92336,14 @@ const stripLocalEntityIdPrefix = (id2) => {
   if (id2.startsWith("/")) return id2.slice(1);
   return id2;
 };
+const addLocalEntityIdAliases = (aliases, id2) => {
+  if (!id2) return;
+  const localPath = stripLocalEntityIdPrefix(id2);
+  if (!localPath) return;
+  aliases.add(localPath);
+  aliases.add(`./${localPath}`);
+  aliases.add(`file://./${localPath}`);
+};
 const getEntityIdAliases = (id2) => {
   if (!id2) return [];
   const aliases = /* @__PURE__ */ new Set([id2]);
@@ -92286,12 +92352,7 @@ const getEntityIdAliases = (id2) => {
   const isLocalFileUrl = decodedId.startsWith("file://./");
   const isLocalPath = !hasUrlScheme(decodedId) || isLocalFileUrl;
   if (decodedId !== "./" && isLocalPath) {
-    const localPath = stripLocalEntityIdPrefix(decodedId);
-    if (localPath) {
-      aliases.add(localPath);
-      aliases.add(`./${localPath}`);
-      aliases.add(`file://./${localPath}`);
-    }
+    addLocalEntityIdAliases(aliases, decodedId);
   }
   return Array.from(aliases);
 };
@@ -92300,11 +92361,28 @@ const entityIdsMatch = (left, right) => {
   const rightAliases = new Set(getEntityIdAliases(right));
   return getEntityIdAliases(left).some((alias) => rightAliases.has(alias));
 };
+const resolveEntityByIdAliases = (id2, getEntity, indexedEntityIds = []) => {
+  for (const candidateId of getEntityIdAliases(id2)) {
+    const entity = getEntity(candidateId);
+    if (entity !== void 0) return entity;
+  }
+  for (const indexedEntityId of Array.from(indexedEntityIds)) {
+    if (!entityIdsMatch(indexedEntityId, id2)) continue;
+    const entity = getEntity(indexedEntityId);
+    if (entity !== void 0) return entity;
+  }
+  return void 0;
+};
 const isPendingEntityDeleteApproval = (entityApproval) => {
   const approvalRecords = entityApproval == null ? void 0 : entityApproval.approval;
   if (!Array.isArray(approvalRecords) || approvalRecords.length === 0) return false;
   return approvalRecords.every((approvalRecord) => (approvalRecord == null ? void 0 : approvalRecord.operation) === "delete") && approvalRecords.some((approvalRecord) => !approvalIsApproved(approvalRecord));
 };
+const isPendingEntityCreateApproval = (entityApproval) => {
+  const approvalRecords = entityApproval == null ? void 0 : entityApproval.approval;
+  if (!Array.isArray(approvalRecords) || approvalRecords.length === 0) return false;
+  return approvalRecords.some((approvalRecord) => (approvalRecord == null ? void 0 : approvalRecord.propertyName) === "@id" && (approvalRecord == null ? void 0 : approvalRecord.operation) === "create" && !approvalIsApproved(approvalRecord));
+};
 const getDeletedEntityFromApproval = (entityApproval) => {
   if (!(entityApproval == null ? void 0 : entityApproval["@id"]) || !isPendingEntityDeleteApproval(entityApproval)) return void 0;
   const deletedEntity = entityApproval.approval.reduce((entity, approvalRecord) => {
@@ -92332,7 +92410,7 @@ const getDeletedEntityFromApproval = (entityApproval) => {
 };
 const getPendingDeletedEntityFromApproval = (approvalData, entityId) => {
   if (!entityId) return void 0;
-  const entityApproval = getApprovalEntities(approvalData).find((item) => entityIdsMatch(item == null ? void 0 : item["@id"], entityId));
+  const entityApproval = getApprovalEntities(approvalData).find((item) => entityIdsMatch(item == null ? void 0 : item["@id"], entityId) && isPendingEntityDeleteApproval(item));
   return getDeletedEntityFromApproval(entityApproval);
 };
 const getPendingDeletedEntitiesForReverseProperty = (approvalData, sourceEntityId, property) => {
@@ -92490,24 +92568,16 @@ const RenderLinkedItem = ({
   const aiUnlinkSourceEntityId = typeof (entity == null ? void 0 : entity.__aiUnlinkSourceEntityId) === "string" ? entity.__aiUnlinkSourceEntityId : void 0;
   const isPendingAiEntityUnlink = Boolean((entity == null ? void 0 : entity.__aiUnlinkedEntity) && aiUnlinkSourceEntityId);
   const effectiveEntity = useMemo$1(() => {
-    const hasTypes = Boolean(entity == null ? void 0 : entity["@type"]);
-    const hasName = Boolean(entity == null ? void 0 : entity.name);
-    if (hasTypes && hasName) {
-      return entity;
-    }
-    const resolved = crateManager.getEntity({
-      id: entity["@id"],
-      link: false,
-      materialise: false
-    });
+    const resolved = resolveEntityByIdAliases(entity["@id"], (resolvedId) => crateManager.getEntity({ id: resolvedId, link: false, materialise: false }), Object.keys(crateManager.entityIdIndex ?? {}));
     if (!resolved) {
       return entity;
     }
     return {
-      ...resolved,
       ...entity,
-      "@type": (entity == null ? void 0 : entity["@type"]) ?? resolved["@type"],
-      name: (entity == null ? void 0 : entity.name) ?? resolved.name
+      ...resolved,
+      // Keep the link/approval id visible while using the indexed entity's
+      // real type, name, and fields instead of a materialised Thing stub.
+      "@id": entity["@id"]
     };
   }, [crateManager, entity]);
   const showMap = useMemo$1(() => {
@@ -92533,11 +92603,7 @@ const RenderLinkedItem = ({
       setAssociations([]);
       return;
     }
-    const sourceEntity = crateManager.getEntity({
-      id: entity["@id"],
-      link: false,
-      materialise: false
-    });
+    const sourceEntity = resolveEntityByIdAliases(entity["@id"], (resolvedId) => crateManager.getEntity({ id: resolvedId, link: false, materialise: false }), Object.keys(crateManager.entityIdIndex ?? {}));
     if (!sourceEntity) {
       setAssociations([]);
       return;
@@ -92552,7 +92618,16 @@ const RenderLinkedItem = ({
     resolveAssociations();
   }, [profileManager.$key, entity["@id"]]);
   const handleLoadEntity = (entityData) => {
-    onLoadEntity(entityData);
+    const resolved = resolveEntityByIdAliases(entityData.id, (resolvedId) => crateManager.getEntity({ id: resolvedId, link: false, materialise: false }), Object.keys(crateManager.entityIdIndex ?? {}));
+    const hasPendingReview = getPendingEntityApprovalFieldCount(
+      approvalContext == null ? void 0 : approvalContext.roCrateApproval,
+      entityData.id
+    ) > 0;
+    if (!resolved && hasPendingReview && entityIdsMatch(entityData.id, entity == null ? void 0 : entity["@id"]) && !(entity == null ? void 0 : entity.__aiDeletedEntity) && !(entity == null ? void 0 : entity.__aiUnlinkedEntity)) {
+      setShowAiEntityDiff(true);
+      return;
+    }
+    onLoadEntity({ id: (resolved == null ? void 0 : resolved["@id"]) ?? entityData.id });
   };
   const handleUnlinkEntity = (unlinkData) => {
     if (unlinkData.entity && unlinkData.entity["@id"]) {
@@ -94545,6 +94620,24 @@ const EntityProperty = ({
     const linkedReviewInstances = linkInstances.map((instance2) => {
       var _a3;
       const targetEntityId = (_a3 = instance2.value) == null ? void 0 : _a3["@id"];
+      const resolvedTargetEntity = resolveEntityByIdAliases(targetEntityId, (resolvedId) => {
+        var _a4;
+        return (_a4 = crateManager == null ? void 0 : crateManager.getEntity) == null ? void 0 : _a4.call(crateManager, { id: resolvedId, link: false, materialise: false });
+      }, Object.keys((crateManager == null ? void 0 : crateManager.entityIdIndex) ?? {}));
+      const deletedEntity = resolvedTargetEntity ? void 0 : getPendingDeletedEntityFromApproval(
+        approvalContext == null ? void 0 : approvalContext.roCrateApproval,
+        targetEntityId
+      );
+      if (deletedEntity) {
+        return {
+          ...instance2,
+          value: {
+            ...deletedEntity,
+            __aiDeleteSourceEntityId: entity == null ? void 0 : entity["@id"],
+            __aiDeleteSourceProperty: property
+          }
+        };
+      }
       if (!targetEntityId || !Array.from(addedReferenceIds).some((id2) => entityIdsMatch(id2, targetEntityId))) {
         return instance2;
       }
@@ -123796,12 +123889,14 @@ const useScrollViewportHeight = ({
         characterData: true
       });
     }
-    requestAnimationFrame(() => computeScrollViewportHeight());
+    const animationFrame = requestAnimationFrame(() => computeScrollViewportHeight());
     const delayedMeasure = window.setTimeout(() => computeScrollViewportHeight(), 120);
     return () => {
       resizeObserver2.disconnect();
       mutationObserver.disconnect();
+      cancelAnimationFrame(animationFrame);
       window.clearTimeout(delayedMeasure);
+      computeScrollViewportHeight.cancel();
     };
   }, [computeScrollViewportHeight, activeTab, renderTabs, tabsLength, entityId, reverseSidebarVisible]);
   return {
@@ -124171,10 +124266,10 @@ const useEntityNavigationState = ({
     state.editorState.update({ id: activeEntityId, tab: tabName });
     state.editorState.updateNavigationState({ activeTab: tabName });
   }, [contextEntity, state]);
-  const saveCratePreservingView = useCallback(() => {
+  const saveCratePreservingView = useCallback((activeEntityId) => {
     saveTabToState(activeTab);
     captureCurrentViewContext(activeTab);
-    onSaveCrate();
+    onSaveCrate(activeEntityId);
   }, [activeTab, captureCurrentViewContext, onSaveCrate, saveTabToState]);
   return {
     captureCurrentViewContext,
@@ -125284,17 +125379,9 @@ const RenderEntity = forwardRef((props, ref) => {
     if (isPendingEntityDeleteApproval(entityApproval)) {
       const reviewTarget = getDeletedEntityReviewTarget(entityApproval);
       if (!(reviewTarget == null ? void 0 : reviewTarget.entityId)) return false;
-      return Boolean(crateManager == null ? void 0 : crateManager.getEntity({
-        id: reviewTarget.entityId,
-        link: false,
-        materialise: false
-      }));
+      return Boolean(resolveEntityByIdAliases(reviewTarget.entityId, (resolvedId) => crateManager == null ? void 0 : crateManager.getEntity({ id: resolvedId, link: false, materialise: false }), Object.keys((crateManager == null ? void 0 : crateManager.entityIdIndex) ?? {})));
     }
-    return Boolean(crateManager == null ? void 0 : crateManager.getEntity({
-      id: entityId,
-      link: false,
-      materialise: false
-    }));
+    return Boolean(resolveEntityByIdAliases(entityId, (resolvedId) => crateManager == null ? void 0 : crateManager.getEntity({ id: resolvedId, link: false, materialise: false }), Object.keys((crateManager == null ? void 0 : crateManager.entityIdIndex) ?? {})));
   }, [approvalContext == null ? void 0 : approvalContext.roCrateApproval, crateManager]);
   const pendingOtherAiApprovalEntities = useMemo$1(() => getPendingApprovalEntities(approvalContext == null ? void 0 : approvalContext.roCrateApproval).filter((entityApproval) => !entityIdsMatch(entityApproval == null ? void 0 : entityApproval["@id"], contextEntity == null ? void 0 : contextEntity["@id"]) && canReviewAiApprovalEntity(entityApproval)), [approvalContext == null ? void 0 : approvalContext.roCrateApproval, canReviewAiApprovalEntity, contextEntity == null ? void 0 : contextEntity["@id"]]);
   const pendingOtherAiApprovalFieldCount = useMemo$1(() => pendingOtherAiApprovalEntities.reduce((count, entityApproval) => {
@@ -125320,21 +125407,19 @@ const RenderEntity = forwardRef((props, ref) => {
       if (isPendingEntityDeleteApproval(entityApproval)) {
         const reviewTarget = getDeletedEntityReviewTarget(entityApproval);
         if (!reviewTarget) continue;
-        const targetEntity = crateManager == null ? void 0 : crateManager.getEntity({
-          id: reviewTarget.entityId,
-          link: false,
-          materialise: false
-        });
-        if (!targetEntity) continue;
+        const targetEntity2 = resolveEntityByIdAliases(reviewTarget.entityId, (resolvedId) => crateManager == null ? void 0 : crateManager.getEntity({ id: resolvedId, link: false, materialise: false }), Object.keys((crateManager == null ? void 0 : crateManager.entityIdIndex) ?? {}));
+        if (!targetEntity2) continue;
         setFieldTitleFilter("");
         if (hideEmptyFields) {
           setHideEmptyFields(false);
         }
         pendingAiScrollPropertyRef.current = reviewTarget.property;
-        onLoadEntity({ id: reviewTarget.entityId });
+        onLoadEntity({ id: targetEntity2["@id"] });
         return;
       }
-      onLoadEntity({ id: nextEntityId });
+      const targetEntity = resolveEntityByIdAliases(nextEntityId, (resolvedId) => crateManager == null ? void 0 : crateManager.getEntity({ id: resolvedId, link: false, materialise: false }), Object.keys((crateManager == null ? void 0 : crateManager.entityIdIndex) ?? {}));
+      if (!targetEntity) continue;
+      onLoadEntity({ id: targetEntity["@id"] });
       return;
     }
   }, [approvalContext == null ? void 0 : approvalContext.roCrateApproval, crateManager, hideEmptyFields, onLoadEntity, pendingOtherAiApprovalEntities]);
@@ -125938,43 +126023,6 @@ const RenderEntity = forwardRef((props, ref) => {
     scrollToAiApprovalProperty
   ]);
   const isEntityReference2 = (value) => Boolean(value && typeof value === "object" && typeof value["@id"] === "string");
-  const restoreNonCoreApprovalValue = (approvalRecord) => {
-    const property = approvalRecord == null ? void 0 : approvalRecord.propertyName;
-    if (!property) return;
-    if (entityHasPropertyValue(contextEntity, property)) {
-      crateManager.deleteProperty({ id: entity["@id"], property });
-    }
-    const previousValue = approvalRecord == null ? void 0 : approvalRecord.previousValue;
-    if (!propertyValueHasContent(previousValue)) return;
-    const previousValues = Array.isArray(previousValue) ? previousValue : [previousValue];
-    if (previousValues.length === 0) return;
-    if (previousValues.every(isEntityReference2)) {
-      previousValues.forEach((value) => {
-        crateManager.setProperty({ id: entity["@id"], property, value });
-      });
-      return;
-    }
-    crateManager.updateProperty({
-      id: entity["@id"],
-      property,
-      value: previousValues
-    });
-  };
-  const restoreApprovalValue = (approvalRecord) => {
-    const property = approvalRecord == null ? void 0 : approvalRecord.propertyName;
-    if (!property) return;
-    if (["@id", "@type", "name"].includes(property)) {
-      if (propertyValueHasContent(approvalRecord == null ? void 0 : approvalRecord.previousValue)) {
-        crateManager.updateProperty({
-          id: entity["@id"],
-          property,
-          value: approvalRecord.previousValue
-        });
-      }
-      return;
-    }
-    restoreNonCoreApprovalValue(approvalRecord);
-  };
   const restoreEntityApprovalValue = (targetEntity, approvalRecord) => {
     const property = approvalRecord == null ? void 0 : approvalRecord.propertyName;
     const entityId = targetEntity == null ? void 0 : targetEntity["@id"];
@@ -126020,22 +126068,41 @@ const RenderEntity = forwardRef((props, ref) => {
     });
   };
   const handleRejectAiProperty = (approvalRecord) => {
-    var _a3;
+    var _a3, _b2;
     try {
-      if (!(approvalRecord == null ? void 0 : approvalRecord.propertyName) || !propertyValueHasContent(approvalRecord.previousValue)) return;
-      (_a3 = approvalContext == null ? void 0 : approvalContext.markApprovalPropertyApproved) == null ? void 0 : _a3.call(approvalContext, {
+      if (!(approvalRecord == null ? void 0 : approvalRecord.propertyName)) return;
+      if (approvalRecord.propertyName === "@id" && approvalRecord.operation === "create") {
+        crateManager.deleteEntity({ id: entity["@id"] });
+        saveCratePreservingView("./");
+        (_a3 = approvalContext == null ? void 0 : approvalContext.markApprovalEntityApproved) == null ? void 0 : _a3.call(approvalContext, {
+          entityId: entity["@id"],
+          decision: "reject",
+          value: { "@id": void 0 }
+        });
+        onLoadEntity({ id: "./" });
+        return;
+      }
+      if (!propertyValueHasContent(approvalRecord.previousValue)) return;
+      (_b2 = approvalContext == null ? void 0 : approvalContext.markApprovalPropertyApproved) == null ? void 0 : _b2.call(approvalContext, {
         entityId: entity["@id"],
         propertyName: approvalRecord.propertyName,
         decision: "reject",
         value: approvalRecord.previousValue
       });
-      crateManager.updateProperty({
+      const previousEntityId = entity["@id"];
+      const updatedEntity = crateManager.updateProperty({
         id: entity["@id"],
         property: approvalRecord.propertyName,
         value: approvalRecord.previousValue
       });
-      refresh();
-      saveCratePreservingView();
+      const restoredEntityId = approvalRecord.propertyName === "@id" ? updatedEntity == null ? void 0 : updatedEntity["@id"] : void 0;
+      if (restoredEntityId && restoredEntityId !== previousEntityId) {
+        saveCratePreservingView(restoredEntityId);
+        navigateToRestoredEntity(previousEntityId, restoredEntityId);
+      } else {
+        refresh();
+        saveCratePreservingView();
+      }
       notifySave(approvalRecord.propertyName);
     } catch (error2) {
       console.error(error2);
@@ -126081,11 +126148,14 @@ const RenderEntity = forwardRef((props, ref) => {
     });
   };
   const restoreEditedEntityApprovalValues = (entityId) => {
-    const targetEntity = crateManager.getEntity({
-      id: entityId,
-      link: false,
-      materialise: false
-    });
+    const entityApproval = getEntityApproval(approvalContext == null ? void 0 : approvalContext.roCrateApproval, entityId);
+    const targetEntity = resolveEntityByIdAliases(entityId, (resolvedId) => crateManager.getEntity({ id: resolvedId, link: false, materialise: false }), Object.keys(crateManager.entityIdIndex ?? {}));
+    if (isPendingEntityCreateApproval(entityApproval)) {
+      if (targetEntity) {
+        crateManager.deleteEntity({ id: targetEntity["@id"] });
+      }
+      return { "@id": void 0 };
+    }
     if (!targetEntity) return void 0;
     const approvalRecords = getPendingEntityApprovalRecords(
       approvalContext == null ? void 0 : approvalContext.roCrateApproval,
@@ -126101,22 +126171,53 @@ const RenderEntity = forwardRef((props, ref) => {
     approvalRecords.filter((approvalRecord) => (approvalRecord == null ? void 0 : approvalRecord.propertyName) === "@id").forEach((approvalRecord) => restoreEntityApprovalValue(targetEntity, approvalRecord));
     return restoredValues;
   };
+  const getVerifiedRestoredEntityId = (entityId, restoredValues) => {
+    const requestedId = typeof (restoredValues == null ? void 0 : restoredValues["@id"]) === "string" ? restoredValues["@id"].trim() : "";
+    if (!requestedId || requestedId === entityId) return void 0;
+    const restoredEntity = crateManager.getEntity({
+      id: requestedId,
+      link: false,
+      materialise: false
+    });
+    return restoredEntity == null ? void 0 : restoredEntity["@id"];
+  };
+  const navigateToRestoredEntity = (previousEntityId, restoredEntityId) => {
+    if (!restoredEntityId || restoredEntityId === previousEntityId) return;
+    handleLoadEntityWithContext({ id: restoredEntityId });
+    state.editorState.replaceId({ id: previousEntityId, newId: restoredEntityId });
+  };
   const handleRejectAiEntityEdit = (editedEntity) => {
     var _a3;
     try {
       const entityId = editedEntity == null ? void 0 : editedEntity["@id"];
       if (!entityId) return;
+      const entityApproval = getEntityApproval(approvalContext == null ? void 0 : approvalContext.roCrateApproval, entityId);
+      const rejectingCreatedEntity = isPendingEntityCreateApproval(entityApproval);
       const restoredValues = restoreEditedEntityApprovalValues(entityId);
       if (!restoredValues) return;
-      if (entityIdsMatch(entityId, entity == null ? void 0 : entity["@id"])) {
+      const restoredEntityId = rejectingCreatedEntity ? void 0 : getVerifiedRestoredEntityId(entityId, restoredValues);
+      const editsCurrentEntity = entityIdsMatch(entityId, entity == null ? void 0 : entity["@id"]);
+      const rejectsCurrentCreatedEntity = rejectingCreatedEntity && editsCurrentEntity;
+      if (editsCurrentEntity && !rejectingCreatedEntity) {
         refresh();
       }
-      saveCratePreservingView();
+      let nextActiveEntityId;
+      if (rejectsCurrentCreatedEntity) {
+        nextActiveEntityId = "./";
+      } else if (editsCurrentEntity) {
+        nextActiveEntityId = restoredEntityId;
+      }
+      saveCratePreservingView(nextActiveEntityId);
       (_a3 = approvalContext == null ? void 0 : approvalContext.markApprovalEntityApproved) == null ? void 0 : _a3.call(approvalContext, {
         entityId,
         decision: "reject",
         value: restoredValues
       });
+      if (rejectsCurrentCreatedEntity) {
+        onLoadEntity({ id: "./" });
+      } else if (editsCurrentEntity) {
+        navigateToRestoredEntity(entityId, restoredEntityId);
+      }
     } catch (error2) {
       console.error(error2);
       onError();
@@ -126125,20 +126226,27 @@ const RenderEntity = forwardRef((props, ref) => {
   const handleRejectCurrentEntityAiApprovals = () => {
     var _a3;
     try {
-      const restoredValues = pendingAiApprovals.reduce((acc, approvalRecord) => {
-        if (approvalRecord == null ? void 0 : approvalRecord.propertyName) {
-          acc[approvalRecord.propertyName] = approvalRecord.previousValue;
-        }
-        restoreApprovalValue(approvalRecord);
-        return acc;
-      }, {});
-      refresh();
-      saveCratePreservingView();
+      const entityId = entity == null ? void 0 : entity["@id"];
+      if (!entityId) return;
+      const entityApproval = getEntityApproval(approvalContext == null ? void 0 : approvalContext.roCrateApproval, entityId);
+      const rejectingCreatedEntity = isPendingEntityCreateApproval(entityApproval);
+      const restoredValues = restoreEditedEntityApprovalValues(entityId);
+      if (!restoredValues) return;
+      const restoredEntityId = rejectingCreatedEntity ? void 0 : getVerifiedRestoredEntityId(entityId, restoredValues);
+      if (!rejectingCreatedEntity) {
+        refresh();
+      }
+      saveCratePreservingView(rejectingCreatedEntity ? "./" : restoredEntityId);
       (_a3 = approvalContext == null ? void 0 : approvalContext.markApprovalEntityApproved) == null ? void 0 : _a3.call(approvalContext, {
-        entityId: entity["@id"],
+        entityId,
         decision: "reject",
         value: restoredValues
       });
+      if (rejectingCreatedEntity) {
+        onLoadEntity({ id: "./" });
+      } else {
+        navigateToRestoredEntity(entityId, restoredEntityId);
+      }
     } catch (error2) {
       console.error(error2);
       onError();
@@ -126276,6 +126384,9 @@ const RenderEntity = forwardRef((props, ref) => {
     var _a3;
     try {
       const restoredValues = {};
+      const currentEntityId = entity == null ? void 0 : entity["@id"];
+      let restoredCurrentEntityId;
+      let rejectsCurrentCreatedEntity = false;
       const pendingEntities = getPendingApprovalEntities(approvalContext == null ? void 0 : approvalContext.roCrateApproval);
       pendingContextApprovalItems.forEach((approvalItem) => {
         var _a4;
@@ -126287,6 +126398,9 @@ const RenderEntity = forwardRef((props, ref) => {
       pendingEntities.forEach((entityApproval) => {
         const entityId = entityApproval == null ? void 0 : entityApproval["@id"];
         if (!entityId) return;
+        if (isPendingEntityCreateApproval(entityApproval) && entityIdsMatch(entityId, currentEntityId)) {
+          rejectsCurrentCreatedEntity = true;
+        }
         if (isPendingEntityDeleteApproval(entityApproval)) {
           const deletedEntity = getDeletedEntityFromApproval(entityApproval);
           if (deletedEntity) {
@@ -126297,14 +126411,24 @@ const RenderEntity = forwardRef((props, ref) => {
         const restoredEntityValues = restoreEditedEntityApprovalValues(entityId);
         if (restoredEntityValues) {
           restoredValues[entityId] = restoredEntityValues;
+          if (entityIdsMatch(entityId, currentEntityId)) {
+            restoredCurrentEntityId = getVerifiedRestoredEntityId(entityId, restoredEntityValues);
+          }
         }
       });
       refresh();
-      saveCratePreservingView();
+      saveCratePreservingView(
+        rejectsCurrentCreatedEntity ? "./" : restoredCurrentEntityId
+      );
       (_a3 = approvalContext == null ? void 0 : approvalContext.markApprovalCrateApproved) == null ? void 0 : _a3.call(approvalContext, {
         decision: "reject",
         value: restoredValues
       });
+      if (rejectsCurrentCreatedEntity) {
+        onLoadEntity({ id: "./" });
+      } else if (currentEntityId) {
+        navigateToRestoredEntity(currentEntityId, restoredCurrentEntityId);
+      }
     } catch (error2) {
       console.error(error2);
       onError();
@@ -135327,7 +135451,7 @@ var EmotionCacheContext = /* @__PURE__ */ React.createContext(
   }) : null
 );
 var CacheProvider = EmotionCacheContext.Provider;
-const version = "0.1.51";
+const version = "0.1.52";
 const pkg = {
   version
 };
@@ -135806,7 +135930,7 @@ function RecrateCrateBuilderInner(props) {
       let nextEntity = null;
       for (const candidateId of candidateIds) {
         if (!candidateId) continue;
-        const maybeEntity = newCm.getEntity({ id: candidateId, link: false, materialise: false });
+        const maybeEntity = resolveEntityByIdAliases(candidateId, (resolvedId) => newCm.getEntity({ id: resolvedId, link: false, materialise: false }), Object.keys(newCm.entityIdIndex));
         if (!isEmpty(maybeEntity)) {
           nextEntity = maybeEntity;
           break;
@@ -135831,7 +135955,7 @@ function RecrateCrateBuilderInner(props) {
     const { id: id2, updateState = true } = params;
     if (!id2 || !cm) return;
     try {
-      const entity = cm.getEntity({ id: id2, link: false, materialise: false });
+      const entity = resolveEntityByIdAliases(id2, (resolvedId) => cm.getEntity({ id: resolvedId, link: false, materialise: false }), Object.keys(cm.entityIdIndex));
       if (!isEmpty(entity)) {
         setContextEntity(entity);
         onNavigation == null ? void 0 : onNavigation({
@@ -135888,7 +136012,7 @@ function RecrateCrateBuilderInner(props) {
     if (!cm) {
       return;
     }
-    if (lastHandledEntityIdRef.current === entityId && entityId === (contextEntity == null ? void 0 : contextEntity["@id"])) {
+    if (lastHandledEntityIdRef.current === entityId) {
       return;
     }
     lastHandledEntityIdRef.current = entityId;
@@ -135936,13 +136060,23 @@ function RecrateCrateBuilderInner(props) {
     scrollToFieldRequest == null ? void 0 : scrollToFieldRequest.fieldName,
     scrollToFieldRequest == null ? void 0 : scrollToFieldRequest.nonce
   ]);
-  const saveCrate = () => {
+  const saveCrate = (requestedEntityId) => {
+    var _a2;
     if (!cm) return;
     if (purgeUnlinkedEntities) {
       cm.purgeUnlinkedEntities();
     }
     const exported = cm.exportCrate();
-    const currentEntityId = typeof (contextEntity == null ? void 0 : contextEntity["@id"]) === "string" ? contextEntity["@id"] : void 0;
+    const graph = Array.isArray(exported == null ? void 0 : exported["@graph"]) ? exported["@graph"] : [];
+    const availableEntityIds = new Set(
+      graph.map((item) => typeof (item == null ? void 0 : item["@id"]) === "string" ? item["@id"] : void 0).filter(Boolean)
+    );
+    const currentEntityId = [
+      requestedEntityId,
+      contextEntity == null ? void 0 : contextEntity["@id"],
+      (_a2 = state.editorState.latest()) == null ? void 0 : _a2.id,
+      "./"
+    ].find((candidate) => typeof candidate === "string" && availableEntityIds.has(candidate));
     onSaveCrate == null ? void 0 : onSaveCrate({ crate: exported, entityId: currentEntityId });
   };
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "recrate", children: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arpproject/recrate",
-  "version": "0.1.51",
+  "version": "0.1.52",
   "type": "module",
   "main": "./dist/recrate.es.js",
   "module": "./dist/recrate.es.js",