@firecms/core 3.0.0-canary.112 → 3.0.0-canary.113

package/dist/index.es.js

@@ -3248,8 +3248,6 @@ function replacePlaceholders({
 const DataSourceContext = React__default.createContext({});
 const useDataSource = (collection) => {
   const defaultDataSource = useContext(DataSourceContext);
-  if (collection?.overrides?.dataSource)
-    return collection?.overrides.dataSource;
   return defaultDataSource;
 };
 const NavigationContext = React__default.createContext({});
@@ -3387,7 +3385,7 @@ function useCollectionFetch({
   itemCount,
   searchString
 }) {
-  const dataSource = useDataSource(collection);
+  const dataSource = useDataSource();
   const navigationController = useNavigationController();
   const path = navigationController.resolveAliasesFrom(inputPath);
   const sortByProperty = sortBy ? sortBy[0] : void 0;
@@ -3470,7 +3468,7 @@ function useEntityFetch({
   collection,
   useCache = false
 }) {
-  const dataSource = useDataSource(collection);
+  const dataSource = useDataSource();
   const navigationController = useNavigationController();
   const path = navigationController.resolveAliasesFrom(inputPath);
   const context = useFireCMSContext();
@@ -3681,7 +3679,8 @@ async function deleteEntityWithCallbacks({
     }
   }
   return dataSource.deleteEntity({
-    entity
+    entity,
+    collection
   }).then(() => {
     onDeleteSuccess && onDeleteSuccess(entity);
     try {
@@ -10348,7 +10347,7 @@ function useDataSourceEntityCollectionTableController({
   } = collection;
   const [popupCell, setPopupCell] = React__default.useState(void 0);
   const navigation = useNavigationController();
-  const dataSource = useDataSource(collection);
+  const dataSource = useDataSource();
   const resolvedPath = useMemo(() => navigation.resolveAliasesFrom(fullPath), [fullPath, navigation.resolveAliasesFrom]);
   const forceFilter = forceFilterFromProps ?? forceFilterFromCollection;
   const paginationEnabled = collection.pagination === void 0 || Boolean(collection.pagination);
@@ -10596,7 +10595,7 @@ function DeleteEntityDialog({
   onMultipleEntitiesDelete,
   path
 }) {
-  const dataSource = useDataSource(collection);
+  const dataSource = useDataSource();
   const customizationController = useCustomizationController();
   const snackbarController = useSnackbarController();
   const [loading, setLoading] = useState(false);
@@ -10891,7 +10890,8 @@ function ReferenceSelectionTable({
   const analyticsController = useAnalyticsController();
   const customizationController = useCustomizationController();
   const fullPath = navigation.resolveAliasesFrom(pathInput);
-  const dataSource = useDataSource(collection);
+  console.trace("Opening reference dialog for path " + fullPath);
+  const dataSource = useDataSource();
   const [entitiesDisplayedFirst, setEntitiesDisplayedFirst] = useState([]);
   const toggleEntitySelection = (entity) => {
     let newValue;
@@ -12240,7 +12240,7 @@ const EntityCollectionView = React__default.memo(
   }) {
     const context = useFireCMSContext();
     const fullPath = fullPathProp ?? collectionProp.path;
-    const dataSource = useDataSource(collectionProp);
+    const dataSource = useDataSource();
     const navigation = useNavigationController();
     const sideEntityController = useSideEntityController();
     const authController = useAuthController();
@@ -12374,7 +12374,7 @@ const EntityCollectionView = React__default.memo(
         value,
         property,
         entityId
-      }) => dataSource.checkUniqueField(fullPath, name, value, entityId, collection.databaseId),
+      }) => dataSource.checkUniqueField(fullPath, name, value, entityId, collection),
       [fullPath]
     );
     const onValueChange = ({
@@ -12754,7 +12754,7 @@ function EntitiesCount({
   sortBy,
   onCountChange
 }) {
-  const dataSource = useDataSource(collection);
+  const dataSource = useDataSource();
   const navigation = useNavigationController();
   const [count, setCount] = useState(void 0);
   const [error, setError] = useState(void 0);
@@ -17311,7 +17311,7 @@ function EntityEditViewInner({
   }, false, 2e3);
   const inputCollection = collection;
   const authController = useAuthController();
-  const dataSource = useDataSource(collection);
+  const dataSource = useDataSource();
   const sideDialogContext = useSideDialogContext();
   const sideEntityController = useSideEntityController();
   const snackbarController = useSnackbarController();
@@ -17333,7 +17333,7 @@ function EntityEditViewInner({
       if (mustSetCustomId) {
         return void 0;
       } else {
-        return dataSource.generateEntityId(path);
+        return dataSource.generateEntityId(path, collection);
       }
     } else {
       return entityIdProp;
@@ -17706,7 +17706,7 @@ function EntityEditViewInner({
       name,
       value,
       property
-    }) => dataSource.checkUniqueField(path, name, value, entityId, collection.databaseId),
+    }) => dataSource.checkUniqueField(path, name, value, entityId, collection),
     [dataSource, path, entityId]
   );
   const validationSchema = useMemo(
@@ -18259,11 +18259,9 @@ function SideDialogView({
     setDrawerCloseRequested(false);
   };
   const onCloseRequest = (force) => {
-    console.log("onCloseRequest", blocked, force);
     if (blocked && !force) {
       setDrawerCloseRequested(true);
     } else {
-      console.log("onCloseRequest closing");
       sideDialogsController.close();
       panel?.onClose?.();
     }
@@ -18677,7 +18675,8 @@ function useBuildDataSource({
       orderBy,
       order
     }) => {
-      return delegate.fetchCollection({
+      const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+      return usedDelegate.fetchCollection({
         path,
         filter,
         limit,
@@ -18717,10 +18716,10 @@ function useBuildDataSource({
       onError
     }) => {
       const collection = collectionProp ?? navigationController.getCollection(path);
-      Boolean(collection?.collectionGroup);
-      if (!delegate.listenCollection)
+      const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+      if (!usedDelegate.listenCollection)
         throw Error("useBuildDataSource delegate not initialised");
-      return delegate.listenCollection({
+      return usedDelegate.listenCollection({
         path,
         filter,
         limit,
@@ -18744,11 +18743,14 @@ function useBuildDataSource({
       path,
       entityId,
       collection
-    }) => delegate.fetchEntity({
-      path,
-      entityId,
-      collection
-    }), [delegate]),
+    }) => {
+      const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+      return usedDelegate.fetchEntity({
+        path,
+        entityId,
+        collection
+      });
+    }, [delegate.fetchEntity]),
     /**
      *
      * @param path
@@ -18766,9 +18768,10 @@ function useBuildDataSource({
       onUpdate,
       onError
     }) => {
-      if (!delegate.listenEntity)
+      const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+      if (!usedDelegate.listenEntity)
         throw Error("useBuildDataSource delegate not initialised");
-      return delegate.listenEntity({
+      return usedDelegate.listenEntity({
         path,
         entityId,
         onUpdate,
@@ -18795,6 +18798,7 @@ function useBuildDataSource({
       status
     }) => {
       const collection = collectionProp ?? navigationController.getCollection(path);
+      const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
       console.log("useBuildDatasource save", {
         path,
         entityId,
@@ -18810,29 +18814,29 @@ function useBuildDataSource({
         fields: propertyConfigs
       }) : void 0;
       const properties = resolvedCollection?.properties;
-      const firestoreValues = delegate.cmsToDelegateModel(
+      const firestoreValues = usedDelegate.cmsToDelegateModel(
         values
       );
-      const updatedFirestoreValues = properties ? updateDateAutoValues(
+      const updatedValues = properties ? updateDateAutoValues(
         {
           inputValues: firestoreValues,
           properties,
           status,
-          timestampNowValue: delegate.currentTime?.() ?? /* @__PURE__ */ new Date(),
-          setDateToMidnight: delegate.setDateToMidnight
+          timestampNowValue: usedDelegate.currentTime?.() ?? /* @__PURE__ */ new Date(),
+          setDateToMidnight: usedDelegate.setDateToMidnight
         }
       ) : firestoreValues;
-      return delegate.saveEntity({
+      return usedDelegate.saveEntity({
         path,
         collection,
         entityId,
-        values: updatedFirestoreValues,
+        values: updatedValues,
         status
       }).then((res) => {
         return {
           id: res.id,
           path: res.path,
-          values: delegate.delegateToCMSModel(updatedFirestoreValues)
+          values: usedDelegate.delegateToCMSModel(updatedValues)
         };
       });
     }, [delegate.saveEntity, navigationController.getCollection]),
@@ -18843,9 +18847,11 @@ function useBuildDataSource({
      * @group Firestore
      */
     deleteEntity: useCallback(({
-      entity
+      entity,
+      collection
     }) => {
-      return delegate.deleteEntity({ entity });
+      const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+      return usedDelegate.deleteEntity({ entity, collection });
     }, [delegate.deleteEntity]),
     /**
      * Check if the given property is unique in the given collection
@@ -18857,11 +18863,13 @@ function useBuildDataSource({
      * @return `true` if there are no other fields besides the given entity
      * @group Firestore
      */
-    checkUniqueField: useCallback((path, name, value, entityId, databaseId) => {
-      return delegate.checkUniqueField(path, name, value, entityId, databaseId);
+    checkUniqueField: useCallback((path, name, value, entityId, collection) => {
+      const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+      return usedDelegate.checkUniqueField(path, name, value, entityId, collection);
     }, [delegate.checkUniqueField]),
-    generateEntityId: useCallback((path) => {
-      return delegate.generateEntityId(path);
+    generateEntityId: useCallback((path, collection) => {
+      const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+      return usedDelegate.generateEntityId(path, collection);
     }, [delegate.generateEntityId]),
     countEntities: delegate.countEntities ? async ({
       path,
@@ -18870,7 +18878,8 @@ function useBuildDataSource({
       order,
       orderBy
     }) => {
-      return delegate.countEntities({
+      const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+      return usedDelegate.countEntities({
         path,
         filter,
         orderBy,
@@ -18896,9 +18905,10 @@ function useBuildDataSource({
       );
     }, [delegate.isFilterCombinationValid]),
     initTextSearch: useCallback(async (props) => {
-      if (!delegate.initTextSearch)
+      const usedDelegate = props.collection?.overrides?.dataSourceDelegate ?? delegate;
+      if (!usedDelegate.initTextSearch)
         return false;
-      return delegate.initTextSearch(props);
+      return usedDelegate.initTextSearch(props);
     }, [delegate.initTextSearch])
   };
 }