directus 9.7.0 → 9.9.0

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

@@ -46,19 +46,19 @@ fields:
     width: half
 
   - field: comment
-    display: formatted-text
+    display: formatted-value
     display_options:
-      subdued: true
+      color: 'var(--foreground-subdued)'
     width: half
 
   - field: user_agent
-    display: formatted-text
+    display: formatted-value
     display_options:
       font: monospace
     width: half
 
   - field: ip
-    display: formatted-text
+    display: formatted-value
     display_options:
       font: monospace
     width: half

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,13 @@ fields:
   - collection: directus_fields
     field: conditions
     hidden: true
-    special: json
+    special: cast-json
+
+  - collection: directus_fields
+    field: validation
+    hidden: true
+    special: cast-json
+
+  - collection: directus_fields
+    field: validation_message
+    hidden: true

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,21 +3,29 @@ 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
+    special: m2o
+    display: related-values
+    display_options:
+      template: '{{ name }}'
 
   - field: user
     width: half
+    special: m2o
+    display: related-values
+    display_options:
+      template: '{{ email }}'
 
   - field: id
     width: half
@@ -25,6 +33,12 @@ fields:
   - field: bookmark
     width: half
 
+  - field: icon
+    width: half
+
+  - field: color
+    width: half
+
   - field: search
     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

@@ -32,7 +32,17 @@ fields:
     translations:
       language: en-US
       translations: Website
-    width: full
+    width: half
+
+  - field: default_language
+    interface: system-language
+    options:
+      iconRight: language
+      placeholder: en-US
+    translations:
+      language: en-US
+      translations: Default Language
+    width: half
 
   - field: branding_divider
     interface: presentation-divider
@@ -121,7 +131,7 @@ fields:
 
   - field: module_bar
     interface: system-modules
-    special: json
+    special: cast-json
 
   - field: security_divider
     interface: presentation-divider
@@ -297,7 +307,7 @@ fields:
                 ]
             width: full
       template: '{{key}}'
-    special: json
+    special: cast-json
     width: full
 
   - field: map_divider
@@ -322,7 +332,7 @@ fields:
 
   - field: basemaps
     interface: list
-    special: json
+    special: cast-json
     options:
       template: '{{name}}'
       fields:
@@ -378,3 +388,7 @@ fields:
             interface: input
             options:
               placeholder: $t:fields.directus_settings.attribution_placeholder
+
+  - field: translation_strings
+    special: cast-json
+    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
@@ -72,6 +72,8 @@ fields:
   - field: language
     interface: system-language
     width: half
+    options:
+      includeProjectDefault: true
 
   - field: theme
     interface: select-dropdown
@@ -93,7 +95,7 @@ fields:
   - field: email_notifications
     interface: boolean
     width: half
-    special: boolean
+    special: cast-boolean
 
   - field: admin_divider
     interface: presentation-divider
@@ -152,6 +154,7 @@ fields:
   - field: last_access
     width: half
     display: datetime
+    readonly: true
     display_options:
       relative: true
 

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

@@ -14,7 +14,7 @@ const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
 const require_yaml_1 = require("./utils/require-yaml");
 const utils_1 = require("@directus/shared/utils");
