@firecms/core 3.0.0-canary.126 → 3.0.0-canary.128

package/README.md

@@ -9,7 +9,7 @@
 </p>
 
 <h1 align="center">FireCMS</h1>
-<h3 align="center">Awesome Firebase/Firestore-based headless CMS</h3>
+<h3 align="center">Awesome Firebase/MongoDB-based headless CMS</h3>
 <p align="center"><a href="https://demo.firecms.co">Live demo</a></p>
 
 <br />

package/dist/components/{DeleteConfirmationDialog.d.ts → ConfirmationDialog.d.ts}

@@ -1,5 +1,5 @@
 import React from "react";
-export declare function DeleteConfirmationDialog({ open, onAccept, onCancel, title, loading, body }: {
+export declare function ConfirmationDialog({ open, onAccept, onCancel, title, loading, body }: {
     open: boolean;
     onAccept: () => void;
     onCancel: () => void;

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

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

package/dist/components/EntityPreview.d.ts

@@ -7,7 +7,7 @@ export type EntityPreviewProps = {
     collection?: EntityCollection;
     hover?: boolean;
     previewProperties?: string[];
-    disabled: undefined | boolean;
+    disabled?: boolean;
     entity: Entity<any>;
     includeId?: boolean;
     includeEntityLink?: boolean;

package/dist/components/index.d.ts

@@ -18,7 +18,7 @@ export * from "./EntityCollectionTable";
 export * from "./NotFoundPage";
 export * from "./VirtualTable";
 export * from "./ErrorBoundary";
-export * from "./DeleteConfirmationDialog";
+export * from "./ConfirmationDialog";
 export * from "./FireCMSLogo";
 export * from "../core/DefaultAppBar";
 export * from "./ArrayContainer";

package/dist/hooks/useProjectLog.d.ts

@@ -5,4 +5,10 @@ export type AccessResponse = {
     blocked?: boolean;
     message?: string;
 };
-export declare function useProjectLog(authController: AuthController, dataSourceDelegate: DataSourceDelegate, plugins?: FireCMSPlugin<any, any, any>[]): AccessResponse | null;
+export interface UseProjectLogParams {
+    apiKey?: string;
+    authController: AuthController;
+    dataSourceDelegate: DataSourceDelegate;
+    plugins?: FireCMSPlugin<any, any, any>[];
+}
+export declare function useProjectLog({ authController, dataSourceDelegate, plugins, apiKey }: UseProjectLogParams): AccessResponse | null;

package/dist/index.es.js

@@ -2960,9 +2960,11 @@ function getArrayValuesCount(array) {
 function makePropertiesEditable(properties) {
   Object.keys(properties).forEach((key) => {
     const property = properties[key];
-    property.editable = true;
-    if (property.dataType === "map" && property.properties) {
-      makePropertiesEditable(property.properties);
+    if (property) {
+      property.editable = true;
+      if (property.dataType === "map" && property.properties) {
+        makePropertiesEditable(property.properties);
+      }
     }
   });
   return properties;
@@ -2970,13 +2972,19 @@ function makePropertiesEditable(properties) {
 function makePropertiesNonEditable(properties) {
   return Object.entries(properties).reduce((acc, [key, property]) => {
     if (!isPropertyBuilder(property) && property.dataType === "map" && property.properties) {
-      const updated = { ...property, properties: makePropertiesNonEditable(property.properties) };
+      const updated = {
+        ...property,
+        properties: makePropertiesNonEditable(property.properties)
+      };
       acc[key] = updated;
     }
     if (isPropertyBuilder(property)) {
       acc[key] = property;
     } else {
-      acc[key] = { ...property, editable: false };
+      acc[key] = {
+        ...property,
+        editable: false
+      };
     }
     return acc;
   }, {});
@@ -10782,6 +10790,23 @@ function DeleteEntityDialog({
     }
   );
 }
+function addRecentId(collectionId, id) {
+  const recentIds = getRecentIds(collectionId);
+  const newRecentIds = [id, ...recentIds.filter((i) => i !== id)];
+  if (newRecentIds.length > 5) {
+    newRecentIds.pop();
+  }
+  saveSearchedIdsLocally(collectionId, newRecentIds);
+  return newRecentIds;
+}
+function saveSearchedIdsLocally(collectionId, ids) {
+  localStorage.setItem("recent_id_searches::" + collectionId, JSON.stringify(ids));
+}
+function getRecentIds(collectionId) {
+  const stored = localStorage.getItem("recent_id_searches::" + collectionId);
+  if (!stored) return [];
+  return JSON.parse(stored);
+}
 const editEntityAction = {
   icon: /* @__PURE__ */ jsx(KeyboardTabIcon, {}),
   name: "Edit",
@@ -10799,6 +10824,9 @@ const editEntityAction = {
       path: entity.path,
       entityId: entity.id
     });
+    if (collection) {
+      addRecentId(collection.id, entity.id);
+    }
     const path = collection?.collectionGroup ? entity.path : fullPath ?? entity.path;
     context.sideEntityController.open({
       entityId: entity.id,
@@ -12837,6 +12865,7 @@ function EntityIdHeaderWidget({
 }) {
   const [openPopup, setOpenPopup] = React__default.useState(false);
   const [searchString, setSearchString] = React__default.useState("");
+  const [recentIds, setRecentIds] = React__default.useState(getRecentIds(collection.id));
   const sideEntityController = useSideEntityController();
   return /* @__PURE__ */ jsx(Tooltip, { title: !openPopup ? "Find by ID" : void 0, asChild: false, children: /* @__PURE__ */ jsx(
     Popover,
@@ -12847,47 +12876,69 @@ function EntityIdHeaderWidget({
       align: "start",
       alignOffset: -117,
       trigger: /* @__PURE__ */ jsx(IconButton, { size: "small", children: /* @__PURE__ */ jsx(SearchIcon, { size: "small" }) }),
-      children: /* @__PURE__ */ jsx(
-        "form",
-        {
-          noValidate: true,
-          onSubmit: (e) => {
-            e.preventDefault();
-            if (!searchString) return;
-            setOpenPopup(false);
-            return sideEntityController.open({
-              entityId: searchString.trim(),
-              path,
-              collection,
-              updateUrl: true
-            });
+      children: /* @__PURE__ */ jsxs("div", { className: cls("my-2 rounded-lg bg-gray-50 dark:bg-gray-950 text-gray-900 dark:text-white"), children: [
+        /* @__PURE__ */ jsx(
+          "form",
+          {
+            noValidate: true,
+            onSubmit: (e) => {
+              e.preventDefault();
+              if (!searchString) return;
+              setOpenPopup(false);
+              setRecentIds(addRecentId(collection.id, searchString.trim()));
+              return sideEntityController.open({
+                entityId: searchString.trim(),
+                path,
+                collection,
+                updateUrl: true
+              });
+            },
+            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: "Find entity by ID",
+                  onChange: (e) => {
+                    setSearchString(e.target.value);
+                  },
+                  value: searchString,
+                  className: "rounded-lg bg-white dark:bg-gray-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),
+            hover: true,
+            onClick: () => {
+              setOpenPopup(false);
+              sideEntityController.open({
+                entityId: id,
+                path,
+                collection,
+                updateUrl: true
+              });
+            },
+            includeEntityLink: false,
+            size: "small"
           },
-          className: "text-gray-900 dark:text-white w-96 max-w-full",
-          children: /* @__PURE__ */ jsxs("div", { className: "flex p-2 w-full gap-4", children: [
-            /* @__PURE__ */ jsx(
-              "input",
-              {
-                autoFocus: openPopup,
-                placeholder: "Find entity by ID",
-                onChange: (e) => {
-                  setSearchString(e.target.value);
-                },
-                value: searchString,
-                className: "flex-grow bg-transparent outline-none p-1 " + focusedDisabled
-              }
-            ),
-            /* @__PURE__ */ jsx(
-              Button,
-              {
-                variant: "outlined",
-                disabled: !searchString.trim(),
-                type: "submit",
-                children: "Go"
-              }
-            )
-          ] })
-        }
-      )
+          id
+        )) })
+      ] })
     }
   ) });
 }
@@ -12982,7 +13033,7 @@ function NotFoundPage() {
     }
   ) });
 }
-function DeleteConfirmationDialog({
+function ConfirmationDialog({
   open,
   onAccept,
   onCancel,
@@ -13517,7 +13568,7 @@ function ArrayItemOptions({
   return /* @__PURE__ */ jsx(
     "div",
     {
-      className: `pl-2 pt-1 pb-4 flex ${direction === "row" ? "flex-row-reverse" : "flex-col"} items-center`,
+      className: `pl-2 pt-1 pb-1 flex ${direction === "row" ? "flex-row-reverse" : "flex-col"} items-center`,
       ref: iconRef,
       ...provided.dragHandleProps,
       children: /* @__PURE__ */ jsxs(
@@ -19005,7 +19056,7 @@ function useBuildDataSource({
   };
 }
 const DEFAULT_SERVER = "https://api-drplyi3b6q-ey.a.run.app";
-async function makeRequest(authController, dataSourceKey, pluginKeys) {
+async function makeRequest(authController, dataSourceKey, pluginKeys, apiKey) {
   let idToken;
   try {
     idToken = await authController.getAuthToken();
@@ -19022,6 +19073,7 @@ async function makeRequest(authController, dataSourceKey, pluginKeys) {
         Authorization: `Basic ${idToken}`
       },
       body: JSON.stringify({
+        apiKey,
         email: authController.user?.email ?? null,
         datasource: dataSourceKey,
         plugins: pluginKeys
@@ -19031,14 +19083,19 @@ async function makeRequest(authController, dataSourceKey, pluginKeys) {
     return res.json();
   });
 }
-function useProjectLog(authController, dataSourceDelegate, plugins) {
+function useProjectLog({
+  authController,
+  dataSourceDelegate,
+  plugins,
+  apiKey
+}) {
   const [accessResponse, setAccessResponse] = useState(null);
   const accessedUserRef = useRef(null);
   const dataSourceKey = dataSourceDelegate.key;
   const pluginKeys = plugins?.map((plugin) => plugin.key);
   useEffect(() => {
     if (authController.user && authController.user.uid !== accessedUserRef.current && !authController.initialLoading) {
-      makeRequest(authController, dataSourceKey, pluginKeys).then(setAccessResponse);
+      makeRequest(authController, dataSourceKey, pluginKeys, apiKey).then(setAccessResponse);
       accessedUserRef.current = authController.user.uid;
     }
   }, [authController, dataSourceKey, pluginKeys]);
@@ -19059,7 +19116,8 @@ function FireCMS(props) {
     propertyConfigs,
     entityViews,
     components,
-    navigationController
+    navigationController,
+    apiKey
   } = props;
   useLocaleConfig(locale);
   const dataSource = useBuildDataSource({
@@ -19083,7 +19141,15 @@ function FireCMS(props) {
   const analyticsController = useMemo(() => ({
     onAnalyticsEvent
   }), []);
-  const accessResponse = useProjectLog(authController, dataSourceDelegate, plugins);
+  const accessResponse = useProjectLog({
+    apiKey,
+    authController,
+    dataSourceDelegate,
+    plugins
+  });
+  if (accessResponse?.message) {
+    console.warn(accessResponse.message);
+  }
   if (navigationController.navigationLoadingError) {
     return /* @__PURE__ */ jsx(CenteredView, { maxWidth: "md", children: /* @__PURE__ */ jsx(
       ErrorView,
@@ -19103,10 +19169,10 @@ function FireCMS(props) {
     ) });
   }
   if (accessResponse?.blocked) {
-    return /* @__PURE__ */ jsxs(CenteredView, { maxWidth: "md", fullScreen: true, children: [
-      /* @__PURE__ */ jsx(Typography, { variant: "h4", children: "Access blocked" }),
+    return /* @__PURE__ */ jsxs(CenteredView, { maxWidth: "md", fullScreen: true, className: "flex flex-col gap-2", children: [
+      /* @__PURE__ */ jsx(Typography, { variant: "h4", gutterBottom: true, children: "License needed" }),
       /* @__PURE__ */ jsxs(Typography, { children: [
-        "This app has been blocked. Please reach out at ",
+        "You need a valid license to use FireCMS PRO. Please reach out at ",
         /* @__PURE__ */ jsx(
           "a",
           {
@@ -19116,10 +19182,7 @@ function FireCMS(props) {
         ),
         " for more information."
       ] }),
-      accessResponse?.message && /* @__PURE__ */ jsxs(Typography, { children: [
-        "Response from the server: ",
-        accessResponse?.message
-      ] })
+      accessResponse?.message && /* @__PURE__ */ jsx(Typography, { children: accessResponse?.message })
     ] });
   }
   return /* @__PURE__ */ jsx(AnalyticsContext.Provider, { value: analyticsController, children: /* @__PURE__ */ jsx(CustomizationControllerContext.Provider, { value: customizationController, children: /* @__PURE__ */ jsx(
@@ -19752,6 +19815,7 @@ export {
   BooleanPreview,
   COLLECTION_PATH_SEPARATOR,
   CircularProgressCenter,
+  ConfirmationDialog,
   DEFAULT_FIELD_CONFIGS,
   DRAWER_WIDTH,
   DatePreview,
@@ -19759,7 +19823,6 @@ export {
   DefaultAppBar,
   DefaultDrawer,
   DefaultHomePage,
-  DeleteConfirmationDialog,
   Drawer,
   DrawerLogo,
   DrawerNavigationItem,