@firecms/core 3.0.0-canary.84 → 3.0.0-canary.86

package/dist/index.umd.js

@@ -5173,6 +5173,7 @@
         },
         className: ui.cls(
           "bg-white dark:bg-gray-900",
+          "min-h-[42px]",
           fullwidth ? "w-full" : "",
           "items-center",
           hover ? "hover:bg-slate-50 dark:hover:bg-gray-800 group-hover:bg-slate-50 dark:group-hover:bg-gray-800" : "",
@@ -7145,6 +7146,7 @@
         updateValue(entity ? getReferenceFrom(entity) : null);
       }, [updateValue]);
       const onMultipleEntitiesSelected = React.useCallback((entities) => {
+        console.log("onMultipleEntitiesSelected", entities);
         updateValue(entities.map((e) => getReferenceFrom(e)));
       }, [updateValue]);
       const selectedEntityIds = internalValue ? Array.isArray(internalValue) ? internalValue.map((ref) => ref.id) : internalValue.id ? [internalValue.id] : [] : [];
@@ -9054,6 +9056,7 @@
       data,
       onResetPagination,
       onEndReached,
+      endOffset = 600,
       rowHeight = 54,
       columns: columnsProp,
       onRowClick,
@@ -9073,7 +9076,8 @@
       style,
       className,
       endAdornment,
-      AddColumnComponent
+      AddColumnComponent,
+      debug
     }) {
       const sortByProperty = sortBy ? sortBy[0] : void 0;
       const currentSort = sortBy ? sortBy[1] : void 0;
@@ -9085,9 +9089,13 @@
       }, [columnsProp]);
       const [measureRef, bounds] = useMeasure();
       const onColumnResizeInternal = React.useCallback((params) => {
+        if (debug)
+          console.log("onColumnResizeInternal", params);
         setColumns(columns.map((column) => column.key === params.column.key ? params.column : column));
       }, [columns]);
       const onColumnResizeEndInternal = React.useCallback((params) => {
+        if (debug)
+          console.log("onColumnResizeEndInternal", params);
         setColumns(columns.map((column) => column.key === params.column.key ? params.column : column));
         if (onColumnResize) {
           onColumnResize(params);
@@ -9095,15 +9103,21 @@
       }, [columns, onColumnResize]);
       const filterRef = React.useRef();
       React.useEffect(() => {
+        if (debug)
+          console.log("Filter updated", filterInput);
         filterRef.current = filterInput;
       }, [filterInput]);
       const scrollToTop = React.useCallback(() => {
+        if (debug)
+          console.log("scrollToTop");
         endReachCallbackThreshold.current = 0;
         if (tableRef.current) {
           tableRef.current.scrollTo(tableRef.current?.scrollLeft, 0);
         }
       }, []);
       const onColumnSort = React.useCallback((key) => {
+        if (debug)
+          console.log("onColumnSort", key);
         const isDesc = sortByProperty === key && currentSort === "desc";
         const isAsc = sortByProperty === key && currentSort === "asc";
         const newSort = isAsc ? "desc" : isDesc ? void 0 : "asc";
@@ -9124,26 +9138,34 @@
         }
         scrollToTop();
       }, [checkFilterCombination, currentSort, onFilterUpdate, onResetPagination, onSortByUpdate, scrollToTop, sortByProperty]);
-      React.useCallback(() => {
-        endReachCallbackThreshold.current = 0;
-        if (onSortByUpdate)
-          onSortByUpdate(void 0);
-      }, [onSortByUpdate]);
       const maxScroll = Math.max((data?.length ?? 0) * rowHeight - bounds.height, 0);
