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

package/dist/index.umd.js

@@ -3252,8 +3252,6 @@
   const DataSourceContext = React.createContext({});
   const useDataSource = (collection) => {
     const defaultDataSource = React.useContext(DataSourceContext);
-    if (collection?.overrides?.dataSource)
-      return collection?.overrides.dataSource;
     return defaultDataSource;
   };
   const NavigationContext = React.createContext({});
@@ -3391,7 +3389,7 @@
     itemCount,
     searchString
   }) {
-    const dataSource = useDataSource(collection);
+    const dataSource = useDataSource();
     const navigationController = useNavigationController();
     const path = navigationController.resolveAliasesFrom(inputPath);
     const sortByProperty = sortBy ? sortBy[0] : void 0;
@@ -3474,7 +3472,7 @@
     collection,
     useCache = false
   }) {
-    const dataSource = useDataSource(collection);
+    const dataSource = useDataSource();
     const navigationController = useNavigationController();
     const path = navigationController.resolveAliasesFrom(inputPath);
     const context = useFireCMSContext();
@@ -3685,7 +3683,8 @@
       }
     }
     return dataSource.deleteEntity({
-      entity
+      entity,
+      collection
     }).then(() => {
       onDeleteSuccess && onDeleteSuccess(entity);
       try {
@@ -10352,7 +10351,7 @@
     } = collection;
     const [popupCell, setPopupCell] = React.useState(void 0);
     const navigation = useNavigationController();
-    const dataSource = useDataSource(collection);
+    const dataSource = useDataSource();
     const resolvedPath = React.useMemo(() => navigation.resolveAliasesFrom(fullPath), [fullPath, navigation.resolveAliasesFrom]);
     const forceFilter = forceFilterFromProps ?? forceFilterFromCollection;
     const paginationEnabled = collection.pagination === void 0 || Boolean(collection.pagination);
@@ -10600,7 +10599,7 @@
     onMultipleEntitiesDelete,
     path
   }) {
-    const dataSource = useDataSource(collection);
+    const dataSource = useDataSource();
     const customizationController = useCustomizationController();
     const snackbarController = useSnackbarController();
     const [loading, setLoading] = React.useState(false);
@@ -10895,7 +10894,8 @@
     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] = React.useState([]);
     const toggleEntitySelection = (entity) => {
       let newValue;
@@ -12244,7 +12244,7 @@
     }) {
       const context = useFireCMSContext();
       const fullPath = fullPathProp ?? collectionProp.path;
-      const dataSource = useDataSource(collectionProp);
+      const dataSource = useDataSource();
       const navigation = useNavigationController();
       const sideEntityController = useSideEntityController();
       const authController = useAuthController();
@@ -12378,7 +12378,7 @@
           value,
           property,
           entityId
-        }) => dataSource.checkUniqueField(fullPath, name, value, entityId, collection.databaseId),
+        }) => dataSource.checkUniqueField(fullPath, name, value, entityId, collection),
         [fullPath]
       );
       const onValueChange = ({
@@ -12758,7 +12758,7 @@
     sortBy,
     onCountChange
   }) {
-    const dataSource = useDataSource(collection);
+    const dataSource = useDataSource();
     const navigation = useNavigationController();
     const [count, setCount] = React.useState(void 0);
     const [error, setError] = React.useState(void 0);
@@ -17315,7 +17315,7 @@
     }, false, 2e3);
     const inputCollection = collection;
     const authController = useAuthController();
-    const dataSource = useDataSource(collection);
+    const dataSource = useDataSource();
     const sideDialogContext = useSideDialogContext();
     const sideEntityController = useSideEntityController();
     const snackbarController = useSnackbarController();
@@ -17337,7 +17337,7 @@
         if (mustSetCustomId) {
           return void 0;
         } else {
-          return dataSource.generateEntityId(path);
+          return dataSource.generateEntityId(path, collection);
         }
       } else {
         return entityIdProp;
@@ -17710,7 +17710,7 @@
         name,
         value,
         property
-      }) => dataSource.checkUniqueField(path, name, value, entityId, collection.databaseId),
+      }) => dataSource.checkUniqueField(path, name, value, entityId, collection),
       [dataSource, path, entityId]
     );
     const validationSchema = React.useMemo(
@@ -18263,11 +18263,9 @@
       setDrawerCloseRequested(false);
     };
     const onCloseRequest = (force) => {
-      console.log("onCloseRequest", blocked, force);
       if (blocked && !force) {
         setDrawerCloseRequested(true);
       } else {
-        console.log("onCloseRequest closing");
         sideDialogsController.close();
         panel?.onClose?.();
       }
@@ -18681,7 +18679,8 @@
         orderBy,
         order
       }) => {
-        return delegate.fetchCollection({
+        const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+        return usedDelegate.fetchCollection({
           path,
           filter,
           limit,
@@ -18721,10 +18720,10 @@
         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,
@@ -18748,11 +18747,14 @@
         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
@@ -18770,9 +18772,10 @@
         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,
@@ -18799,6 +18802,7 @@
         status
       }) => {
         const collection = collectionProp ?? navigationController.getCollection(path);
+        const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
         console.log("useBuildDatasource save", {
           path,
           entityId,
@@ -18814,29 +18818,29 @@
           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]),
@@ -18847,9 +18851,11 @@
        * @group Firestore
        */
       deleteEntity: React.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
@@ -18861,11 +18867,13 @@
        * @return `true` if there are no other fields besides the given entity
        * @group Firestore
        */
-      checkUniqueField: React.useCallback((path, name, value, entityId, databaseId) => {
-        return delegate.checkUniqueField(path, name, value, entityId, databaseId);
+      checkUniqueField: React.useCallback((path, name, value, entityId, collection) => {
+        const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+        return usedDelegate.checkUniqueField(path, name, value, entityId, collection);
       }, [delegate.checkUniqueField]),
-      generateEntityId: React.useCallback((path) => {
-        return delegate.generateEntityId(path);
+      generateEntityId: React.useCallback((path, collection) => {
+        const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+        return usedDelegate.generateEntityId(path, collection);
       }, [delegate.generateEntityId]),
       countEntities: delegate.countEntities ? async ({
         path,
@@ -18874,7 +18882,8 @@
         order,
         orderBy
       }) => {
-        return delegate.countEntities({
+        const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
+        return usedDelegate.countEntities({
           path,
           filter,
           orderBy,
@@ -18900,9 +18909,10 @@
         );
       }, [delegate.isFilterCombinationValid]),
       initTextSearch: React.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])
     };
   }