@directus/api 23.2.1 → 23.2.2

package/dist/database/migrations/20240924A-migrate-legacy-comments.js

@@ -12,6 +12,8 @@ export async function up(knex) {
     }
     const rowsLimit = 50;
     let hasMore = true;
+    const existingUsers = new Set();
+    const missingUsers = new Set();
     while (hasMore) {
         const legacyComments = await knex
             .select('*')
@@ -28,12 +30,32 @@ export async function up(knex) {
                 // Migrate legacy comment
                 if (legacyComment['action'] === Action.COMMENT) {
                     primaryKey = randomUUID();
+                    let legacyCommentUserId = legacyComment.user;
+                    if (legacyCommentUserId) {
+                        if (missingUsers.has(legacyCommentUserId)) {
+                            legacyCommentUserId = null;
+                        }
+                        else if (!existingUsers.has(legacyCommentUserId)) {
+                            const userExists = await trx
+                                .select('id')
+                                .from('directus_users')
+                                .where('id', '=', legacyCommentUserId)
+                                .first();
+                            if (userExists) {
+                                existingUsers.add(legacyCommentUserId);
+                            }
+                            else {
+                                missingUsers.add(legacyCommentUserId);
+                                legacyCommentUserId = null;
+                            }
+                        }
+                    }
                     await trx('directus_comments').insert({
                         id: primaryKey,
                         collection: legacyComment.collection,
                         item: legacyComment.item,
                         comment: legacyComment.comment,
-                        user_created: legacyComment.user,
+                        user_created: legacyCommentUserId,
                         date_created: legacyComment.timestamp,
                     });
                     await trx('directus_activity')

package/dist/utils/apply-snapshot.js

@@ -1,15 +1,14 @@
-import { getCache } from '../cache.js';
+import { flushCaches } from '../cache.js';
 import getDatabase from '../database/index.js';
 import { applyDiff } from './apply-diff.js';
 import { getSchema } from './get-schema.js';
-import { getSnapshot } from './get-snapshot.js';
 import { getSnapshotDiff } from './get-snapshot-diff.js';
+import { getSnapshot } from './get-snapshot.js';
 export async function applySnapshot(snapshot, options) {
     const database = options?.database ?? getDatabase();
     const schema = options?.schema ?? (await getSchema({ database, bypassCache: true }));
-    const { systemCache } = getCache();
     const current = options?.current ?? (await getSnapshot({ database, schema }));
     const snapshotDiff = options?.diff ?? getSnapshotDiff(current, snapshot);
     await applyDiff(current, snapshotDiff, { database, schema });
-    await systemCache?.clear();
+    await flushCaches();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "23.2.1",
+  "version": "23.2.2",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -149,29 +149,29 @@
     "ws": "8.18.0",
     "zod": "3.23.8",
     "zod-validation-error": "3.4.0",
-    "@directus/app": "13.3.5",
+    "@directus/app": "13.3.6",
+    "@directus/env": "4.1.0",
     "@directus/constants": "12.0.1",
     "@directus/errors": "1.0.1",
-    "@directus/env": "4.1.0",
     "@directus/extensions": "2.0.6",
-    "@directus/format-title": "11.0.0",
     "@directus/extensions-registry": "2.0.6",
     "@directus/extensions-sdk": "12.1.4",
+    "@directus/format-title": "11.0.0",
     "@directus/memory": "2.0.6",
     "@directus/pressure": "2.0.5",
     "@directus/schema": "12.1.1",
-    "@directus/specs": "11.1.0",
     "@directus/storage": "11.0.1",
+    "@directus/specs": "11.1.0",
     "@directus/storage-driver-azure": "11.1.2",
-    "@directus/storage-driver-cloudinary": "11.1.2",
     "@directus/storage-driver-gcs": "11.1.2",
-    "@directus/storage-driver-supabase": "2.1.2",
     "@directus/storage-driver-local": "11.0.1",
-    "@directus/system-data": "2.1.2",
+    "@directus/storage-driver-cloudinary": "11.1.2",
     "@directus/storage-driver-s3": "11.0.5",
+    "@directus/system-data": "2.1.2",
+    "@directus/storage-driver-supabase": "2.1.2",
     "@directus/utils": "12.0.5",
-    "@directus/validation": "1.0.5",
-    "directus": "11.3.1"
+    "directus": "11.3.2",
+    "@directus/validation": "1.0.5"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -213,9 +213,9 @@
     "knex-mock-client": "3.0.2",
     "typescript": "5.6.3",
     "vitest": "2.1.2",
-    "@directus/tsconfig": "2.0.0",
+    "@directus/types": "12.2.2",
     "@directus/random": "1.0.0",
-    "@directus/types": "12.2.2"
+    "@directus/tsconfig": "2.0.0"
   },
   "optionalDependencies": {
     "@keyv/redis": "3.0.1",