-const acceptedEnvTypes = ['string', 'number', 'regex', 'array'];
+const acceptedEnvTypes = ['string', 'number', 'regex', 'array', 'json'];
 const defaults = {
     CONFIG_PATH: path_1.default.resolve(process.cwd(), '.env'),
     HOST: '0.0.0.0',
@@ -69,6 +69,7 @@ const defaults = {
     SERVE_APP: true,
     RELATIONAL_BATCH_SIZE: 25000,
     EXPORT_BATCH_SIZE: 5000,
+    FILE_METADATA_ALLOW_LIST: 'ifd0.Make,ifd0.Model,exif.FNumber,exif.ExposureTime,exif.FocalLength,exif.ISO',
 };
 // Allows us to force certain environment variable into a type, instead of relying
 // on the auto-parsed type in processValues. ref #3705
@@ -82,6 +83,7 @@ const typeMap = {
     DB_PORT: 'number',
     DB_EXCLUDE_TABLES: 'array',
     IMPORT_IP_DENY_LIST: 'array',
+    FILE_METADATA_ALLOW_LIST: 'array',
 };
 let env = {
     ...defaults,
@@ -235,6 +237,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)

package/dist/exceptions/index.d.ts

@@ -13,6 +13,7 @@ export * from './method-not-allowed';
 export * from './range-not-satisfiable';
 export * from './route-not-found';
 export * from './service-unavailable';
+export * from './token-expired';
 export * from './unprocessable-entity';
 export * from './unsupported-media-type';
 export * from './user-suspended';

package/dist/exceptions/index.js

@@ -25,6 +25,7 @@ __exportStar(require("./method-not-allowed"), exports);
 __exportStar(require("./range-not-satisfiable"), exports);
 __exportStar(require("./route-not-found"), exports);
 __exportStar(require("./service-unavailable"), exports);
+__exportStar(require("./token-expired"), exports);
 __exportStar(require("./unprocessable-entity"), exports);
 __exportStar(require("./unsupported-media-type"), exports);
 __exportStar(require("./user-suspended"), exports);

package/dist/exceptions/token-expired.d.ts

@@ -0,0 +1,4 @@
+import { BaseException } from '@directus/shared/exceptions';
+export declare class TokenExpiredException extends BaseException {
+    constructor(message?: string);
+}

package/dist/exceptions/token-expired.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenExpiredException = void 0;
+const exceptions_1 = require("@directus/shared/exceptions");
+class TokenExpiredException extends exceptions_1.BaseException {
+    constructor(message = 'Token expired.') {
+        super(message, 401, 'TOKEN_EXPIRED');
+    }
+}
+exports.TokenExpiredException = TokenExpiredException;

package/dist/logger.js

@@ -28,6 +28,7 @@ const pino_http_1 = __importStar(require("pino-http"));
 const get_config_from_env_1 = require("./utils/get-config-from-env");
 const url_1 = require("url");
 const env_1 = __importDefault(require("./env"));
+const utils_1 = require("@directus/shared/utils");
 const pinoOptions = {
     level: env_1.default.LOG_LEVEL || 'info',
     redact: {
@@ -43,7 +44,7 @@ const loggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_', '
 // Expose custom log levels into formatter function
 if (loggerEnvConfig.levels) {
     const customLogLevels = {};
-    for (const el of loggerEnvConfig.levels.split(',')) {
+    for (const el of (0, utils_1.toArray)(loggerEnvConfig.levels)) {
         const key_val = el.split(':');
         customLogLevels[key_val[0].trim()] = key_val[1].trim();
     }

package/dist/middleware/cache.js

@@ -19,6 +19,8 @@ const checkCacheMiddleware = (0, async_handler_1.default)(async (req, res, next)
     if (!cache)
         return next();
     if (((_a = req.headers['cache-control']) === null || _a === void 0 ? void 0 : _a.includes('no-store')) || ((_b = req.headers['Cache-Control']) === null || _b === void 0 ? void 0 : _b.includes('no-store'))) {
+        if (env_1.default.CACHE_STATUS_HEADER)
+            res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'MISS');
         return next();
     }
     const key = (0, get_cache_key_1.getCacheKey)(req);
@@ -28,6 +30,8 @@ const checkCacheMiddleware = (0, async_handler_1.default)(async (req, res, next)
     }
     catch (err) {
         logger_1.default.warn(err, `[cache] Couldn't read key ${key}. ${err.message}`);
+        if (env_1.default.CACHE_STATUS_HEADER)
+            res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'MISS');
         return next();
     }
     if (cachedData) {
@@ -37,14 +41,20 @@ const checkCacheMiddleware = (0, async_handler_1.default)(async (req, res, next)
         }
         catch (err) {
             logger_1.default.warn(err, `[cache] Couldn't read key ${`${key}__expires_at`}. ${err.message}`);
+            if (env_1.default.CACHE_STATUS_HEADER)
+                res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'MISS');
             return next();
         }
         const cacheTTL = cacheExpiryDate ? cacheExpiryDate - Date.now() : null;
         res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, cacheTTL));
         res.setHeader('Vary', 'Origin, Cache-Control');
+        if (env_1.default.CACHE_STATUS_HEADER)
+            res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'HIT');
         return res.json(cachedData);
     }
     else {
+        if (env_1.default.CACHE_STATUS_HEADER)
+            res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'MISS');
         return next();
     }
 });

package/dist/services/activity.js

@@ -16,6 +16,7 @@ const user_name_1 = require("../utils/user-name");
 const lodash_1 = require("lodash");
 const env_1 = __importDefault(require("../env"));
 const uuid_validate_1 = __importDefault(require("uuid-validate"));
+const url_1 = require("../utils/url");
 class ActivityService extends items_1.ItemsService {
     constructor(options) {
         super('directus_activity', options);
@@ -70,7 +71,9 @@ ${(0, user_name_1.userName)(sender)} has mentioned you in a comment:
 
 ${comment}
 
-<a href="${env_1.default.PUBLIC_URL}/admin/content/${data.collection}/${data.item}">Click here to view.</a>
+<a href="${new url_1.Url(env_1.default.PUBLIC_URL)
+                        .addPath('admin', 'content', data.collection, data.item)
+                        .toString()}">Click here to view.</a>
 `;
                     await this.notificationsService.createOne({
                         recipient: userID,

package/dist/services/authorization.d.ts

@@ -1,6 +1,6 @@
+import { Accountability, PermissionsAction, SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { AbstractServiceOptions, AST, Item, PrimaryKey } from '../types';
-import { PermissionsAction, Accountability, SchemaOverview } from '@directus/shared/types';
 import { PayloadService } from './payload';
 export declare class AuthorizationService {
     knex: Knex;