directus 9.11.0 → 9.12.1

package/dist/controllers/operations.js

@@ -0,0 +1,138 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const exceptions_1 = require("../exceptions");
+const respond_1 = require("../middleware/respond");
+const use_collection_1 = __importDefault(require("../middleware/use-collection"));
+const validate_batch_1 = require("../middleware/validate-batch");
+const services_1 = require("../services");
+const async_handler_1 = __importDefault(require("../utils/async-handler"));
+const router = express_1.default.Router();
+router.use((0, use_collection_1.default)('directus_operations'));
+router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
+    const service = new services_1.OperationsService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    const savedKeys = [];
+    if (Array.isArray(req.body)) {
+        const keys = await service.createMany(req.body);
+        savedKeys.push(...keys);
+    }
+    else {
+        const key = await service.createOne(req.body);
+        savedKeys.push(key);
+    }
+    try {
+        if (Array.isArray(req.body)) {
+            const items = await service.readMany(savedKeys, req.sanitizedQuery);
+            res.locals.payload = { data: items };
+        }
+        else {
+            const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
+            res.locals.payload = { data: item };
+        }
+    }
+    catch (error) {
+        if (error instanceof exceptions_1.ForbiddenException) {
+            return next();
+        }
+        throw error;
+    }
+    return next();
+}), respond_1.respond);
+const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
+    const service = new services_1.OperationsService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    const metaService = new services_1.MetaService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    const records = await service.readByQuery(req.sanitizedQuery);
+    const meta = await metaService.getMetaForQuery(req.collection, req.sanitizedQuery);
+    res.locals.payload = { data: records || null, meta };
+    return next();
+});
+router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
+router.search('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
+router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+    const service = new services_1.OperationsService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    const record = await service.readOne(req.params.pk, req.sanitizedQuery);
+    res.locals.payload = { data: record || null };
+    return next();
+}), respond_1.respond);
+router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
+    const service = new services_1.OperationsService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    let keys = [];
+    if (req.body.keys) {
+        keys = await service.updateMany(req.body.keys, req.body.data);
+    }
+    else {
+        keys = await service.updateByQuery(req.body.query, req.body.data);
+    }
+    try {
+        const result = await service.readMany(keys, req.sanitizedQuery);
+        res.locals.payload = { data: result };
+    }
+    catch (error) {
+        if (error instanceof exceptions_1.ForbiddenException) {
+            return next();
+        }
+        throw error;
+    }
+    return next();
+}), respond_1.respond);
+router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+    const service = new services_1.OperationsService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    const primaryKey = await service.updateOne(req.params.pk, req.body);
+    try {
+        const item = await service.readOne(primaryKey, req.sanitizedQuery);
+        res.locals.payload = { data: item || null };
+    }
+    catch (error) {
+        if (error instanceof exceptions_1.ForbiddenException) {
+            return next();
+        }
+        throw error;
+    }
+    return next();
+}), respond_1.respond);
+router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
+    const service = new services_1.OperationsService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    if (Array.isArray(req.body)) {
+        await service.deleteMany(req.body);
+    }
+    else if (req.body.keys) {
+        await service.deleteMany(req.body.keys);
+    }
+    else {
+        await service.deleteByQuery(req.body.query);
+    }
+    return next();
+}), respond_1.respond);
+router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+    const service = new services_1.OperationsService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    await service.deleteOne(req.params.pk);
+    return next();
+}), respond_1.respond);
+exports.default = router;

package/dist/database/index.js

