@firecms/entity_history 3.0.0 → 3.1.0-canary.1df3b2c

package/dist/index.umd.js

@@ -102,7 +102,7 @@
     const {
       previousValueInPath,
       childProperty,
-      key
+      propertyKey
     } = t0;
     if (typeof previousValueInPath === "string" || typeof previousValueInPath === "number") {
       let t1;
@@ -128,13 +128,13 @@
         return t2;
       } else {
         let t1;
-        if ($[4] === Symbol.for("react.memo_cache_sentinel")) {
+        if ($[4] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
           t1 = /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { variant: "caption", color: "secondary", children: "Previous value" });
           $[4] = t1;
         } else {
           t1 = $[4];
         }
-        const t2 = key;
+        const t2 = propertyKey;
         const t3 = childProperty;
         let t4;
         if ($[5] !== previousValueInPath || $[6] !== t2 || $[7] !== t3) {
@@ -150,7 +150,7 @@
           t4 = $[8];
         }
         let t5;
-        if ($[9] === Symbol.for("react.memo_cache_sentinel")) {
+        if ($[9] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
           t5 = /* @__PURE__ */ jsxRuntime.jsx(ui.KeyboardBackspaceIcon, { size: "smallest", color: "disabled", className: "mb-1" });
           $[9] = t5;
         } else {
@@ -205,7 +205,7 @@
         !user && updatedBy && /* @__PURE__ */ jsxRuntime.jsx(ui.Chip, { size: "small", children: updatedBy }),
         user && /* @__PURE__ */ jsxRuntime.jsx(UserChip, { user })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: ui.cls("bg-white dark:bg-surface-900", "min-h-[42px]", "w-full", "items-center", hover ? "hover:bg-surface-accent-50 dark:hover:bg-surface-800 group-hover:bg-surface-accent-50 dark:group-hover:bg-surface-800" : "", size === "small" ? "p-1" : "px-2 py-1", "flex border rounded-lg", onClick ? "cursor-pointer" : "", ui.defaultBorderMixin), children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: ui.cls("bg-white dark:bg-surface-900", "min-h-[44px]", "w-full", "items-center", hover ? "hover:bg-surface-accent-50 dark:hover:bg-surface-800 group-hover:bg-surface-accent-50 dark:group-hover:bg-surface-800" : "", size === "small" ? "p-1" : "px-2 py-1", "flex border rounded-lg", onClick ? "cursor-pointer" : "", ui.defaultBorderMixin), children: [
         actions,
         entity && /* @__PURE__ */ jsxRuntime.jsx(ui.Tooltip, { title: "See details for this revision", className: "my-2 grow-0 shrink-0 self-start", children: /* @__PURE__ */ jsxRuntime.jsx(ui.IconButton, { color: "inherit", className: "", onClick: (e) => {
           sideEntityController.open({
@@ -234,7 +234,7 @@
           return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-full my-1 items-center", children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { variant: "caption", color: "secondary", className: "min-w-[140px] md:min-w-[200px] w-1/5 pr-8 overflow-hidden text-ellipsis text-right", children: key }),
             /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "w-4/5", children: [
-              previousValueInPath !== void 0 && previousValueInPath !== valueInPath && /* @__PURE__ */ jsxRuntime.jsx(PreviousValueView, { previousValueInPath, childProperty }, key),
+              previousValueInPath !== void 0 && previousValueInPath !== valueInPath && /* @__PURE__ */ jsxRuntime.jsx(PreviousValueView, { previousValueInPath, childProperty, propertyKey: key }),
               element
             ] })
           ] }, "ref_prev_" + key);
@@ -243,7 +243,7 @@
     ] });
   }
   function EntityHistoryView(t0) {
-    const $ = reactCompilerRuntime.c(58);
+    const $ = reactCompilerRuntime.c(62);
     const {
       entity,
       collection,
@@ -256,7 +256,7 @@
     const pathAndId = entity ? entity?.path + "/" + entity?.id : void 0;
     const [revertVersionDialog, setRevertVersionDialog] = React.useState(void 0);
     let t1;
-    if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+    if ($[0] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
       t1 = [];
       $[0] = t1;
     } else {
@@ -270,8 +270,7 @@
     const observerRef = React.useRef(null);
     const loadMoreRef = React.useRef(null);
     let t2;
-    let t3;
-    if ($[1] !== dataSource || $[2] !== limit || $[3] !== pathAndId) {
+    if ($[1] !== collection || $[2] !== dataSource || $[3] !== limit || $[4] !== pathAndId) {
       t2 = () => {
         if (!pathAndId) {
           return;
@@ -279,6 +278,7 @@
         setIsLoading(true);
         const listener = dataSource.listenCollection?.({
           path: pathAndId + "/__history",
+          collection,
           order: "desc",
           orderBy: "__metadata.updated_on",
           limit,
@@ -300,19 +300,27 @@
           }
         };
       };
+      $[1] = collection;
+      $[2] = dataSource;
+      $[3] = limit;
+      $[4] = pathAndId;
+      $[5] = t2;
+    } else {
+      t2 = $[5];
+    }
+    let t3;
+    if ($[6] !== dataSource || $[7] !== limit || $[8] !== pathAndId) {
       t3 = [pathAndId, limit, dataSource];
-      $[1] = dataSource;
-      $[2] = limit;
-      $[3] = pathAndId;
-      $[4] = t2;
-      $[5] = t3;
+      $[6] = dataSource;
+      $[7] = limit;
+      $[8] = pathAndId;
+      $[9] = t3;
     } else {
-      t2 = $[4];
-      t3 = $[5];
+      t3 = $[9];
     }
     React.useEffect(t2, t3);
     let t4;
-    if ($[6] !== hasMore || $[7] !== isLoading) {
+    if ($[10] !== hasMore || $[11] !== isLoading) {
       t4 = () => {
         const currentContainer = containerRef.current;
         const currentLoadMore = loadMoreRef.current;
@@ -344,35 +352,35 @@
           }
         };
       };
-      $[6] = hasMore;
-      $[7] = isLoading;
-      $[8] = t4;
+      $[10] = hasMore;
+      $[11] = isLoading;
+      $[12] = t4;
     } else {
-      t4 = $[8];
+      t4 = $[12];
     }
     let t5;
-    if ($[9] !== hasMore || $[10] !== isLoading || $[11] !== revisions.length) {
+    if ($[13] !== hasMore || $[14] !== isLoading || $[15] !== revisions.length) {
       t5 = [hasMore, isLoading, revisions.length];
-      $[9] = hasMore;
-      $[10] = isLoading;
-      $[11] = revisions.length;
-      $[12] = t5;
+      $[13] = hasMore;
+      $[14] = isLoading;
+      $[15] = revisions.length;
+      $[16] = t5;
     } else {
-      t5 = $[12];
+      t5 = $[16];
     }
     React.useEffect(t4, t5);
     if (!entity) {
       let t62;
-      if ($[13] === Symbol.for("react.memo_cache_sentinel")) {
+      if ($[17] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
         t62 = /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-center h-full", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { children: "History is only available for existing entities" }) });
-        $[13] = t62;
+        $[17] = t62;
       } else {
-        t62 = $[13];
+        t62 = $[17];
       }
       return t62;
     }
     let t6;
-    if ($[14] !== authController || $[15] !== collection || $[16] !== dataSource || $[17] !== entity || $[18] !== formContext || $[19] !== snackbarController) {
+    if ($[18] !== authController || $[19] !== collection || $[20] !== dataSource || $[21] !== entity || $[22] !== formContext || $[23] !== snackbarController) {
       t6 = function doRevert2(revertVersion) {
         if (!entity) {
           throw new Error("No entity to revert");
@@ -417,46 +425,46 @@
           });
         });
       };
-      $[14] = authController;
-      $[15] = collection;
-      $[16] = dataSource;
-      $[17] = entity;
-      $[18] = formContext;
-      $[19] = snackbarController;
-      $[20] = t6;
+      $[18] = authController;
+      $[19] = collection;
+      $[20] = dataSource;
+      $[21] = entity;
+      $[22] = formContext;
+      $[23] = snackbarController;
+      $[24] = t6;
     } else {
-      t6 = $[20];
+      t6 = $[24];
     }
     const doRevert = t6;
     let t7;
-    if ($[21] === Symbol.for("react.memo_cache_sentinel")) {
+    if ($[25] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
       t7 = ui.cls("relative flex-1 h-full overflow-auto w-full flex flex-col gap-4 p-8");
-      $[21] = t7;
+      $[25] = t7;
     } else {
-      t7 = $[21];
+      t7 = $[25];
     }
     let t8;
-    if ($[22] === Symbol.for("react.memo_cache_sentinel")) {
+    if ($[26] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
       t8 = /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { variant: "h5", className: "mt-24 ml-4", children: "History" });
-      $[22] = t8;
+      $[26] = t8;
     } else {
-      t8 = $[22];
+      t8 = $[26];
     }
     let t9;
-    if ($[23] !== revisions.length) {
+    if ($[27] !== revisions.length) {
       t9 = revisions.length === 0 && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { className: "ml-4 mt-8", children: "No history available" }),
         /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { variant: "caption", className: "ml-4", children: "When you save an entity, a new version is created and stored in the history." })
       ] });
-      $[23] = revisions.length;
-      $[24] = t9;
+      $[27] = revisions.length;
+      $[28] = t9;
     } else {
-      t9 = $[24];
+      t9 = $[28];
     }
     let t10;
-    if ($[25] !== collection || $[26] !== dirty || $[27] !== revisions || $[28] !== snackbarController) {
+    if ($[29] !== collection || $[30] !== dirty || $[31] !== revisions || $[32] !== snackbarController) {
       let t112;
-      if ($[30] !== collection || $[31] !== dirty || $[32] !== snackbarController) {
+      if ($[34] !== collection || $[35] !== dirty || $[36] !== snackbarController) {
         t112 = (revision, index) => {
           const previewKeys = revision.values?.__metadata?.changed_fields;
           const previousValues = revision.values?.__metadata?.previous_values;
@@ -471,109 +479,109 @@
             }
           }, children: /* @__PURE__ */ jsxRuntime.jsx(ui.HistoryIcon, {}) }) }) }) }, index);
         };
