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

package/dist/components/VirtualTable/VirtualTableProps.d.ts

@@ -25,10 +25,6 @@ export interface VirtualTableProps<T extends Record<string, any>> {
      * The renderer receives props `{ cellData, columns, column, columnIndex, rowData, rowIndex, container, isScrolling }`
      */
     cellRenderer: React.ComponentType<CellRendererParams<T>>;
-    /**
-     * If enabled, content is loaded in batch
-     */
-    paginationEnabled?: boolean;
     /**
      * Set this callback if you want to support some combinations
      * of filter combinations only.
@@ -40,6 +36,10 @@ export interface VirtualTableProps<T extends Record<string, any>> {
      * A callback function when scrolling the table to near the end
      */
     onEndReached?: () => void;
+    /**
+     * Offset in pixels where the onEndReached callback is triggered
+     */
+    endOffset?: number;
     /**
      * When the pagination should be reset. E.g. the filters or sorting
      * has been reset.
@@ -119,8 +119,12 @@ export interface VirtualTableProps<T extends Record<string, any>> {
      * @param column
      */
     AddColumnComponent?: React.ComponentType;
+    /**
+     * Debug mode
+     */
+    debug?: boolean;
 }
-export type CellRendererParams<T extends any = any> = {
+export type CellRendererParams<T = any> = {
     column: VirtualTableColumn;
     columns: VirtualTableColumn[];
     columnIndex: number;
@@ -133,7 +137,7 @@ export type CellRendererParams<T extends any = any> = {
  * @see Table
  * @group Components
  */
-export interface VirtualTableColumn<CustomProps extends any = any> {
+export interface VirtualTableColumn<CustomProps = any> {
     /**
      * Data key for the cell value, could be "a.b.c"
      */

package/dist/hooks/useProjectLog.d.ts

@@ -1,8 +1,8 @@
-import { AuthController, FireCMSPlugin } from "../types";
+import { AuthController, DataSourceDelegate, FireCMSPlugin } from "../types";
 export declare const DEFAULT_SERVER_DEV = "https://api-kdoe6pj3qq-ey.a.run.app";
 export declare const DEFAULT_SERVER = "https://api-drplyi3b6q-ey.a.run.app";
 export type AccessResponse = {
     blocked?: boolean;
     message?: string;
 };
-export declare function useProjectLog(authController: AuthController, plugins?: FireCMSPlugin<any, any, any>[]): AccessResponse | null;
+export declare function useProjectLog(authController: AuthController, dataSourceDelegate: DataSourceDelegate, plugins?: FireCMSPlugin<any, any, any>[]): AccessResponse | null;

package/dist/index.es.js

@@ -5169,6 +5169,7 @@ const EntityPreviewContainerInner = React.forwardRef(({
       },
       className: 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" : "",
@@ -7141,6 +7142,7 @@ const TableReferenceFieldSuccess = React__default.memo(
       updateValue(entity ? getReferenceFrom(entity) : null);
     }, [updateValue]);
     const onMultipleEntitiesSelected = 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] : [] : [];
@@ -9050,6 +9052,7 @@ const VirtualTable = React__default.memo(
     data,
     onResetPagination,
     onEndReached,
+    endOffset = 600,
     rowHeight = 54,
     columns: columnsProp,
     onRowClick,
@@ -9069,7 +9072,8 @@ const VirtualTable = React__default.memo(
     style,
     className,
     endAdornment,
-    AddColumnComponent
+    AddColumnComponent,
+    debug
   }) {
     const sortByProperty = sortBy ? sortBy[0] : void 0;
     const currentSort = sortBy ? sortBy[1] : void 0;
@@ -9081,9 +9085,13 @@ const VirtualTable = React__default.memo(
     }, [columnsProp]);
     const [measureRef, bounds] = useMeasure();
     const onColumnResizeInternal = useCallback((params) => {
+      if (debug)
+        console.log("onColumnResizeInternal", params);
       setColumns(columns.map((column) => column.key === params.column.key ? params.column : column));
     }, [columns]);
     const onColumnResizeEndInternal = useCallback((params) => {
+      if (debug)
+        console.log("onColumnResizeEndInternal", params);
       setColumns(columns.map((column) => column.key === params.column.key ? params.column : column));
       if (onColumnResize) {
         onColumnResize(params);
@@ -9091,15 +9099,21 @@ const VirtualTable = React__default.memo(
     }, [columns, onColumnResize]);
     const filterRef = useRef();
     useEffect(() => {
+      if (debug)
+        console.log("Filter updated", filterInput);
       filterRef.current = filterInput;
     }, [filterInput]);
     const scrollToTop = useCallback(() => {
+      if (debug)
+        console.log("scrollToTop");
       endReachCallbackThreshold.current = 0;
       if (tableRef.current) {
         tableRef.current.scrollTo(tableRef.current?.scrollLeft, 0);
       }
     }, []);
     const onColumnSort = 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";
@@ -9120,26 +9134,34 @@ const VirtualTable = React__default.memo(
       }
       scrollToTop();
     }, [checkFilterCombination, currentSort, onFilterUpdate, onResetPagination, onSortByUpdate, scrollToTop, sortByProperty]);
-    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 = 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 = 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 = useCallback((column, filterForProperty) => {
+      if (debug)
+        console.log("onFilterUpdateInternal", column, filterForProperty);
       endReachCallbackThreshold.current = 0;
       const filter = filterRef.current;
       let newFilterValue = filter ? { ...filter } : {};
@@ -9201,6 +9223,8 @@ const VirtualTable = React__default.memo(
       endAdornment,
       AddColumnComponent
     };
+    if (debug)
+      console.log("VirtualTable render", virtualListController);
     return /* @__PURE__ */ jsx(
       "div",
       {
@@ -9861,7 +9885,6 @@ const SelectableTable = React__default.memo(
                 onEndReached: loadNextPage,
                 onResetPagination: resetPagination,
                 error: dataLoadingError,
-                paginationEnabled,
                 onColumnResize,
                 rowHeight: getRowHeight(size),
                 loading: dataLoading,
@@ -14628,7 +14651,7 @@ function DateTimeFieldBinding({
       DateTimeField,
       {
         value: internalValue,
-        onChange: (dateValue) => setValue(dateValue ?? null),
+        onChange: (dateValue) => setValue(dateValue),
         size: "medium",
         mode: property.mode,
         clearable: property.clearable,
@@ -19167,7 +19190,7 @@ function useBuildDataSource({
           inputValues: firestoreValues,
           properties,
           status,
-          timestampNowValue: delegate.currentTime(),
+          timestampNowValue: delegate.currentTime?.() ?? /* @__PURE__ */ new Date(),
           setDateToMidnight: delegate.setDateToMidnight
         }
       ) : firestoreValues;
@@ -19223,7 +19246,7 @@ function useBuildDataSource({
         filter,
         orderBy,
         order,
-        isCollectionGroup: Boolean(collection.collectionGroup) ?? false
+        isCollectionGroup: Boolean(collection.collectionGroup)
       });
     } : void 0,
     isFilterCombinationValid: useCallback(({
@@ -19249,8 +19272,13 @@ function useBuildDataSource({
   };
 }
 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",
     {
@@ -19258,24 +19286,29 @@ async function makeRequest(authController, pluginKeys) {
       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] = 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, pluginKeys).then(setAccessResponse);
+      makeRequest(authController, dataSourceKey, pluginKeys).then(setAccessResponse);
       accessedUserRef.current = authController.user.uid;
     }
-  }, [authController, pluginKeys]);
+  }, [authController, dataSourceKey, pluginKeys]);
   return accessResponse;
 }
 function FireCMS(props) {
@@ -19317,7 +19350,7 @@ function FireCMS(props) {
   const analyticsController = useMemo(() => ({
     onAnalyticsEvent
   }), []);
-  const accessResponse = useProjectLog(authController, plugins);
+  const accessResponse = useProjectLog(authController, dataSourceDelegate, plugins);
   if (navigationController.navigationLoadingError) {
     return /* @__PURE__ */ jsx(CenteredView, { maxWidth: "md", children: /* @__PURE__ */ jsx(
       ErrorView,