@@ -22,18 +22,9 @@ function getDatabase() {
     if (database) {
         return database;
     }
-    const connectionConfig = (0, get_config_from_env_1.getConfigFromEnv)('DB_', [
-        'DB_CLIENT',
-        'DB_VERSION',
-        'DB_SEARCH_PATH',
-        'DB_CONNECTION_STRING',
-        'DB_POOL',
-        'DB_EXCLUDE_TABLES',
-        'DB_VERSION',
-    ]);
-    const poolConfig = (0, get_config_from_env_1.getConfigFromEnv)('DB_POOL');
+    const { client, version, searchPath, connectionString, pool: poolConfig = {}, ...connectionConfig } = (0, get_config_from_env_1.getConfigFromEnv)('DB_', ['DB_EXCLUDE_TABLES']);
     const requiredEnvVars = ['DB_CLIENT'];
-    switch (env_1.default.DB_CLIENT) {
+    switch (client) {
         case 'sqlite3':
             requiredEnvVars.push('DB_FILENAME');
             break;
@@ -47,22 +38,27 @@ function getDatabase() {
             break;
         case 'cockroachdb':
         case 'pg':
-            if (!env_1.default.DB_CONNECTION_STRING) {
+            if (!connectionString) {
                 requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER');
             }
             else {
                 requiredEnvVars.push('DB_CONNECTION_STRING');
             }
             break;
+        case 'mssql':
+            if (!env_1.default.DB_TYPE || env_1.default.DB_TYPE === 'default') {
+                requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');
+            }
+            break;
         default:
             requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');
     }
     (0, validate_env_1.validateEnv)(requiredEnvVars);
     const knexConfig = {
-        client: env_1.default.DB_CLIENT,
-        version: env_1.default.DB_VERSION,
-        searchPath: env_1.default.DB_SEARCH_PATH,
-        connection: env_1.default.DB_CONNECTION_STRING || connectionConfig,
+        client,
+        version,
+        searchPath,
+        connection: connectionString || connectionConfig,
         log: {
             warn: (msg) => {
                 // Ignore warnings about returning not being supported in some DBs
@@ -79,7 +75,7 @@ function getDatabase() {
         },
         pool: poolConfig,
     };
-    if (env_1.default.DB_CLIENT === 'sqlite3') {
+    if (client === 'sqlite3') {
         knexConfig.useNullAsDefault = true;
         poolConfig.afterCreate = async (conn, callback) => {
             logger_1.default.trace('Enabling SQLite Foreign Keys support...');
@@ -88,7 +84,7 @@ function getDatabase() {
             callback(null, conn);
         };
     }
-    if (env_1.default.DB_CLIENT === 'cockroachdb') {
+    if (client === 'cockroachdb') {
         poolConfig.afterCreate = async (conn, callback) => {
             logger_1.default.trace('Setting CRDB serial_normalization and default_int_size');
             const run = (0, util_1.promisify)(conn.query.bind(conn));
@@ -97,7 +93,7 @@ function getDatabase() {
             callback(null, conn);
         };
     }
-    if (env_1.default.DB_CLIENT === 'mssql') {
+    if (client === 'mssql') {
         // This brings MS SQL in line with the other DB vendors. We shouldn't do any automatic
         // timezone conversion on the database level, especially not when other database vendors don't
         // act the same

package/dist/database/migrations/20220429A-add-flows.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/20220429A-add-flows.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const utils_1 = require("@directus/shared/utils");
+const uuid_1 = require("uuid");
+const parse_json_1 = require("../../utils/parse-json");
+async function up(knex) {
+    await knex.schema.createTable('directus_flows', (table) => {
+        table.uuid('id').primary().notNullable();
+        table.string('name').notNullable();
+        table.string('icon', 30);
+        table.string('color').nullable();
+        table.text('description');
+        table.string('status').notNullable().defaultTo('active');
+        table.string('trigger');
+        table.string('accountability').defaultTo('all');
+        table.json('options');
+        table.uuid('operation').unique();
+        table.timestamp('date_created').defaultTo(knex.fn.now());
+        table.uuid('user_created').references('id').inTable('directus_users').onDelete('SET NULL');
+    });
+    await knex.schema.createTable('directus_operations', (table) => {
+        table.uuid('id').primary().notNullable();
+        table.string('name');
+        table.string('key').notNullable();
+        table.string('type').notNullable();
+        table.integer('position_x').notNullable();
+        table.integer('position_y').notNullable();
+        table.json('options');
+        table.uuid('resolve').unique().references('id').inTable('directus_operations');
+        table.uuid('reject').unique().references('id').inTable('directus_operations');
+        table.uuid('flow').notNullable().references('id').inTable('directus_flows').onDelete('CASCADE');
+        table.timestamp('date_created').defaultTo(knex.fn.now());
+        table.uuid('user_created').references('id').inTable('directus_users').onDelete('SET NULL');
+    });
+    const webhooks = await knex.select('*').from('directus_webhooks');
+    const flows = [];
+    const operations = [];
+    for (const webhook of webhooks) {
+        const flowID = (0, uuid_1.v4)();
+        flows.push({
+            id: flowID,
+            name: webhook.name,
+            status: 'inactive',
+            trigger: 'hook',
+            options: JSON.stringify({
+                name: webhook.name,
+                type: 'action',
+                scope: (0, utils_1.toArray)(webhook.actions).map((scope) => `items.${scope}`),
+                collections: (0, utils_1.toArray)(webhook.collections),
+            }),
+        });
+        operations.push({
+            id: (0, uuid_1.v4)(),
+            name: 'Request',
+            key: 'request',
+            type: 'request',
+            position_x: 21,
+            position_y: 1,
+            options: JSON.stringify({
+                url: webhook.url,
+                headers: typeof webhook.headers === 'string' ? (0, parse_json_1.parseJSON)(webhook.headers) : webhook.headers,
+                data: webhook.data ? '{{$trigger}}' : null,
+                method: webhook.method,
+            }),
+            date_created: new Date(),
+            flow: flowID,
+        });
+    }
+    if (flows.length && operations.length) {
+        await knex.insert(flows).into('directus_flows');
+        await knex.insert(operations).into('directus_operations');
+        for (const operation of operations) {
+            await knex('directus_flows').update({ operation: operation.id }).where({ id: operation.flow });
+        }
+    }
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.dropTable('directus_operations');
+    await knex.schema.dropTable('directus_flows');
+}
+exports.down = down;

package/dist/database/migrations/20220429B-add-color-to-insights-icon.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/20220429B-add-color-to-insights-icon.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_dashboards', (table) => {
+        table.string('color').nullable();
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_dashboards', (table) => {
+        table.dropColumn('color');
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220429C-drop-non-null-from-ip-of-activity.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/20220429C-drop-non-null-from-ip-of-activity.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_activity', (table) => {
+        table.setNullable('ip');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_activity', (table) => {
+        table.dropNullable('ip');
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220429D-drop-non-null-from-sender-of-notifications.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/20220429D-drop-non-null-from-sender-of-notifications.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_notifications', (table) => {
+        table.setNullable('sender');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_notifications', (table) => {
+        table.dropNullable('sender');
+    });
+}
+exports.down = down;

package/dist/database/seeds/05-activity.yaml

@@ -20,7 +20,6 @@ columns:
   user_agent:
     type: string
     length: 255
-    nullabel: false
   collection:
     type: string
     length: 64

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

@@ -68,3 +68,7 @@ data:
   - collection: directus_shares
     icon: share
     note: $t:directus_collection.directus_shares
+  - collection: directus_flows
+    note: $t:directus_collection.directus_flows
+  - collection: directus_operations
+    note: $t:directus_collection.directus_operations

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

@@ -37,6 +37,9 @@ fields:
 
   - field: timestamp
     display: datetime
+    special:
+      - date-created
+      - cast-timestamp
     options:
       relative: true
     width: half

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

@@ -8,7 +8,9 @@ fields:
   - field: panels
     special: o2m
   - field: date_created
-    special: date-created
+    special:
+      - date-created
+      - cast-timestamp
   - field: user_created
     special: user-created
   - field: note

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

@@ -0,0 +1,21 @@
+table: directus_flows
+
+fields:
+  - field: id
+    special: uuid
+  - field: name
+  - field: icon
+  - field: color
+  - field: note
+  - field: status
+  - field: trigger
+  - field: accountability
+  - field: options
+    special: cast-json
+  - field: operation
+  - field: operations
+    special: o2m
+  - field: date_created
+    special: date-created
+  - field: user_created
+    special: user-created

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

@@ -3,7 +3,9 @@ table: directus_notifications
 fields:
   - field: id
   - field: timestamp
-    special: date-created
+    special:
+      - date-created
+      - cast-timestamp
   - field: status
   - field: recipient
   - field: sender

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

@@ -0,0 +1,19 @@
+table: directus_operations
+
+fields:
+  - field: id
+    special: uuid
+  - field: name
+  - field: key
+  - field: type
+  - field: position_x
+  - field: position_y
+  - field: options
+    special: cast-json
+  - field: resolve
+  - field: reject
+  - field: flow
+  - field: date_created
+    special: date-created
+  - field: user_created
+    special: user-created

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

@@ -17,7 +17,9 @@ fields:
   - field: options
     special: cast-json
   - field: date_created
-    special: date-created
+    special:
+      - date-created
+      - cast-timestamp
   - field: user_created
     special: user-created
   - field: dashboard

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

@@ -51,7 +51,9 @@ fields:
     readonly: true
 
   - field: date_created
-    special: date-created
+    special:
+      - date-created
+      - cast-timestamp
     width: half
     readonly: true
     conditions:

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

@@ -135,10 +135,8 @@ fields:
       template: '{{ name }}'
 
   - field: token
-    interface: token
-    options:
-      iconRight: vpn_key
-      placeholder: $t:fields.directus_users.token_placeholder
+    interface: system-token
+    special: conceal
     width: full
 
   - field: id

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

@@ -61,6 +61,20 @@ data:
     many_field: dashboard
     one_collection: directus_dashboards
     one_field: panels
+  - many_collection: directus_flows
+    many_field: operation
+    one_collection: directus_operations
+  - many_collection: directus_operations
+    many_field: flow
+    one_collection: directus_flows
+    one_field: operations
+    one_deselect_action: delete
+  - many_collection: directus_operations
+    many_field: resolve
+    one_collection: directus_operations
+  - many_collection: directus_operations
+    many_field: reject
+    one_collection: directus_operations
   - many_collection: directus_files
     many_field: modified_by
     one_collection: directus_users
@@ -88,6 +102,12 @@ data:
   - many_collection: directus_panels
     many_field: user_created
     one_collection: directus_users
+  - many_collection: directus_flows
+    many_field: user_created
+    one_collection: directus_users
+  - many_collection: directus_operations
+    many_field: user_created
+    one_collection: directus_users
   - many_collection: directus_notifications
     many_field: recipient
     one_collection: directus_users

package/dist/env.d.ts

@@ -1,6 +1,6 @@
 /**
  * @NOTE
- * See example.env for all possible keys
+ * For all possible keys, see: https://docs.directus.io/configuration/config-options/
  */
 declare let env: Record<string, any>;
 export default env;