-        $[30] = collection;
-        $[31] = dirty;
-        $[32] = snackbarController;
-        $[33] = t112;
+        $[34] = collection;
+        $[35] = dirty;
+        $[36] = snackbarController;
+        $[37] = t112;
       } else {
-        t112 = $[33];
+        t112 = $[37];
       }
       t10 = revisions.map(t112);
-      $[25] = collection;
-      $[26] = dirty;
-      $[27] = revisions;
-      $[28] = snackbarController;
-      $[29] = t10;
+      $[29] = collection;
+      $[30] = dirty;
+      $[31] = revisions;
+      $[32] = snackbarController;
+      $[33] = t10;
     } else {
-      t10 = $[29];
+      t10 = $[33];
     }
     let t11;
-    if ($[34] !== hasMore || $[35] !== isLoading || $[36] !== revisions.length) {
+    if ($[38] !== hasMore || $[39] !== isLoading || $[40] !== revisions.length) {
       t11 = revisions.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { ref: loadMoreRef, className: "py-4 text-center", children: [
         isLoading && /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { children: "Loading more..." }),
         !hasMore && revisions.length > 5 && /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { children: "No more history available" })
       ] });
-      $[34] = hasMore;
-      $[35] = isLoading;
-      $[36] = revisions.length;
-      $[37] = t11;
+      $[38] = hasMore;
+      $[39] = isLoading;
+      $[40] = revisions.length;
+      $[41] = t11;
     } else {
-      t11 = $[37];
+      t11 = $[41];
     }
     let t12;
