directus 9.6.0 → 9.8.0

package/dist/database/helpers/fn/types.d.ts

@@ -0,0 +1,18 @@
+import { SchemaOverview } from '@directus/shared/types';
+import { Knex } from 'knex';
+import { DatabaseHelper } from '../types';
+export declare abstract class FnHelper extends DatabaseHelper {
+    protected knex: Knex;
+    protected schema: SchemaOverview;
+    constructor(knex: Knex, schema: SchemaOverview);
+    abstract year(table: string, column: string): Knex.Raw;
+    abstract month(table: string, column: string): Knex.Raw;
+    abstract week(table: string, column: string): Knex.Raw;
+    abstract day(table: string, column: string): Knex.Raw;
+    abstract weekday(table: string, column: string): Knex.Raw;
+    abstract hour(table: string, column: string): Knex.Raw;
+    abstract minute(table: string, column: string): Knex.Raw;
+    abstract second(table: string, column: string): Knex.Raw;
+    abstract count(table: string, column: string): Knex.Raw;
+    protected _relationalCount(table: string, column: string): Knex.Raw;
+}

package/dist/database/helpers/fn/types.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FnHelper = void 0;
+const types_1 = require("../types");
+class FnHelper extends types_1.DatabaseHelper {
+    constructor(knex, schema) {
+        super(knex);
+        this.knex = knex;
+        this.schema = schema;
+        this.schema = schema;
+    }
+    _relationalCount(table, column) {
+        const relation = this.schema.relations.find((relation) => { var _a; return relation.related_collection === table && ((_a = relation === null || relation === void 0 ? void 0 : relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === column; });
+        const currentPrimary = this.schema.collections[table].primary;
+        if (!relation) {
+            throw new Error(`Field ${table}.${column} isn't a nested relational collection`);
+        }
+        return this.knex.raw('(' +
+            this.knex
+                .count('*')
+                .from(relation.collection)
+                .where(relation.field, '=', this.knex.raw(`??.??`, [table, currentPrimary]))
+                .toQuery() +
+            ')');
+    }
+}
+exports.FnHelper = FnHelper;

package/dist/database/helpers/index.d.ts

@@ -1,10 +1,13 @@
+import { SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import * as dateHelpers from './date';
+import * as fnHelpers from './fn';
 import * as geometryHelpers from './geometry';
 import * as schemaHelpers from './schema';
 export declare function getHelpers(database: Knex): {
-    date: dateHelpers.postgres | dateHelpers.oracle | dateHelpers.sqlite | dateHelpers.mysql | dateHelpers.mssql;
+    date: dateHelpers.postgres | dateHelpers.sqlite;
     st: geometryHelpers.postgres | geometryHelpers.redshift | geometryHelpers.oracle | geometryHelpers.sqlite | geometryHelpers.mysql | geometryHelpers.mssql;
     schema: schemaHelpers.postgres | schemaHelpers.cockroachdb | schemaHelpers.oracle;
 };
+export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.postgres | fnHelpers.oracle | fnHelpers.sqlite | fnHelpers.mysql | fnHelpers.mssql;
 export declare type Helpers = ReturnType<typeof getHelpers>;

package/dist/database/helpers/index.js

@@ -19,9 +19,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHelpers = void 0;
+exports.getFunctions = exports.getHelpers = void 0;
 const __1 = require("..");
 const dateHelpers = __importStar(require("./date"));
+const fnHelpers = __importStar(require("./fn"));
 const geometryHelpers = __importStar(require("./geometry"));
 const schemaHelpers = __importStar(require("./schema"));
 function getHelpers(database) {
@@ -33,3 +34,8 @@ function getHelpers(database) {
     };
 }
 exports.getHelpers = getHelpers;
+function getFunctions(database, schema) {
+    const client = (0, __1.getDatabaseClient)(database);
+    return new fnHelpers[client](database, schema);
+}
+exports.getFunctions = getFunctions;

package/dist/database/index.js

@@ -235,9 +235,6 @@ exports.validateDatabaseExtensions = validateDatabaseExtensions;
 async function validateDatabaseCharset(database) {
     database = database !== null && database !== void 0 ? database : getDatabase();
     if (getDatabaseClient(database) === 'mysql') {
-        if (env_1.default.DB_CHARSET) {
-            logger_1.default.warn(`Using custom DB_CHARSET "${env_1.default.DB_CHARSET}". Using a charset different from the database's default can cause problems in relationships. Omitting DB_CHARSET is strongly recommended.`);
-        }
         const { collation } = await database.select(database.raw(`@@collation_database as collation`)).first();
         const tables = await database('information_schema.tables')
             .select({ name: 'TABLE_NAME', collation: 'TABLE_COLLATION' })

package/dist/database/migrations/20220308A-add-bookmark-icon-and-color.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220308A-add-bookmark-icon-and-color.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex.schema.alterTable('directus_presets', (table) => {
+        table.string('icon', 30).notNullable().defaultTo('bookmark_outline');
+        table.string('color').nullable();
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_presets', (table) => {
+        table.dropColumn('icon');
+        table.dropColumn('color');
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220314A-add-translation-strings.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220314A-add-translation-strings.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex.schema.alterTable('directus_settings', (table) => {
+        table.json('translation_strings');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_settings', (table) => {
+        table.dropColumn('translation_strings');
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220322A-rename-field-typecast-flags.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220322A-rename-field-typecast-flags.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const utils_1 = require("@directus/shared/utils");
+const lodash_1 = require("lodash");
+async function up(knex) {
+    const fields = await knex
+        .select('id', 'special')
+        .from('directus_fields')
+        .whereNotNull('special')
+        .orWhere('special', '<>', '');
+    for (const { id, special } of fields) {
+        let parsedSpecial;
+        try {
+            parsedSpecial = (0, utils_1.toArray)(special);
+        }
+        catch {
+            continue;
+        }
+        if (parsedSpecial && (0, lodash_1.isArray)(parsedSpecial)) {
+            let updateRequired = false;
+            parsedSpecial = parsedSpecial.map((special) => {
+                switch (special) {
+                    case 'boolean':
+                    case 'csv':
+                    case 'json':
+                        updateRequired = true;
+                        return 'cast-' + special;
+                    default:
+                        return special;
+                }
+            });
+            if (updateRequired) {
+                await knex('directus_fields')
+                    .update({ special: parsedSpecial.join(',') })
+                    .where({ id });
+            }
+        }
+    }
+}
+exports.up = up;
+async function down(knex) {
+    const fields = await knex
+        .select('id', 'special')
+        .from('directus_fields')
+        .whereNotNull('special')
+        .orWhere('special', '<>', '');
+    for (const { id, special } of fields) {
+        let parsedSpecial;
+        try {
+            parsedSpecial = (0, utils_1.toArray)(special);
+        }
+        catch {
+            continue;
+        }
+        if (parsedSpecial && (0, lodash_1.isArray)(parsedSpecial)) {
+            let updateRequired = false;
+            parsedSpecial = parsedSpecial.map((special) => {
+                switch (special) {
+                    case 'cast-boolean':
+                    case 'cast-csv':
+                    case 'cast-json':
+                        updateRequired = true;
+                        return special.replace('cast-', '');
+                    default:
+                        return special;
+                }
+            });
+            if (updateRequired) {
+                await knex('directus_fields')
+                    .update({ special: parsedSpecial.join(',') })
+                    .where({ id });
+            }
+        }
+    }
+}
+exports.down = down;

package/dist/database/migrations/20220323A-add-field-validation.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220323A-add-field-validation.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex.schema.alterTable('directus_fields', (table) => {
+        table.json('validation');
+        table.text('validation_message');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_fields', (table) => {
+        table.dropColumn('validation');
+        table.dropColumn('validation_message');
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220325A-fix-typecast-flags.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(_knex: Knex): Promise<void>;

package/dist/database/migrations/20220325A-fix-typecast-flags.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const utils_1 = require("@directus/shared/utils");
+const lodash_1 = require("lodash");
+async function up(knex) {
+    const fields = await knex
+        .select('id', 'special')
+        .from('directus_fields')
+        .whereNotNull('special')
+        .orWhere('special', '<>', '');
+    for (const { id, special } of fields) {
+        let parsedSpecial;
+        try {
+            if (special.includes('{')) {
+                // Fix invalid data in Postgres
+                parsedSpecial = (0, utils_1.toArray)(special.replace(/{/g, '').replace(/}/g, '').replace(/"/g, ''));
+            }
+            else {
+                parsedSpecial = (0, utils_1.toArray)(special);
+            }
+        }
+        catch {
+            continue;
+        }
+        if (parsedSpecial && (0, lodash_1.isArray)(parsedSpecial)) {
+            // Perform the update again in case it was not performed prior
+            parsedSpecial = parsedSpecial.map((special) => {
+                switch (special) {
+                    case 'boolean':
+                    case 'csv':
+                    case 'json':
+                        return 'cast-' + special;
+                    default:
+                        return special;
+                }
+            });
+            const parsedSpecialString = parsedSpecial.join(',');
+            if (parsedSpecialString !== special) {
+                await knex('directus_fields').update({ special: parsedSpecialString }).where({ id });
+            }
+        }
+    }
+}
+exports.up = up;
+async function down(_knex) {
+    // Do nothing
+}
+exports.down = down;

package/dist/database/migrations/20220325B-add-default-language.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220325B-add-default-language.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const helpers_1 = require("../helpers");
+async function up(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await knex.schema.alterTable('directus_settings', (table) => {
+        table.string('default_language').notNullable().defaultTo('en-US');
+    });
+    await helper.changeToString('directus_users', 'language', {
+        nullable: true,
+        default: null,
+        length: 255,
+    });
+}
+exports.up = up;
+async function down(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await knex.schema.alterTable('directus_settings', (table) => {
+        table.dropColumn('default_language');
+    });
+    await helper.changeToString('directus_users', 'language', {
+        nullable: true,
+        default: 'en-US',
+        length: 255,
+    });
+}
+exports.down = down;

package/dist/database/migrations/run.js

@@ -63,7 +63,7 @@ async function run(database, direction, log = true) {
         await database.insert({ version: nextVersion.version, name: nextVersion.name }).into('directus_migrations');
     }
     async function down() {
-        const lastAppliedMigration = (0, lodash_1.orderBy)(completedMigrations, ['timestamp'], ['desc'])[0];
+        const lastAppliedMigration = (0, lodash_1.orderBy)(completedMigrations, ['timestamp', 'version'], ['desc', 'desc'])[0];
         if (!lastAppliedMigration) {
             throw Error('Nothing to downgrade');
         }

package/dist/database/run-ast.js

@@ -64,7 +64,10 @@ async function runAST(originalAST, schema, options) {
                 }
             }
             else {
-                nestedItems = (await runAST(nestedNode, schema, { knex, nested: true }));
+                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);
@@ -148,7 +151,7 @@ function getColumnPreprocessor(knex, schema, table) {
         if (field.type.startsWith('geometry')) {
             return helpers.st.asText(table, field.field);
         }
-        return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias);
+        return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias, schema);
     };
 }
 function getDBQuery(schema, knex, table, fieldNodes, query) {
@@ -238,7 +241,12 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode) {
                     ((_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]);
             });
             parentItem[nestedNode.fieldKey].push(...itemChildren);
-            parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(0, (_a = nestedNode.query.limit) !== null && _a !== void 0 ? _a : 100);
+            if (nestedNode.query.offset && nestedNode.query.offset >= 0) {
+                parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(nestedNode.query.offset);
+            }
+            if (nestedNode.query.limit !== -1) {
+                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];

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