directus 9.5.2 → 9.7.1

package/dist/database/run-ast.js

@@ -3,15 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@directus/shared/utils");
 const lodash_1 = require("lodash");
+const _1 = __importDefault(require("."));
+const helpers_1 = require("../database/helpers");
+const env_1 = __importDefault(require("../env"));
 const payload_1 = require("../services/payload");
 const apply_function_to_column_name_1 = require("../utils/apply-function-to-column-name");
 const apply_query_1 = __importDefault(require("../utils/apply-query"));
 const get_column_1 = require("../utils/get-column");
 const strip_function_1 = require("../utils/strip-function");
-const utils_1 = require("@directus/shared/utils");
-const _1 = __importDefault(require("."));
-const helpers_1 = require("../database/helpers");
 /**
  * Execute a given AST using Knex. Returns array of items based on requested AST.
  */
@@ -44,10 +45,33 @@ async function runAST(originalAST, schema, options) {
         // Apply the `_in` filters to the nested collection batches
         const nestedNodes = applyParentFilters(schema, nestedCollectionNodes, items);
         for (const nestedNode of nestedNodes) {
-            const nestedItems = await runAST(nestedNode, schema, { knex, nested: true });
-            if (nestedItems) {
-                // Merge all fetched nested records with the parent items
-                items = mergeWithParentItems(schema, nestedItems, items, nestedNode);
+            let nestedItems = [];
+            if (nestedNode.type === 'o2m') {
+                let hasMore = true;
+                let batchCount = 0;
+                while (hasMore) {
+                    const node = (0, lodash_1.merge)({}, nestedNode, {
+                        query: { limit: env_1.default.RELATIONAL_BATCH_SIZE, offset: batchCount * env_1.default.RELATIONAL_BATCH_SIZE },
+                    });
+                    nestedItems = (await runAST(node, schema, { knex, nested: true }));
+                    if (nestedItems) {
+                        items = mergeWithParentItems(schema, nestedItems, items, nestedNode);
+                    }
+                    if (!nestedItems || nestedItems.length < env_1.default.RELATIONAL_BATCH_SIZE) {
+                        hasMore = false;
+                    }
+                    batchCount++;
+                }
+            }
+            else {
+                const node = (0, lodash_1.merge)({}, nestedNode, {
+                    query: { limit: -1 },
+                });
+                nestedItems = (await runAST(node, schema, { knex, nested: true }));
+                if (nestedItems) {
+                    // Merge all fetched nested records with the parent items
+                    items = mergeWithParentItems(schema, nestedItems, items, nestedNode);
+                }
             }
         }
         // During the fetching of data, we have to inject a couple of required fields for the child nesting
@@ -146,13 +170,7 @@ function applyParentFilters(schema, nestedCollectionNodes, parentItem) {
         if (nestedNode.type === 'm2o') {
             const foreignField = schema.collections[nestedNode.relation.related_collection].primary;
             const foreignIds = (0, lodash_1.uniq)(parentItems.map((res) => res[nestedNode.relation.field])).filter((id) => id);
-            const limit = nestedNode.query.limit;
-            if (limit === -1) {
-                (0, lodash_1.merge)(nestedNode, { query: { filter: { [foreignField]: { _in: foreignIds } } } });
-            }
-            else {
-                nestedNode.query.union = [foreignField, foreignIds];
-            }
+            (0, lodash_1.merge)(nestedNode, { query: { filter: { [foreignField]: { _in: foreignIds } } } });
         }
         else if (nestedNode.type === 'o2m') {
             const relatedM2OisFetched = !!nestedNode.children.find((child) => {
@@ -174,13 +192,7 @@ function applyParentFilters(schema, nestedCollectionNodes, parentItem) {
             }
             const foreignField = nestedNode.relation.field;
             const foreignIds = (0, lodash_1.uniq)(parentItems.map((res) => res[nestedNode.parentKey])).filter((id) => id);
-            const limit = nestedNode.query.limit;
-            if (limit === -1) {
-                (0, lodash_1.merge)(nestedNode, { query: { filter: { [foreignField]: { _in: foreignIds } } } });
-            }
-            else {
-                nestedNode.query.union = [foreignField, foreignIds];
-            }
+            (0, lodash_1.merge)(nestedNode, { query: { filter: { [foreignField]: { _in: foreignIds } } } });
         }
         else if (nestedNode.type === 'a2o') {
             const keysPerCollection = {};
@@ -193,20 +205,16 @@ function applyParentFilters(schema, nestedCollectionNodes, parentItem) {
             for (const relatedCollection of nestedNode.names) {
                 const foreignField = nestedNode.relatedKey[relatedCollection];
                 const foreignIds = (0, lodash_1.uniq)(keysPerCollection[relatedCollection]);
-                const limit = nestedNode.query[relatedCollection].limit;
-                if (limit === -1) {
-                    (0, lodash_1.merge)(nestedNode, { query: { [relatedCollection]: { filter: { [foreignField]: { _in: foreignIds } } } } });
-                }
-                else {
-                    nestedNode.query[relatedCollection].union = [foreignField, foreignIds];
-                }
+                (0, lodash_1.merge)(nestedNode, {
+                    query: { [relatedCollection]: { filter: { [foreignField]: { _in: foreignIds } } } },
+                });
             }
         }
     }
     return nestedCollectionNodes;
 }
 function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode) {
-    var _a;
+    var _a, _b;
     const nestedItems = (0, utils_1.toArray)(nestedItem);
     const parentItems = (0, lodash_1.clone)((0, utils_1.toArray)(parentItem));
     if (nestedNode.type === 'm2o') {
@@ -220,8 +228,9 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode) {
     }
     else if (nestedNode.type === 'o2m') {
         for (const parentItem of parentItems) {
-            const itemChildren = nestedItems
-                .filter((nestedItem) => {
+            if (!parentItem[nestedNode.fieldKey])
+                parentItem[nestedNode.fieldKey] = [];
+            const itemChildren = nestedItems.filter((nestedItem) => {
                 var _a;
                 if (nestedItem === null)
                     return false;
@@ -230,8 +239,13 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode) {
                 return (nestedItem[nestedNode.relation.field] ==
                     parentItem[schema.collections[nestedNode.relation.related_collection].primary] ||
                     ((_a = nestedItem[nestedNode.relation.field]) === null || _a === void 0 ? void 0 : _a[schema.collections[nestedNode.relation.related_collection].primary]) == parentItem[schema.collections[nestedNode.relation.related_collection].primary]);
-            })
-                .sort((a, b) => {
+            });
+            parentItem[nestedNode.fieldKey].push(...itemChildren);
+            if (nestedNode.query.offset && nestedNode.query.offset >= 0) {
+                parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(nestedNode.query.offset);
+            }
+            parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(0, (_a = nestedNode.query.limit) !== null && _a !== void 0 ? _a : 100);
+            parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].sort((a, b) => {
                 // This is pre-filled in get-ast-from-query
                 const sortField = nestedNode.query.sort[0];
                 let column = sortField;
@@ -253,12 +267,11 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode) {
                     return a[column] < b[column] ? 1 : -1;
                 }
             });
-            parentItem[nestedNode.fieldKey] = itemChildren.length > 0 ? itemChildren : [];
         }
     }
     else if (nestedNode.type === 'a2o') {
         for (const parentItem of parentItems) {
-            if (!((_a = nestedNode.relation.meta) === null || _a === void 0 ? void 0 : _a.one_collection_field)) {
+            if (!((_b = nestedNode.relation.meta) === null || _b === void 0 ? void 0 : _b.one_collection_field)) {
                 parentItem[nestedNode.fieldKey] = null;
                 continue;
             }

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

@@ -42,21 +42,21 @@ fields:
     width: full
 
   - field: hidden
-    special: boolean
+    special: cast-boolean
     interface: boolean
     options:
       label: $t:field_options.directus_collections.hidden_label
     width: half
 
   - field: singleton
-    special: boolean
+    special: cast-boolean
     interface: boolean
     options:
       label: $t:singleton_label
     width: half
 
   - field: translations
-    special: json
+    special: cast-json
     interface: list
     options:
       template: '{{ translation }} ({{ language }})'
@@ -115,7 +115,7 @@ fields:
 
   - field: archive_app_filter
     interface: boolean
-    special: boolean
+    special: cast-boolean
     options:
       label: $t:field_options.directus_collections.archive_app_filter
     width: half

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

@@ -17,7 +17,7 @@ fields:
   - collection: directus_fields
     field: special
     hidden: true
-    special: csv
+    special: cast-csv
     width: half
 
   - collection: directus_fields
@@ -27,7 +27,7 @@ fields:
   - collection: directus_fields
     field: options
     hidden: true
-    special: json
+    special: cast-json
     width: half
 
   - collection: directus_fields
@@ -37,25 +37,25 @@ fields:
   - collection: directus_fields
     field: display_options
     hidden: true
-    special: json
+    special: cast-json
     width: half
 
   - collection: directus_fields
     field: readonly
     hidden: true
-    special: boolean
+    special: cast-boolean
     width: half
 
   - collection: directus_fields
     field: hidden
     hidden: true
-    special: boolean
+    special: cast-boolean
     width: half
 
   - collection: directus_fields
     field: required
     hidden: true
-    special: boolean
+    special: cast-boolean
     width: half
 
   - collection: directus_fields
@@ -73,7 +73,7 @@ fields:
   - collection: directus_fields
     field: translations
     hidden: true
-    special: json
+    special: cast-json
     width: half
 
   - collection: directus_fields
@@ -83,4 +83,4 @@ fields:
   - collection: directus_fields
     field: conditions
     hidden: true
-    special: json
+    special: cast-json

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

@@ -23,7 +23,7 @@ fields:
     interface: tags
     options:
       iconRight: local_offer
-    special: json
+    special: cast-json
     width: full
     display: labels
     display_options:
@@ -71,7 +71,7 @@ fields:
 
   - field: metadata
     hidden: true
-    special: json
+    special: cast-json
 
   - field: type
     display: mime-type

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

@@ -9,13 +9,13 @@ fields:
   - field: note
   - field: type
   - field: show_header
-    special: boolean
+    special: cast-boolean
   - field: position_x
   - field: position_y
   - field: width
   - field: height
   - field: options
-    special: json
+    special: cast-json
   - field: date_created
     special: date-created
   - field: user_created

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

@@ -4,12 +4,12 @@ table: directus_permissions
 fields:
   - field: permissions
     hidden: true
-    special: json
+    special: cast-json
     width: half
 
   - field: presets
     hidden: true
-    special: json
+    special: cast-json
     width: half
 
   - field: role
@@ -23,11 +23,11 @@ fields:
 
   - field: fields
     width: half
-    special: csv
+    special: cast-csv
 
   - field: action
     width: half
 
   - field: validation
     width: half
-    special: json
+    special: cast-json

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

@@ -3,15 +3,15 @@ table: directus_presets
 fields:
   - field: filter
     hidden: true
-    special: json
+    special: cast-json
 
   - field: layout_query
     hidden: true
-    special: json
+    special: cast-json
 
   - field: layout_options
     hidden: true
-    special: json
+    special: cast-json
 
   - field: role
     width: half

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

@@ -20,7 +20,7 @@ fields:
     width: half
 
   - field: one_allowed_collections
-    special: csv
+    special: cast-csv
     width: half
 
   - field: junction_field

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

@@ -15,11 +15,11 @@ fields:
 
   - field: data
     hidden: true
-    special: json
+    special: cast-json
 
   - field: delta
     hidden: true
-    special: json
+    special: cast-json
 
   - field: parent
     width: half

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

@@ -25,24 +25,24 @@ fields:
 
   - field: app_access
     interface: boolean
-    special: boolean
+    special: cast-boolean
     width: half
 
   - field: admin_access
     interface: boolean
-    special: boolean
+    special: cast-boolean
     width: half
 
   - field: ip_access
     interface: tags
     options:
       placeholder: $t:field_options.directus_roles.ip_access
-    special: csv
+    special: cast-csv
     width: full
 
   - field: enforce_tfa
     interface: boolean
-    special: boolean
+    special: cast-boolean
     width: half
 
   - field: users

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

@@ -87,9 +87,25 @@ fields:
       language: css
       lineNumber: true
       template: |
-        #app, #main-content {
-          --border-radius-outline: 0px !important;
-          --border-radius: 0px !important;
+        #app, #main-content, body {
+          --primary-alt: #F0ECFF !important;
+          --primary-10: #F0ECFF !important;
+          --primary-25: #D9D0FF !important;
+          --primary-50: #B3A1FF !important;
+          --primary-75: #8C73FF !important;
+          --primary-90: #7557FF !important;
+
+          --primary: #6644FF !important;
+
+          --primary-110: #5E41EC !important;
+          --primary-125: #523DCF !important;
+          --primary-150: #3E369F !important;
+          --primary-175: #2B3070 !important;
+          --primary-190: #1F2C53 !important;
+
+          --v-button-background-color: #6644FF !important;
+          --v-button-background-color-hover: #5E41EC !important;
+          --sidebar-detail-color-active: #5E41EC !important;
         }
     width: full
 
@@ -105,7 +121,7 @@ fields:
 
   - field: module_bar
     interface: system-modules
-    special: json
+    special: cast-json
 
   - field: security_divider
     interface: presentation-divider
@@ -281,7 +297,7 @@ fields:
                 ]
             width: full
       template: '{{key}}'
-    special: json
+    special: cast-json
     width: full
 
   - field: map_divider
@@ -306,7 +322,7 @@ fields:
 
   - field: basemaps
     interface: list
-    special: json
+    special: cast-json
     options:
       template: '{{name}}'
       fields:
@@ -362,3 +378,6 @@ fields:
             interface: input
             options:
               placeholder: $t:fields.directus_settings.attribution_placeholder
+
+  - field: translation_strings
+    hidden: true

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

@@ -50,7 +50,7 @@ fields:
 
   - field: tags
     interface: tags
-    special: json
+    special: cast-json
     width: full
     options:
       iconRight: local_offer
@@ -93,7 +93,7 @@ fields:
   - field: email_notifications
     interface: boolean
     width: half
-    special: boolean
+    special: cast-boolean
 
   - field: admin_divider
     interface: presentation-divider

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

@@ -60,12 +60,12 @@ fields:
     interface: boolean
     options:
       label: $t:fields.directus_webhooks.data_label
-    special: boolean
+    special: cast-boolean
     width: half
     display: boolean
 
   - field: headers
-    special: json
+    special: cast-json
     interface: list
     options:
       template: '{{ header }}: {{ value }}'
@@ -105,7 +105,7 @@ fields:
           value: update
         - text: $t:delete_label
           value: delete
-    special: csv
+    special: cast-csv
     width: full
     display: labels
     display_options:
@@ -129,7 +129,7 @@ fields:
 
   - field: collections
     interface: system-collections
-    special: csv
+    special: cast-csv
     width: full
     display: labels
     display_options:

package/dist/env.js

@@ -17,6 +17,7 @@ const utils_1 = require("@directus/shared/utils");
 const acceptedEnvTypes = ['string', 'number', 'regex', 'array'];
 const defaults = {
     CONFIG_PATH: path_1.default.resolve(process.cwd(), '.env'),
+    HOST: '0.0.0.0',
     PORT: 8055,
     PUBLIC_URL: '/',
     MAX_PAYLOAD_SIZE: '100kb',
@@ -34,8 +35,8 @@ const defaults = {
     REFRESH_TOKEN_COOKIE_SAME_SITE: 'lax',
     REFRESH_TOKEN_COOKIE_NAME: 'directus_refresh_token',
     ROOT_REDIRECT: './admin',
-    CORS_ENABLED: true,
-    CORS_ORIGIN: true,
+    CORS_ENABLED: false,
+    CORS_ORIGIN: false,
     CORS_METHODS: 'GET,POST,PATCH,DELETE',
     CORS_ALLOWED_HEADERS: 'Content-Type,Authorization',
     CORS_EXPOSED_HEADERS: 'Content-Range',
@@ -64,11 +65,15 @@ const defaults = {
     ASSETS_TRANSFORM_MAX_OPERATIONS: 5,
     IP_TRUST_PROXY: true,
     IP_CUSTOM_HEADER: false,
+    IMPORT_IP_DENY_LIST: '0.0.0.0',
     SERVE_APP: true,
+    RELATIONAL_BATCH_SIZE: 25000,
+    EXPORT_BATCH_SIZE: 5000,
 };
 // Allows us to force certain environment variable into a type, instead of relying
 // on the auto-parsed type in processValues. ref #3705
 const typeMap = {
+    HOST: 'string',
     PORT: 'string',
     DB_NAME: 'string',
     DB_USER: 'string',
@@ -76,6 +81,7 @@ const typeMap = {
     DB_DATABASE: 'string',
     DB_PORT: 'number',
     DB_EXCLUDE_TABLES: 'array',
+    IMPORT_IP_DENY_LIST: 'array',
 };
 let env = {
     ...defaults,
@@ -229,6 +235,7 @@ function processValues(env) {
         }
         if (String(value).includes(',')) {
             env[key] = (0, utils_1.toArray)(value);
+            continue;
         }
         // Try converting the value to a JS object. This allows JSON objects to be passed for nested
         // config flags, or custom param names (that aren't camelCased)