@firecms/core 3.5.2-canary.09e1281 → 3.5.2-canary.a36570e

package/dist/components/EntityCollectionView/utils.d.ts

@@ -1,3 +1,4 @@
 export declare function addRecentId(key: string, id: string): string[];
 export declare function saveSearchedIdsLocally(key: string, ids: string[]): void;
 export declare function getRecentIds(key: string): string[];
+export declare function removeRecentIds(key: string, ids: string[]): string[];

package/dist/index.es.js

@@ -21087,6 +21087,11 @@ function saveSearchedIdsLocally(key, ids) {
 function getRecentIds(key) {
   return getLocalStorageJSON("recent_id_searches::" + key, []);
 }
+function removeRecentIds(key, ids) {
+  const remaining = getRecentIds(key).filter((id) => !ids.includes(id));
+  saveSearchedIdsLocally(key, remaining);
+  return remaining;
+}
 const editEntityAction = {
   icon: /* @__PURE__ */ jsx(EditIcon, { size: "small" }),
   key: "edit",
@@ -26598,164 +26603,86 @@ function _temp$e(key_0) {
   return key_0.toString();
 }
 const DEFAULT_ENTITY_OPEN_MODE$1 = "side_panel";
-function EntityIdHeaderWidget(t0) {
-  const $ = c(53);
-  const {
-    collection,
-    path,
-    pathSegments,
-    fullIdPath
-  } = t0;
+function EntityIdHeaderWidget({
+  collection,
+  path,
+  pathSegments,
+  fullIdPath
+}) {
   const navigation = useNavigationController();
+  const dataSource = useDataSource();
   const [openPopup, setOpenPopup] = React__default.useState(false);
   const [searchString, setSearchString] = React__default.useState("");
-  let t1;
-  if ($[0] !== fullIdPath) {
-    t1 = () => getRecentIds(fullIdPath);
-    $[0] = fullIdPath;
-    $[1] = t1;
-  } else {
-    t1 = $[1];
-  }
-  const [recentIds, setRecentIds] = React__default.useState(t1);
+  const [recentIds, setRecentIds] = React__default.useState([]);
+  const latestCheck = useRef(0);
   const sideEntityController = useSideEntityController();
   const {
     t
   } = useTranslation();
+  const resolvedPath = navigation.resolveIdsFrom(path, pathSegments);
+  const resolvedPathSegments = pathSegments ? navigation.resolveSegmentsFrom?.(pathSegments) ?? pathSegments : void 0;
+  const entityExists = useCallback(async (entityId) => {
+    try {
+      const entity = await dataSource.fetchEntity({
+        path: resolvedPath,
+        pathSegments: resolvedPathSegments,
+        entityId,
+        collection
+      });
+      return Boolean(entity?.values);
+    } catch (e) {
+      return void 0;
+    }
+  }, [dataSource, resolvedPath, resolvedPathSegments, collection]);
+  const refreshRecentIds = () => {
+    const ids = getRecentIds(fullIdPath);
+    const check = ++latestCheck.current;
+    Promise.all(ids.map(entityExists)).then((results) => {
+      if (check !== latestCheck.current) return;
+      const missing = ids.filter((_, i) => results[i] === false);
+      if (missing.length > 0) removeRecentIds(fullIdPath, missing);
+      setRecentIds(ids.filter((__0, i_0) => results[i_0] === true));
+    });
+  };
   const openEntityMode = collection?.openEntityMode ?? DEFAULT_ENTITY_OPEN_MODE$1;
-  let t2;
-  if ($[2] !== openPopup || $[3] !== t) {
-    t2 = !openPopup ? t("find_by_id") : void 0;
-    $[2] = openPopup;
-    $[3] = t;
-    $[4] = t2;
-  } else {
-    t2 = $[4];
-  }
-  let t3;
-  if ($[5] !== fullIdPath) {
-    t3 = (open) => {
-      if (open) {
-        setRecentIds(getRecentIds(fullIdPath));
-      }
-      setOpenPopup(open);
-    };
-    $[5] = fullIdPath;
-    $[6] = t3;
-  } else {
-    t3 = $[6];
-  }
-  let t4;
-  let t5;
-  if ($[7] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t4 = /* @__PURE__ */ jsx(IconButton, { size: "small", children: /* @__PURE__ */ jsx(SearchIcon, { size: "small" }) });
-    t5 = cls("my-2 rounded-lg bg-surface-50 dark:bg-surface-950 text-surface-900 dark:text-white");
-    $[7] = t4;
-    $[8] = t5;
-  } else {
-    t4 = $[7];
-    t5 = $[8];
-  }
-  let t6;
-  if ($[9] !== collection || $[10] !== fullIdPath || $[11] !== navigation || $[12] !== openEntityMode || $[13] !== path || $[14] !== pathSegments || $[15] !== searchString || $[16] !== sideEntityController) {
-    t6 = (e) => {
-      e.preventDefault();
-      const entityId = searchString.trim();
-      if (!entityId) {
-        return;
-      }
+  return /* @__PURE__ */ jsx(Tooltip, { title: !openPopup ? t("find_by_id") : void 0, asChild: false, children: /* @__PURE__ */ jsx(Popover, { open: openPopup, onOpenChange: (open) => {
+    if (open) refreshRecentIds();
+    setOpenPopup(open);
+  }, sideOffset: 0, align: "start", alignOffset: -117, trigger: /* @__PURE__ */ jsx(IconButton, { size: "small", children: /* @__PURE__ */ jsx(SearchIcon, { size: "small" }) }), children: /* @__PURE__ */ jsxs("div", { className: cls("my-2 rounded-lg bg-surface-50 dark:bg-surface-950 text-surface-900 dark:text-white"), children: [
+    /* @__PURE__ */ jsx("form", { noValidate: true, onSubmit: (e_0) => {
+      e_0.preventDefault();
+      const entityId_0 = searchString.trim();
+      if (!entityId_0) return;
       setOpenPopup(false);
-      setRecentIds(addRecentId(fullIdPath, entityId));
+      entityExists(entityId_0).then((exists) => {
+        if (exists) addRecentId(fullIdPath, entityId_0);
+      });
       navigateToEntity({
         openEntityMode,
         collection,
-        entityId,
+        entityId: entityId_0,
         path,
         pathSegments,
         fullIdPath,
         sideEntityController,
         navigation
       });
-    };
-    $[9] = collection;
-    $[10] = fullIdPath;
-    $[11] = navigation;
-    $[12] = openEntityMode;
-    $[13] = path;
-    $[14] = pathSegments;
-    $[15] = searchString;
-    $[16] = sideEntityController;
-    $[17] = t6;
-  } else {
-    t6 = $[17];
-  }
-  let t7;
-  if ($[18] !== t) {
-    t7 = t("find_entity_by_id");
-    $[18] = t;
-    $[19] = t7;
-  } else {
-    t7 = $[19];
-  }
-  let t8;
-  if ($[20] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t8 = (e_0) => {
-      setSearchString(e_0.target.value);
-    };
-    $[20] = t8;
-  } else {
-    t8 = $[20];
-  }
-  let t9;
-  if ($[21] !== openPopup || $[22] !== searchString || $[23] !== t7) {
-    t9 = /* @__PURE__ */ jsx("input", { autoFocus: openPopup, placeholder: t7, onChange: t8, value: searchString, className: "rounded-lg bg-white dark:bg-surface-800 flex-grow bg-transparent outline-none p-2 " + focusedDisabled });
-    $[21] = openPopup;
-    $[22] = searchString;
-    $[23] = t7;
-    $[24] = t9;
-  } else {
-    t9 = $[24];
-  }
-  const t10 = !searchString.trim();
-  let t11;
-  if ($[25] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t11 = /* @__PURE__ */ jsx(KeyboardTabIcon, {});
-    $[25] = t11;
-  } else {
-    t11 = $[25];
-  }
-  let t12;
-  if ($[26] !== t10) {
-    t12 = /* @__PURE__ */ jsx(Button, { variant: "text", disabled: t10, type: "submit", children: t11 });
-    $[26] = t10;
-    $[27] = t12;
-  } else {
-    t12 = $[27];
-  }
-  let t13;
-  if ($[28] !== t12 || $[29] !== t9) {
-    t13 = /* @__PURE__ */ jsxs("div", { className: "flex p-2 w-full gap-2", children: [
-      t9,
-      t12
-    ] });
-    $[28] = t12;
-    $[29] = t9;
-    $[30] = t13;
-  } else {
-    t13 = $[30];
-  }
-  let t14;
-  if ($[31] !== t13 || $[32] !== t6) {
-    t14 = /* @__PURE__ */ jsx("form", { noValidate: true, onSubmit: t6, className: "w-96 max-w-full", children: t13 });
-    $[31] = t13;
-    $[32] = t6;
-    $[33] = t14;
-  } else {
-    t14 = $[33];
-  }
-  let t15;
-  if ($[34] !== collection || $[35] !== fullIdPath || $[36] !== navigation || $[37] !== openEntityMode || $[38] !== path || $[39] !== pathSegments || $[40] !== recentIds || $[41] !== sideEntityController) {
-    t15 = recentIds && recentIds.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2 p-2", children: recentIds.map((id) => /* @__PURE__ */ jsx(ReferencePreview, { reference: new EntityReference(id, path, void 0, pathSegments), hover: true, onClick: () => {
+    }, className: "w-96 max-w-full", children: /* @__PURE__ */ jsxs("div", { className: "flex p-2 w-full gap-2", children: [
+      /* @__PURE__ */ jsx(
+        "input",
+        {
+          autoFocus: openPopup,
+          placeholder: t("find_entity_by_id"),
+          onChange: (e_1) => {
+            setSearchString(e_1.target.value);
+          },
+          value: searchString,
+          className: "rounded-lg bg-white dark:bg-surface-800 flex-grow bg-transparent outline-none p-2 " + focusedDisabled
+        }
+      ),
+      /* @__PURE__ */ jsx(Button, { variant: "text", disabled: !searchString.trim(), type: "submit", children: /* @__PURE__ */ jsx(KeyboardTabIcon, {}) })
+    ] }) }),
+    recentIds && recentIds.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2 p-2", children: recentIds.map((id) => /* @__PURE__ */ jsx(ReferencePreview, { reference: new EntityReference(id, path, void 0, pathSegments), hover: true, onClick: () => {
       setOpenPopup(false);
       navigateToEntity({
         openEntityMode,
@@ -26767,51 +26694,8 @@ function EntityIdHeaderWidget(t0) {
         sideEntityController,
         navigation
       });
-    }, includeEntityLink: false, size: "small" }, id)) });
-    $[34] = collection;
-    $[35] = fullIdPath;
-    $[36] = navigation;
-    $[37] = openEntityMode;
-    $[38] = path;
-    $[39] = pathSegments;
-    $[40] = recentIds;
-    $[41] = sideEntityController;
-    $[42] = t15;
-  } else {
-    t15 = $[42];
-  }
-  let t16;
-  if ($[43] !== t14 || $[44] !== t15) {
-    t16 = /* @__PURE__ */ jsxs("div", { className: t5, children: [
-      t14,
-      t15
-    ] });
-    $[43] = t14;
-    $[44] = t15;
-    $[45] = t16;
-  } else {
-    t16 = $[45];
-  }
-  let t17;
-  if ($[46] !== openPopup || $[47] !== t16 || $[48] !== t3) {
-    t17 = /* @__PURE__ */ jsx(Popover, { open: openPopup, onOpenChange: t3, sideOffset: 0, align: "start", alignOffset: -117, trigger: t4, children: t16 });
-    $[46] = openPopup;
-    $[47] = t16;
-    $[48] = t3;
-    $[49] = t17;
-  } else {
-    t17 = $[49];
-  }
-  let t18;
-  if ($[50] !== t17 || $[51] !== t2) {
-    t18 = /* @__PURE__ */ jsx(Tooltip, { title: t2, asChild: false, children: t17 });
-    $[50] = t17;
-    $[51] = t2;
-    $[52] = t18;
-  } else {
-    t18 = $[52];
-  }
-  return t18;
+    }, includeEntityLink: false, size: "small" }, id)) })
+  ] }) }) });
 }
 const collectionScrollCache = /* @__PURE__ */ new Map();
 function useScrollRestoration() {