+      if (debug)
+        console.log("maxScroll", maxScroll);
       const onEndReachedInternal = React.useCallback((scrollOffset) => {
-        if (onEndReached && (data?.length ?? 0) > 0 && scrollOffset > endReachCallbackThreshold.current + 600) {
+        if (debug)
+          console.log("onEndReachedInternal", scrollOffset, endReachCallbackThreshold.current + endOffset);
+        if (onEndReached && (data?.length ?? 0) > 0 && scrollOffset > endReachCallbackThreshold.current + endOffset) {
           endReachCallbackThreshold.current = scrollOffset;
           onEndReached();
         }
       }, [data?.length, onEndReached]);
       const onScroll = React.useCallback(({
+        scrollDirection,
         scrollOffset,
         scrollUpdateWasRequested
       }) => {
-        if (!scrollUpdateWasRequested && scrollOffset >= maxScroll - 600)
+        if (debug)
+          console.log("onScroll", {
+            scrollDirection,
+            scrollOffset,
+            scrollUpdateWasRequested
+          });
+        if (!scrollUpdateWasRequested && scrollOffset >= maxScroll - endOffset)
           onEndReachedInternal(scrollOffset);
       }, [maxScroll, onEndReachedInternal]);
       const onFilterUpdateInternal = React.useCallback((column, filterForProperty) => {
+        if (debug)
+          console.log("onFilterUpdateInternal", column, filterForProperty);
         endReachCallbackThreshold.current = 0;
         const filter = filterRef.current;
         let newFilterValue = filter ? { ...filter } : {};
@@ -9205,6 +9227,8 @@
         endAdornment,
         AddColumnComponent
       };
+      if (debug)
+        console.log("VirtualTable render", virtualListController);
       return /* @__PURE__ */ jsxRuntime.jsx(
         "div",
         {
@@ -9865,7 +9889,6 @@
                   onEndReached: loadNextPage,
                   onResetPagination: resetPagination,
                   error: dataLoadingError,
-                  paginationEnabled,
                   onColumnResize,
                   rowHeight: getRowHeight(size),
                   loading: dataLoading,
@@ -14632,7 +14655,7 @@
         ui.DateTimeField,
         {
           value: internalValue,
-          onChange: (dateValue) => setValue(dateValue ?? null),
+          onChange: (dateValue) => setValue(dateValue),
           size: "medium",
           mode: property.mode,
           clearable: property.clearable,
@@ -19171,7 +19194,7 @@
             inputValues: firestoreValues,
             properties,
             status,
-            timestampNowValue: delegate.currentTime(),
+            timestampNowValue: delegate.currentTime?.() ?? /* @__PURE__ */ new Date(),
             setDateToMidnight: delegate.setDateToMidnight
           }
         ) : firestoreValues;
@@ -19227,7 +19250,7 @@
           filter,
           orderBy,
           order,
-          isCollectionGroup: Boolean(collection.collectionGroup) ?? false
+          isCollectionGroup: Boolean(collection.collectionGroup)
         });
       } : void 0,
       isFilterCombinationValid: React.useCallback(({
@@ -19253,8 +19276,13 @@
     };
   }
   const DEFAULT_SERVER = "https://api-drplyi3b6q-ey.a.run.app";
-  async function makeRequest(authController, pluginKeys) {
-    const firebaseToken = await authController.getAuthToken();
+  async function makeRequest(authController, dataSourceKey, pluginKeys) {
+    let idToken;
+    try {
+      idToken = await authController.getAuthToken();
+    } catch (e) {
+      idToken = null;
+    }
     return fetch(
       DEFAULT_SERVER + "/access_log",
       {
@@ -19262,24 +19290,29 @@
         method: "POST",
         headers: {
           "Content-Type": "application/json",
-          Authorization: `Basic ${firebaseToken}`
+          Authorization: `Basic ${idToken}`
         },
-        body: JSON.stringify({ plugins: pluginKeys })
+        body: JSON.stringify({
+          email: authController.user?.email ?? null,
+          datasource: dataSourceKey,
+          plugins: pluginKeys
+        })
       }
     ).then(async (res) => {
       return res.json();
     });
   }
-  function useProjectLog(authController, plugins) {
+  function useProjectLog(authController, dataSourceDelegate, plugins) {
     const [accessResponse, setAccessResponse] = React.useState(null);
     const accessedUserRef = React.useRef(null);
+    const dataSourceKey = dataSourceDelegate.key;
     const pluginKeys = plugins?.map((plugin) => plugin.key);
     React.useEffect(() => {
       if (authController.user && authController.user.uid !== accessedUserRef.current && !authController.initialLoading) {
-        makeRequest(authController, pluginKeys).then(setAccessResponse);
+        makeRequest(authController, dataSourceKey, pluginKeys).then(setAccessResponse);
         accessedUserRef.current = authController.user.uid;
       }
-    }, [authController, pluginKeys]);
+    }, [authController, dataSourceKey, pluginKeys]);
     return accessResponse;
   }
   function FireCMS(props) {
@@ -19321,7 +19354,7 @@
     const analyticsController = React.useMemo(() => ({
       onAnalyticsEvent
     }), []);
-    const accessResponse = useProjectLog(authController, plugins);
+    const accessResponse = useProjectLog(authController, dataSourceDelegate, plugins);
     if (navigationController.navigationLoadingError) {
       return /* @__PURE__ */ jsxRuntime.jsx(ui.CenteredView, { maxWidth: "md", children: /* @__PURE__ */ jsxRuntime.jsx(
         ErrorView,