@directus/api 14.1.1 → 14.1.2

package/dist/database/system-data/fields/settings.yaml

@@ -120,6 +120,8 @@ fields:
   - field: theme_light_overrides
     width: full
     interface: system-theme-overrides
+    options:
+      appearance: light
     group: theming_group
     special:
       - cast-json
@@ -134,6 +136,8 @@ fields:
   - field: theme_dark_overrides
     width: full
     interface: system-theme-overrides
+    options:
+      appearance: dark
     group: theming_group
     special:
       - cast-json

package/dist/database/system-data/fields/users.yaml

@@ -124,6 +124,8 @@ fields:
   - field: theme_light_overrides
     width: full
     interface: system-theme-overrides
+    options:
+      appearance: light
     special:
       - cast-json
 
@@ -137,6 +139,8 @@ fields:
   - field: theme_dark_overrides
     width: full
     interface: system-theme-overrides
+    options:
+      appearance: dark
     special:
       - cast-json
 

package/dist/utils/get-permissions.js

@@ -86,9 +86,6 @@ function parsePermissions(permissions) {
         if (permission.permissions && typeof permission.permissions === 'string') {
             permission.permissions = parseJSON(permission.permissions);
         }
-        else if (permission.permissions === null) {
-            permission.permissions = {};
-        }
         if (permission.validation && typeof permission.validation === 'string') {
             permission.validation = parseJSON(permission.validation);
         }

package/dist/utils/get-snapshot-diff.js

@@ -55,7 +55,8 @@ export function getSnapshotDiff(current, after) {
             }),
             ...after.relations
                 .filter((afterRelation) => {
-                const currentRelation = current.relations.find((currentRelation) => currentRelation.collection === afterRelation.collection && afterRelation.field === currentRelation.field);
+                const currentRelation = current.relations.find((currentRelation) => currentRelation.collection === afterRelation.collection &&
+                    afterRelation.field === currentRelation.field);
                 return !!currentRelation === false;
             })
                 .map((afterRelation) => ({

package/dist/utils/merge-permissions.js

@@ -1,4 +1,4 @@
-import { flatten, intersection, isEmpty, merge, omit } from 'lodash-es';
+import { flatten, intersection, isEqual, merge, omit } from 'lodash-es';
 export function mergePermissions(strategy, ...permissions) {
     const allPermissions = flatten(permissions);
     const mergedPermissions = allPermissions
@@ -27,11 +27,15 @@ export function mergePermission(strategy, currentPerm, newPerm) {
             };
         }
         else if (currentPerm.permissions) {
-            permissions = {
-                [logicalKey]: strategy === 'or'
-                    ? [currentPerm.permissions, newPerm.permissions].filter((p) => !isEmpty(p))
-                    : [currentPerm.permissions, newPerm.permissions],
-            };
+            // Empty {} supersedes other permissions in _OR merge
+            if (strategy === 'or' && (isEqual(currentPerm.permissions, {}) || isEqual(newPerm.permissions, {}))) {
+                permissions = {};
+            }
+            else {
+                permissions = {
+                    [logicalKey]: [currentPerm.permissions, newPerm.permissions],
+                };
+            }
         }
         else {
             permissions = {
@@ -49,11 +53,15 @@ export function mergePermission(strategy, currentPerm, newPerm) {
             };
         }
         else if (currentPerm.validation) {
-            validation = {
-                [logicalKey]: strategy === 'or'
-                    ? [currentPerm.validation, newPerm.validation].filter((p) => !isEmpty(p))
-                    : [currentPerm.validation, newPerm.validation],
-            };
+            // Empty {} supersedes other validations in _OR merge
+            if (strategy === 'or' && (isEqual(currentPerm.validation, {}) || isEqual(newPerm.validation, {}))) {
+                validation = {};
+            }
+            else {
+                validation = {
+                    [logicalKey]: [currentPerm.validation, newPerm.validation],
+                };
+            }
         }
         else {
             validation = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "14.1.1",
+  "version": "14.1.2",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -138,28 +138,28 @@
     "stream-json": "1.7.5",
     "strip-bom-stream": "5.0.0",
     "tinypool": "0.8.1",
-    "tsx": "3.12.7",
+    "tsx": "4.1.4",
     "uuid": "9.0.0",
     "uuid-validate": "0.0.3",
     "wellknown": "0.5.0",
     "ws": "8.14.2",
     "zod": "3.22.4",
     "zod-validation-error": "1.0.1",
-    "@directus/app": "10.13.1",
+    "@directus/app": "10.13.2",
+    "@directus/errors": "0.2.0",
     "@directus/constants": "11.0.1",
     "@directus/extensions": "0.2.0",
     "@directus/extensions-sdk": "10.2.0",
-    "@directus/errors": "0.2.0",
     "@directus/pressure": "1.0.13",
     "@directus/schema": "11.0.0",
-    "@directus/storage": "10.0.7",
-    "@directus/specs": "10.2.3",
+    "@directus/specs": "10.2.4",
     "@directus/storage-driver-azure": "10.0.14",
-    "@directus/storage-driver-local": "10.0.14",
     "@directus/storage-driver-cloudinary": "10.0.14",
-    "@directus/storage-driver-s3": "10.0.14",
     "@directus/storage-driver-gcs": "10.0.14",
+    "@directus/storage": "10.0.7",
+    "@directus/storage-driver-local": "10.0.14",
     "@directus/storage-driver-supabase": "1.0.6",
+    "@directus/storage-driver-s3": "10.0.14",
     "@directus/utils": "11.0.2",
     "@directus/validation": "0.0.9"
   },
@@ -202,13 +202,13 @@
     "@types/uuid-validate": "0.0.1",
     "@types/wellknown": "0.5.4",
     "@types/ws": "8.5.8",
-    "@vitest/coverage-c8": "0.31.1",
+    "@vitest/coverage-v8": "0.34.6",
     "copyfiles": "2.4.1",
     "form-data": "4.0.0",
     "knex-mock-client": "2.0.0",
     "supertest": "6.3.3",
     "typescript": "5.2.2",
-    "vitest": "0.31.1",
+    "vitest": "0.34.6",
     "@directus/random": "0.2.3",
     "@directus/tsconfig": "1.0.1",
     "@directus/types": "11.0.2"