-    if ($[38] !== t10 || $[39] !== t11 || $[40] !== t9) {
+    if ($[42] !== t10 || $[43] !== t11 || $[44] !== t9) {
       t12 = /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-2 max-w-6xl mx-auto w-full", children: [
         t8,
         t9,
         t10,
         t11
       ] });
-      $[38] = t10;
-      $[39] = t11;
-      $[40] = t9;
-      $[41] = t12;
+      $[42] = t10;
+      $[43] = t11;
+      $[44] = t9;
+      $[45] = t12;
     } else {
-      t12 = $[41];
+      t12 = $[45];
     }
     const t13 = Boolean(revertVersionDialog);
     let t14;
-    if ($[42] !== doRevert || $[43] !== revertVersionDialog) {
+    if ($[46] !== doRevert || $[47] !== revertVersionDialog) {
       t14 = function() {
         if (!revertVersionDialog) {
           return;
         }
         doRevert(revertVersionDialog);
       };
-      $[42] = doRevert;
-      $[43] = revertVersionDialog;
-      $[44] = t14;
+      $[46] = doRevert;
+      $[47] = revertVersionDialog;
+      $[48] = t14;
     } else {
-      t14 = $[44];
+      t14 = $[48];
     }
     let t15;
     let t16;
-    if ($[45] === Symbol.for("react.memo_cache_sentinel")) {
+    if ($[49] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
       t15 = function() {
         setRevertVersionDialog(void 0);
       };
       t16 = /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { variant: "subtitle2", children: "Revert data to this version?" });
-      $[45] = t15;
-      $[46] = t16;
+      $[49] = t15;
+      $[50] = t16;
     } else {
-      t15 = $[45];
-      t16 = $[46];
+      t15 = $[49];
+      t16 = $[50];
     }
     let t17;
-    if ($[47] !== collection || $[48] !== entity?.path || $[49] !== revertVersionDialog) {
+    if ($[51] !== collection || $[52] !== entity?.path || $[53] !== revertVersionDialog) {
       t17 = revertVersionDialog ? /* @__PURE__ */ jsxRuntime.jsx(core.EntityView, { entity: revertVersionDialog, collection, path: entity?.path }) : null;
-      $[47] = collection;
-      $[48] = entity?.path;
-      $[49] = revertVersionDialog;
-      $[50] = t17;
+      $[51] = collection;
+      $[52] = entity?.path;
+      $[53] = revertVersionDialog;
+      $[54] = t17;
     } else {
-      t17 = $[50];
+      t17 = $[54];
     }
     let t18;
-    if ($[51] !== t13 || $[52] !== t14 || $[53] !== t17) {
+    if ($[55] !== t13 || $[56] !== t14 || $[57] !== t17) {
       t18 = /* @__PURE__ */ jsxRuntime.jsx(core.ErrorBoundary, { children: /* @__PURE__ */ jsxRuntime.jsx(core.ConfirmationDialog, { open: t13, onAccept: t14, onCancel: t15, title: t16, body: t17 }) });
-      $[51] = t13;
-      $[52] = t14;
-      $[53] = t17;
-      $[54] = t18;
+      $[55] = t13;
+      $[56] = t14;
+      $[57] = t17;
+      $[58] = t18;
     } else {
-      t18 = $[54];
+      t18 = $[58];
     }
     let t19;
-    if ($[55] !== t12 || $[56] !== t18) {
+    if ($[59] !== t12 || $[60] !== t18) {
       t19 = /* @__PURE__ */ jsxRuntime.jsxs("div", { ref: containerRef, className: t7, children: [
         t12,
         t18
       ] });
-      $[55] = t12;
-      $[56] = t18;
-      $[57] = t19;
+      $[59] = t12;
+      $[60] = t18;
+      $[61] = t19;
     } else {
-      t19 = $[57];
+      t19 = $[61];
     }
     return t19;
   }
@@ -585,7 +593,8 @@
     previousValues,
     values,
     path,
-    entityId
+    entityId,
+    collection
   }) {
     const uid = context.authController.user?.uid;
     const dataSource = context.dataSource;
@@ -602,7 +611,8 @@
     dataSource.saveEntity({
       path: path + "/" + entityId + "/__history",
       values: entry,
-      status: "new"
+      status: "new",
+      collection
     }).then(() => {
       console.debug("History saved for", path, entityId);
     });
@@ -614,12 +624,14 @@
       const path = props.path;
       const entityId = props.entityId;
       const context = props.context;
+      const collection = props.collection;
       createHistoryEntry({
         context,
         previousValues,
         values,
         path,
-        entityId
+        entityId,
+        collection
       });
     }
   };