@directus/api 36.0.0 → 36.0.2

package/dist/license/entitlements/lib/seats.js

@@ -73,13 +73,12 @@ async function getActiveSeats(opts) {
 		knex
 	});
 	const adminFilters = [{ _or: [{ id: { _in: Array.from(adminUsers) } }, { role: { _in: Array.from(allAdminRoles) } }] }, { status: { _eq: "active" } }];
-	const appFilters = [{ _or: [{ id: {
-		_in: Array.from(appUsers),
-		_nin: Array.from(adminUsers)
-	} }, { role: {
-		_in: Array.from(allAppRoles),
-		_nin: Array.from(allAdminRoles)
-	} }] }, { status: { _eq: "active" } }];
+	const appFilters = [
+		{ _or: [{ id: { _in: Array.from(appUsers) } }, { role: { _in: Array.from(allAppRoles) } }] },
+		{ id: { _nin: Array.from(adminUsers) } },
+		{ _or: [{ role: { _nin: Array.from(allAdminRoles) } }, { role: { _null: true } }] },
+		{ status: { _eq: "active" } }
+	];
 	if (opts?.adminId) {
 		adminFilters.push({ id: { _neq: opts.adminId } });
 		appFilters.push({ id: { _neq: opts.adminId } });

package/dist/services/items.js

@@ -507,17 +507,22 @@ var ItemsService = class ItemsService {
 					});
 					const snapshotFields = difference(fields, getRelationsForCollection(this.schema, this.collection));
 					const snapshots = await itemsService.readMany(keys, { fields: snapshotFields.length > 0 ? snapshotFields : ["*"] });
+					const snapshotsByKey = new Map(snapshots.map((snapshot) => [String(snapshot[primaryKeyField]), snapshot]));
 					const revisionsService = new RevisionsService({
 						knex: trx,
 						schema: this.schema
 					});
-					const revisions = (await Promise.all(activity.map(async (activity$1, index) => ({
-						activity: activity$1,
-						collection: this.collection,
-						item: keys[index],
-						data: Array.isArray(snapshots) && snapshots[index] ? await payloadService.prepareDelta(snapshots[index]) : null,
-						delta: await payloadService.prepareDelta(payloadWithTypeCasting)
-					})))).filter((revision) => revision.delta);
+					const revisions = (await Promise.all(activity.map(async (activity$1, index) => {
+						const key = keys[index];
+						const snapshot = snapshotsByKey.get(String(key));
+						return {
+							activity: activity$1,
+							collection: this.collection,
+							item: key,
+							data: snapshot ? await payloadService.prepareDelta(snapshot) : null,
+							delta: await payloadService.prepareDelta(payloadWithTypeCasting)
+						};
+					}))).filter((revision) => revision.delta);
 					const revisionIDs = await revisionsService.createMany(revisions);
 					for (let i = 0; i < revisionIDs.length; i++) {
 						const revisionID = revisionIDs[i];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "36.0.0",
+  "version": "36.0.2",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -166,30 +166,30 @@
     "ws": "8.18.3",
     "zod": "4.1.12",
     "zod-validation-error": "4.0.2",
-    "@directus/app": "16.0.0",
     "@directus/ai": "1.3.2",
+    "@directus/app": "16.1.1",
     "@directus/env": "6.0.0",
-    "@directus/constants": "14.4.0",
     "@directus/errors": "2.4.0",
-    "@directus/extensions-registry": "4.0.0",
     "@directus/extensions": "4.0.0",
+    "@directus/extensions-sdk": "18.0.0",
     "@directus/format-title": "13.0.0",
+    "@directus/extensions-registry": "4.0.0",
     "@directus/memory": "4.0.0",
-    "@directus/extensions-sdk": "18.0.0",
+    "@directus/constants": "14.4.0",
     "@directus/schema": "14.0.0",
-    "@directus/pressure": "4.0.0",
+    "@directus/specs": "14.0.0",
     "@directus/storage": "13.0.0",
+    "@directus/storage-driver-cloudinary": "13.0.0",
+    "@directus/pressure": "4.0.0",
     "@directus/storage-driver-azure": "13.0.0",
-    "@directus/storage-driver-local": "13.0.0",
     "@directus/storage-driver-gcs": "13.0.0",
-    "@directus/storage-driver-cloudinary": "13.0.0",
-    "@directus/specs": "14.0.0",
     "@directus/storage-driver-s3": "13.0.0",
-    "@directus/system-data": "4.5.0",
     "@directus/storage-driver-supabase": "4.0.0",
     "@directus/utils": "13.5.0",
     "@directus/validation": "3.0.0",
-    "directus": "12.0.0"
+    "@directus/system-data": "4.5.0",
+    "@directus/storage-driver-local": "13.0.0",
+    "directus": "12.0.2"
   },
   "devDependencies": {
     "@directus/tsconfig": "4.0.0",