@rebasepro/client-firebase 0.8.0 → 0.9.0

package/dist/index.umd.js

@@ -292,8 +292,8 @@
 							}, 5e3);
 						};
 						setProgressTimeout();
-						uploadTask.on("state_changed", (snapshot) => {
-							const progress = snapshot.bytesTransferred / snapshot.totalBytes * 100;
+						uploadTask.on("state_changed", (entity) => {
+							const progress = entity.bytesTransferred / entity.totalBytes * 100;
 							if (progress > lastProgress) {
 								lastProgress = progress;
 								setProgressTimeout();
@@ -616,8 +616,8 @@
 	//#region src/utils/database.ts
 	async function getFirestoreDataInPath(firebaseApp, path, parentPaths, limit) {
 		const firestore = (0, _firebase_firestore.getFirestore)(firebaseApp);
-		if (!parentPaths || parentPaths.length === 0) return (0, _firebase_firestore.getDocs)((0, _firebase_firestore.query)((0, _firebase_firestore.collection)(firestore, path), (0, _firebase_firestore.limit)(limit))).then((querySnapshot) => {
-			return querySnapshot.docs.map((doc) => doc.data());
+		if (!parentPaths || parentPaths.length === 0) return (0, _firebase_firestore.getDocs)((0, _firebase_firestore.query)((0, _firebase_firestore.collection)(firestore, path), (0, _firebase_firestore.limit)(limit))).then((queryEntity) => {
+			return queryEntity.docs.map((doc) => doc.data());
 		});
 		else {
 			let currentDocs = void 0;
@@ -729,9 +729,9 @@
 				if (collectionProp) {
 					console.debug("Init local search controller", path);
 					listeners[path] = (0, _firebase_firestore.onSnapshot)((0, _firebase_firestore.query)((0, _firebase_firestore.collection)(databaseId ? (0, _firebase_firestore.getFirestore)(firebaseApp, databaseId) : (0, _firebase_firestore.getFirestore)(firebaseApp), path)), {
-						next: (snapshot) => {
-							if (snapshot.metadata.fromCache && snapshot.metadata.hasPendingWrites) return;
-							const docs = snapshot.docs.map((doc) => ({
+						next: (entity) => {
+							if (entity.metadata.fromCache && entity.metadata.hasPendingWrites) return;
+							const docs = entity.docs.map((doc) => ({
 								id: doc.id,
 								...doc.data()
 							}));
@@ -998,6 +998,15 @@
 			const queryParams = [];
 			if (filter) Object.entries(filter).filter(([_, entry]) => !!entry).forEach(([key, filterParameter]) => {
 				const [op, value] = filterParameter;
+				if (op === "is-null") {
+					queryParams.push((0, _firebase_firestore.where)(key, "==", null));
+					return;
+				}
+				if (op === "is-not-null") {
+					queryParams.push((0, _firebase_firestore.where)(key, "!=", null));
+					return;
+				}
+				if (op === "like" || op === "ilike" || op === "not-like" || op === "not-ilike") throw new Error(`Firestore does not support the "${op}" operator (SQL pattern matching). Use a full-text search index or the collection's searchString instead.`);
 				queryParams.push((0, _firebase_firestore.where)(key, op, cmsToFirestoreModel(value, firestore)));
 			});
 			if (orderBy && order) queryParams.push((0, _firebase_firestore.orderBy)(orderBy, order));
@@ -1005,19 +1014,19 @@
 			if (limit) queryParams.push((0, _firebase_firestore.limit)(limit));
 			return (0, _firebase_firestore.query)(collectionReference, ...queryParams);
 		}, [firebaseApp]);
-		const getAndBuildEntity = (0, react.useCallback)((path, entityId, databaseId) => {
+		const getAndBuildEntity = (0, react.useCallback)((path, id, databaseId) => {
 			if (!firebaseApp) throw Error("useFirestoreDriver Firebase not initialised");
-			return (0, _firebase_firestore.getDoc)((0, _firebase_firestore.doc)(databaseId ? (0, _firebase_firestore.getFirestore)(firebaseApp, databaseId) : (0, _firebase_firestore.getFirestore)(firebaseApp), path, String(entityId))).then((docSnapshot) => {
-				if (!docSnapshot.exists()) return;
-				return createEntityFromDocument(docSnapshot, databaseId);
+			return (0, _firebase_firestore.getDoc)((0, _firebase_firestore.doc)(databaseId ? (0, _firebase_firestore.getFirestore)(firebaseApp, databaseId) : (0, _firebase_firestore.getFirestore)(firebaseApp), path, String(id))).then((docEntity) => {
+				if (!docEntity.exists()) return;
+				return createRowFromDocument(docEntity);
 			});
 		}, [firebaseApp]);
-		const listenEntity = (0, react.useCallback)(({ path, entityId, collection, onUpdate, onError }) => {
+		const listenOne = (0, react.useCallback)(({ path, id, collection, onUpdate, onError }) => {
 			if (!firebaseApp) throw Error("useFirestoreDriver Firebase not initialised");
 			const databaseId = collection?.databaseId;
-			return (0, _firebase_firestore.onSnapshot)((0, _firebase_firestore.doc)(databaseId ? (0, _firebase_firestore.getFirestore)(firebaseApp, databaseId) : (0, _firebase_firestore.getFirestore)(firebaseApp), path, String(entityId)), {
-				next: (docSnapshot) => {
-					onUpdate(createEntityFromDocument(docSnapshot, databaseId));
+			return (0, _firebase_firestore.onSnapshot)((0, _firebase_firestore.doc)(databaseId ? (0, _firebase_firestore.getFirestore)(firebaseApp, databaseId) : (0, _firebase_firestore.getFirestore)(firebaseApp), path, String(id)), {
+				next: (docEntity) => {
+					onUpdate(docEntity.exists() ? createRowFromDocument(docEntity) : null);
 				},
 				error: onError
 			});
@@ -1040,22 +1049,23 @@
 					subscriptions = [];
 					onUpdate([]);
 				}
-				const entities = [];
+				const rows = [];
 				const addedEntitiesSet = /* @__PURE__ */ new Set();
-				subscriptions = (ids ?? []).map((entityId) => {
-					return listenEntity({
+				subscriptions = (ids ?? []).map((id) => {
+					return listenOne({
 						path,
-						entityId,
-						onUpdate: (entity) => {
-							if (entity?.values) {
-								if (entity.id && !addedEntitiesSet.has(entity.id)) {
-									addedEntitiesSet.add(entity.id);
-									entities.push(entity);
-									onUpdate(entities);
+						id,
+						onUpdate: (row) => {
+							const incomingId = row?.id;
+							if (row && incomingId !== void 0) {
+								if (!addedEntitiesSet.has(incomingId)) {
+									addedEntitiesSet.add(incomingId);
+									rows.push(row);
+									onUpdate(rows);
 								}
-							} else if (entity?.id) {
-								addedEntitiesSet.delete(entity.id);
-								onUpdate([...entities.filter((e) => e.id !== entityId)]);
+							} else {
+								addedEntitiesSet.delete(id);
+								onUpdate([...rows.filter((r) => r.id !== id)]);
 							}
 						}
 					});
@@ -1064,7 +1074,7 @@
 			return () => {
 				subscriptions.forEach((p) => p());
 			};
-		}, [firebaseApp, listenEntity]);
+		}, [firebaseApp, listenOne]);
 		const initTextSearch = (0, react.useCallback)(async (props) => {
 			console.debug("Init text search controller", searchControllerRef.current, props.path);
 			if (!searchControllerRef.current) {
@@ -1089,7 +1099,7 @@
 		* @param orderBy
 		* @param order
 		* @return Function to cancel subscription
-		* @see useCollectionFetch if you need this functionality implemented as a hook
+		* @see useCollection if you need this functionality implemented as a hook
 		* @group Firestore
 		*/
 		const fetchCollection = (0, react.useCallback)(async ({ path, filter, limit, startAfter, searchString, orderBy, order, collection }) => {
@@ -1103,7 +1113,7 @@
 				orderBy,
 				order
 			});
-			return (await (0, _firebase_firestore.getDocs)(buildQuery(resolvedPath, filter, orderBy, order, startAfter, limit, databaseId))).docs.map((doc) => createEntityFromDocument(doc, databaseId));
+			return (await (0, _firebase_firestore.getDocs)(buildQuery(resolvedPath, filter, orderBy, order, startAfter, limit, databaseId))).docs.map((doc) => createRowFromDocument(doc));
 		}, [buildQuery]);
 		/**
 		* Listen to a entities in a given path
@@ -1118,7 +1128,7 @@
 		* @param order
 		* @param onUpdate
 		* @return Function to cancel subscription
-		* @see useCollectionFetch if you need this functionality implemented as a hook
+		* @see useCollection if you need this functionality implemented as a hook
 		* @group Firestore
 		*/
 		const listenCollection = (0, react.useCallback)(({ path, filter, limit, startAfter, searchString, orderBy, order, onUpdate, onError, collection }) => {
@@ -1146,8 +1156,8 @@
 				resolvedPath
 			});
 			return (0, _firebase_firestore.onSnapshot)(buildQuery(resolvedPath, filter, orderBy, order, startAfter, limit, databaseId), {
-				next: (snapshot) => {
-					if (!searchString) onUpdate(snapshot.docs.map((doc) => createEntityFromDocument(doc, databaseId)));
+				next: (entity) => {
+					if (!searchString) onUpdate(entity.docs.map((doc) => createRowFromDocument(doc)));
 				},
 				error: onError
 			});
@@ -1157,38 +1167,38 @@
 			performTextSearch
 		]);
 		/**
-		* Retrieve an entity given a path and a collection
+		* Retrieve a entity given a path and a collection
 		* @param path
-		* @param entityId
+		* @param id
 		* @param collection
 		* @group Firestore
 		*/
-		const fetchEntity = (0, react.useCallback)(({ path, entityId, collection }) => {
-			return getAndBuildEntity(path, entityId, collection?.databaseId);
+		const fetchOne = (0, react.useCallback)(({ path, id, collection }) => {
+			return getAndBuildEntity(path, id, collection?.databaseId);
 		}, [getAndBuildEntity]);
 		/**
 		* Save entity to the specified path. Note that Firestore does not allow
 		* undefined values.
 		* @param path
-		* @param entityId
+		* @param id
 		* @param values
 		* @param schemaId
 		* @param collection
 		* @param status
 		* @group Firestore
 		*/
-		const saveEntity = (0, react.useCallback)(({ path, entityId, values: valuesProp, collection, status }) => {
+		const save = (0, react.useCallback)(({ path, id, values: valuesProp, collection, status }) => {
 			if (!firebaseApp) throw Error("useFirestoreDriver Firebase not initialised");
 			console.debug("1", {
 				path,
-				entityId,
+				id,
 				values: valuesProp,
 				collection
 			});
 			const values = cmsToFirestoreModel(valuesProp, (0, _firebase_firestore.getFirestore)(firebaseApp));
 			console.debug("2", {
 				path,
-				entityId,
+				id,
 				values: valuesProp,
 				collection
 			});
@@ -1196,18 +1206,17 @@
 			const collectionReference = (0, _firebase_firestore.collection)(databaseId ? (0, _firebase_firestore.getFirestore)(firebaseApp, databaseId) : (0, _firebase_firestore.getFirestore)(firebaseApp), path);
 			console.debug("Saving entity", {
 				path,
-				entityId,
+				id,
 				values,
 				databaseId
 			});
 			let documentReference;
-			if (entityId) documentReference = (0, _firebase_firestore.doc)(collectionReference, String(entityId));
+			if (id) documentReference = (0, _firebase_firestore.doc)(collectionReference, String(id));
 			else documentReference = (0, _firebase_firestore.doc)(collectionReference);
 			return (0, _firebase_firestore.setDoc)(documentReference, values, { merge: true }).then(() => {
 				return {
-					id: documentReference.id,
-					path,
-					values: firestoreToCMSModel(values)
+					...firestoreToCMSModel(values),
+					id: documentReference.id
 				};
 			}).catch((error) => {
 				console.error("Error saving entity", error);
@@ -1215,15 +1224,15 @@
 			});
 		}, [firebaseApp]);
 		/**
-		* Delete an entity
+		* Delete a entity
 		* @param entity
 		* @param collection
 		* @group Firestore
 		*/
-		const deleteEntity = (0, react.useCallback)(({ entity }) => {
+		const deleteOne = (0, react.useCallback)(({ row, collection }) => {
 			if (!firebaseApp) throw Error("useFirestoreDriver Firebase not initialised");
-			const databaseId = entity.databaseId;
-			return (0, _firebase_firestore.deleteDoc)((0, _firebase_firestore.doc)(databaseId ? (0, _firebase_firestore.getFirestore)(firebaseApp, databaseId) : (0, _firebase_firestore.getFirestore)(firebaseApp), entity.path, String(entity.id)));
+			const databaseId = collection?.databaseId;
+			return (0, _firebase_firestore.deleteDoc)((0, _firebase_firestore.doc)(databaseId ? (0, _firebase_firestore.getFirestore)(firebaseApp, databaseId) : (0, _firebase_firestore.getFirestore)(firebaseApp), row.path, String(row.id)));
 		}, [firebaseApp]);
 		/**
 		* Check if the given property is unique in the given collection
@@ -1231,18 +1240,18 @@
 		* @param name of the property
 		* @param value
 		* @param property
-		* @param entityId
+		* @param id
 		* @return `true` if there are no other fields besides the given entity
 		* @group Firestore
 		*/
-		const checkUniqueField = (0, react.useCallback)(async (path, name, value, entityId, collection) => {
+		const checkUniqueField = (0, react.useCallback)(async (path, name, value, id, collection) => {
 			if (!firebaseApp) throw Error("useFirestoreDriver Firebase not initialised");
 			const databaseId = collection?.databaseId;
 			const firestore = databaseId ? (0, _firebase_firestore.getFirestore)(firebaseApp, databaseId) : (0, _firebase_firestore.getFirestore)(firebaseApp);
 			if (value === void 0 || value === null) return Promise.resolve(true);
-			return (await (0, _firebase_firestore.getDocs)((0, _firebase_firestore.query)((0, _firebase_firestore.collection)(firestore, path), (0, _firebase_firestore.where)(name, "==", cmsToFirestoreModel(value, firestore))))).docs.filter((doc) => doc.id !== entityId).length === 0;
+			return (await (0, _firebase_firestore.getDocs)((0, _firebase_firestore.query)((0, _firebase_firestore.collection)(firestore, path), (0, _firebase_firestore.where)(name, "==", cmsToFirestoreModel(value, firestore))))).docs.filter((doc) => doc.id !== id).length === 0;
 		}, [firebaseApp]);
-		const countEntities = (0, react.useCallback)(async ({ path, filter, order, orderBy, collection }) => {
+		const count = (0, react.useCallback)(async ({ path, filter, order, orderBy, collection }) => {
 			if (!firebaseApp) throw Error("useFirestoreDriver Firebase not initialised");
 			const databaseId = collection?.databaseId;
 			return (await (0, _firebase_firestore.getCountFromServer)(buildQuery(path, filter, orderBy, order, void 0, void 0, databaseId))).data().count;
@@ -1271,35 +1280,31 @@
 			initTextSearch,
 			fetchCollection,
 			listenCollection,
-			fetchEntity,
-			listenEntity,
-			saveEntity,
-			deleteEntity,
+			fetchOne,
+			listenOne,
+			save,
+			delete: deleteOne,
 			checkUniqueField,
-			countEntities,
+			count,
 			isFilterCombinationValid
 		}), [
 			firebaseApp,
 			initTextSearch,
 			fetchCollection,
 			listenCollection,
-			fetchEntity,
-			listenEntity,
-			saveEntity,
-			deleteEntity,
+			fetchOne,
+			listenOne,
+			save,
+			deleteOne,
 			checkUniqueField,
-			countEntities,
+			count,
 			isFilterCombinationValid
 		]);
 	}
-	var createEntityFromDocument = (docSnap, databaseId) => {
-		const values = firestoreToCMSModel(docSnap.data());
-		const path = getCMSPathFromFirestorePath(docSnap.ref.path);
+	var createRowFromDocument = (docSnap) => {
 		return {
-			id: docSnap.id,
-			path,
-			values,
-			databaseId
+			...firestoreToCMSModel(docSnap.data()),
+			id: docSnap.id
 		};
 	};
 	/**
@@ -1414,70 +1419,65 @@
 				let dbQuery = (0, _firebase_database.query)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), path));
 				if (startAfter !== void 0) dbQuery = (0, _firebase_database.query)(dbQuery, (0, _firebase_database.orderByKey)(), (0, _firebase_database.startAt)(String(startAfter)));
 				if (limit !== void 0) dbQuery = (0, _firebase_database.query)(dbQuery, (0, _firebase_database.limitToFirst)(limit));
-				const snapshot = await (0, _firebase_database.get)(dbQuery);
-				if (snapshot.exists()) return Object.entries(snapshot.val()).map(([id, values]) => ({
-					id,
-					path,
-					values: delegateToCMSModel(values)
+				const entity = await (0, _firebase_database.get)(dbQuery);
+				if (entity.exists()) return Object.entries(entity.val()).map(([id, values]) => ({
+					...delegateToCMSModel(values),
+					id
 				}));
 				return [];
 			}, [firebaseApp]),
 			listenCollection: (0, react.useCallback)(({ path, onUpdate }) => {
 				if (!firebaseApp) throw new Error("Firebase app not provided");
-				const unsubscribe = (0, _firebase_database.onValue)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), path), (snapshot) => {
-					if (snapshot.exists()) onUpdate(Object.entries(snapshot.val()).map(([id, values]) => ({
-						id,
-						path,
-						values: delegateToCMSModel(values)
+				const unsubscribe = (0, _firebase_database.onValue)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), path), (entity) => {
+					if (entity.exists()) onUpdate(Object.entries(entity.val()).map(([id, values]) => ({
+						...delegateToCMSModel(values),
+						id
 					})));
 					else onUpdate([]);
 				});
 				return () => unsubscribe();
 			}, [firebaseApp]),
-			fetchEntity: (0, react.useCallback)(async ({ path, entityId }) => {
+			fetchOne: (0, react.useCallback)(async ({ path, id }) => {
 				if (!firebaseApp) throw new Error("Firebase app not provided");
-				const snapshot = await (0, _firebase_database.get)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), `${path}/${entityId}`));
-				if (snapshot.exists()) return {
-					id: entityId,
-					path,
-					values: delegateToCMSModel(snapshot.val())
+				const entity = await (0, _firebase_database.get)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), `${path}/${id}`));
+				if (entity.exists()) return {
+					...delegateToCMSModel(entity.val()),
+					id
 				};
 			}, [firebaseApp]),
-			listenEntity: (0, react.useCallback)(({ path, entityId, onUpdate, onError }) => {
+			listenOne: (0, react.useCallback)(({ path, id, onUpdate, onError }) => {
 				if (!firebaseApp) throw new Error("Firebase app not provided");
-				const unsubscribe = (0, _firebase_database.onValue)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), `${path}/${entityId}`), (snapshot) => {
-					if (snapshot.exists()) onUpdate({
-						id: entityId,
-						path,
-						values: delegateToCMSModel(snapshot.val())
+				const unsubscribe = (0, _firebase_database.onValue)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), `${path}/${id}`), (entity) => {
+					if (entity.exists()) onUpdate({
+						...delegateToCMSModel(entity.val()),
+						id
 					});
 					else onError?.(/* @__PURE__ */ new Error("Entity does not exist"));
 				});
 				return () => unsubscribe();
 			}, [firebaseApp]),
-			saveEntity: (0, react.useCallback)(async ({ path, entityId, values }) => {
+			save: (0, react.useCallback)(async ({ path, id, values }) => {
 				if (!firebaseApp) throw new Error("Firebase app not provided");
 				const database = (0, _firebase_database.getDatabase)(firebaseApp);
-				const finalId = entityId ?? (0, _firebase_database.push)((0, _firebase_database.ref)(database, path)).key;
+				const finalId = id ?? (0, _firebase_database.push)((0, _firebase_database.ref)(database, path)).key;
 				if (!finalId) throw new Error("Could not generate a new id");
 				const transformedValues = cmsToRTDBModel(values, database);
 				await (0, _firebase_database.set)((0, _firebase_database.ref)(database, `${path}/${finalId}`), transformedValues);
 				return {
-					id: finalId,
-					path,
-					values
+					...values,
+					id: finalId
 				};
 			}, [firebaseApp]),
-			deleteEntity: (0, react.useCallback)(async ({ entity }) => {
+			delete: (0, react.useCallback)(async ({ row }) => {
 				if (!firebaseApp) throw new Error("Firebase app not provided");
-				await (0, _firebase_database.remove)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), `${entity.path}/${entity.id}`));
+				await (0, _firebase_database.remove)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), `${row.path}/${row.id}`));
 			}, [firebaseApp]),
-			checkUniqueField: (0, react.useCallback)(async (slug, name, value, entityId) => {
+			checkUniqueField: (0, react.useCallback)(async (slug, name, value, id) => {
 				if (!firebaseApp) throw new Error("Firebase app not provided");
-				const snapshot = await (0, _firebase_database.get)((0, _firebase_database.query)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), slug), (0, _firebase_database.orderByChild)(name), (0, _firebase_database.startAt)(value), (0, _firebase_database.limitToFirst)(1)));
-				if (!snapshot.exists()) return true;
-				const [key, entityValue] = Object.entries(snapshot.val())[0];
-				if (entityValue && typeof entityValue === "object" && entityValue[name] === value && key === entityId) return true;
+				const entity = await (0, _firebase_database.get)((0, _firebase_database.query)((0, _firebase_database.ref)((0, _firebase_database.getDatabase)(firebaseApp), slug), (0, _firebase_database.orderByChild)(name), (0, _firebase_database.startAt)(value), (0, _firebase_database.limitToFirst)(1)));
+				if (!entity.exists()) return true;
+				const [key, entityValue] = Object.entries(entity.val())[0];
+				if (entityValue && typeof entityValue === "object" && entityValue[name] === value && key === id) return true;
 				return false;
 			}, [firebaseApp]),
 			isFilterCombinationValid: (0, react.useCallback)(({ path, filter, sortBy }) => {
@@ -1567,11 +1567,11 @@
 			setRolesLoading(true);
 			return dataSourceDelegate.listenCollection?.({
 				path: rolesPath,
-				onUpdate(entities) {
+				onUpdate(rows) {
 					setRolesError(void 0);
-					console.debug("Updating roles", entities);
+					console.debug("Updating roles", rows);
 					try {
-						const newRoles = entityToRoles(entities);
+						const newRoles = rowsToRoles(rows);
 						if (!(0, fast_equals.deepEqual)(newRoles, roles)) setRoles(newRoles);
 					} catch (e) {
 						setRoles([]);
@@ -1601,11 +1601,11 @@
 			setUsersLoading(true);
 			return dataSourceDelegate.listenCollection?.({
 				path: usersPath,
-				onUpdate(entities) {
-					console.debug("Updating users", entities);
+				onUpdate(rows) {
+					console.debug("Updating users", rows);
 					setUsersError(void 0);
 					try {
-						setUsersWithRoleIds(entitiesToUsers(entities));
+						setUsersWithRoleIds(rowsToUsers(rows));
 					} catch (e) {
 						setUsersWithRoleIds([]);
 						console.error("Error loading users", e);
@@ -1640,21 +1640,21 @@
 				...userExists ? {} : { created_on: /* @__PURE__ */ new Date() }
 			};
 			if (userExists && userExists.uid !== user.uid) {
-				const entity = {
+				const row = {
 					values: {},
 					path: usersPath,
 					id: userExists.uid
 				};
-				await dataSourceDelegate.deleteEntity({ entity }).then(() => {
+				await dataSourceDelegate.delete({ row }).then(() => {
 					console.debug("Deleted previous user", userExists);
 				}).catch((e) => {
 					console.error("Error deleting user", e);
 				});
 			}
-			return dataSourceDelegate.saveEntity({
+			return dataSourceDelegate.save({
 				status: "existing",
 				path: usersPath,
-				entityId: email,
+				id: email,
 				values: (0, _rebasepro_utils.removeUndefined)(data)
 			}).then(() => user);
 		}, [usersPath, dataSourceDelegate?.initialised]);
@@ -1663,10 +1663,10 @@
 			if (!rolesPath) throw Error("useBuildUserManagement Firestore not initialised");
 			console.debug("Persisting role", role);
 			const { id, ...roleData } = role;
-			return dataSourceDelegate.saveEntity({
+			return dataSourceDelegate.save({
 				status: "existing",
 				path: rolesPath,
-				entityId: id,
+				id,
 				values: (0, _rebasepro_utils.removeUndefined)(roleData)
 			}).then(() => {});
 		}, [rolesPath, dataSourceDelegate?.initialised]);
@@ -1675,24 +1675,24 @@
 			if (!usersPath) throw Error("useBuildUserManagement Firestore not initialised");
 			console.debug("Deleting", user);
 			const { uid } = user;
-			const entity = {
+			const row = {
 				path: usersPath,
 				id: uid,
 				values: {}
 			};
-			await dataSourceDelegate.deleteEntity({ entity });
+			await dataSourceDelegate.delete({ row });
 		}, [usersPath, dataSourceDelegate?.initialised]);
 		const deleteRole = (0, react.useCallback)(async (role) => {
 			if (!dataSourceDelegate) throw Error("useBuildUserManagement Firebase not initialised");
 			if (!rolesPath) throw Error("useBuildUserManagement Firestore not initialised");
 			console.debug("Deleting", role);
 			const { id } = role;
-			const entity = {
+			const row = {
 				path: rolesPath,
 				id,
 				values: {}
 			};
-			await dataSourceDelegate.deleteEntity({ entity });
+			await dataSourceDelegate.delete({ row });
 		}, [rolesPath, dataSourceDelegate?.initialised]);
 		const defineRolesFor = (0, react.useCallback)((user) => {
 			if (!usersWithRoleIds) throw Error("Users not loaded");
@@ -1768,22 +1768,21 @@
 			} : null
 		};
 	}
-	var entitiesToUsers = (docs) => {
-		return docs.map((doc) => {
-			const data = doc.values;
-			const record = data;
+	var rowsToUsers = (rows) => {
+		return rows.map((row) => {
+			const { id, ...data } = row;
 			return {
 				...data,
-				uid: doc.id,
-				created_on: record.created_on,
-				updated_on: record.updated_on
+				uid: id,
+				created_on: data.created_on,
+				updated_on: data.updated_on
 			};
 		});
 	};
-	var entityToRoles = (entities) => {
-		return entities.map((doc) => ({
-			id: doc.id,
-			...doc.values
+	var rowsToRoles = (rows) => {
+		return rows.map((row) => ({
+			...row,
+			id: row.id
 		}));
 	};
 	//#endregion
@@ -2611,7 +2610,12 @@
 								authController,
 								userConfigPersistence,
 								dateTimeFormat,
-								driver: firestoreDelegate,
+								dataSources: [{
+									key: _rebasepro_types.DEFAULT_DATA_SOURCE_KEY,
+									engine: "firestore",
+									transport: "direct",
+									driver: firestoreDelegate
+								}],
 								storageSource,
 								entityLinkBuilder: ({ entity }) => `https://console.firebase.google.com/project/${firebaseApp.options.projectId}/firestore/data/${entity.path}/${entity.id}`,
 								locale,
@@ -2637,7 +2641,7 @@
 												to: urlController.buildUrlCollectionPath(firstCollectionEntry.id),
 												replace: true
 											}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_rebasepro_ui.CenteredView, { children: "No home page or collections provided." });
-											component = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_rebasepro_admin.SideEntityProvider, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_rebasepro_core.RebaseRoutes, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_router_dom.Route, {
+											component = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_rebasepro_admin.SidePanelProvider, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_rebasepro_core.RebaseRoutes, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_router_dom.Route, {
 												element: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_rebasepro_admin.Scaffold, {
 													logo: usedLogo,
 													autoOpenDrawer,