directus 9.4.0 → 9.4.1

package/dist/controllers/shares.js

@@ -104,7 +104,7 @@ router.get(`/info/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(
                     _or: [
                         {
                             date_start: {
-                                _lte: '$NOW',
+                                _lte: new Date().toISOString(),
                             },
                         },
                         {
@@ -118,7 +118,7 @@ router.get(`/info/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(
                     _or: [
                         {
                             date_end: {
-                                _gte: '$NOW',
+                                _gte: new Date().toISOString(),
                             },
                         },
                         {

package/dist/database/migrations/20211211A-add-shares.js

@@ -11,8 +11,9 @@ async function up(knex) {
         table.string('password');
         table.uuid('user_created').references('id').inTable('directus_users').onDelete('SET NULL');
         table.timestamp('date_created').defaultTo(knex.fn.now());
-        table.timestamp('date_start');
-        table.timestamp('date_end');
+        // This was changed after the migration went live to retroactively fix mysql5, see #10693
+        table.timestamp('date_start').nullable().defaultTo(null);
+        table.timestamp('date_end').nullable().defaultTo(null);
         table.integer('times_used').defaultTo(0);
         table.integer('max_uses');
     });

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

@@ -12,3 +12,5 @@ width: full
 group: null
 translations: null
 note: null
+conditions: null
+required: false

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

@@ -343,3 +343,12 @@ fields:
                   type:
                     _neq: 'raster'
                 hidden: true
+        - field: attribution
+          name: $t:fields.directus_settings.attribution
+          type: string
+          schema:
+            is_nullable: true
+          meta:
+            interface: input
+            options:
+              placeholder: $t:fields.directus_settings.attribution_placeholder

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

@@ -32,15 +32,19 @@ fields:
       iconRight: lock
       masked: true
     width: half
+    note: $t:shared_leave_blank_for_unlimited
 
   - field: date_start
     width: half
+    note: $t:shared_leave_blank_for_unlimited
 
   - field: date_end
     width: half
+    note: $t:shared_leave_blank_for_unlimited
 
   - field: max_uses
     width: half
+    note: $t:shared_leave_blank_for_unlimited
 
   - field: times_used
     width: half

package/dist/env.js

@@ -20,7 +20,7 @@ const defaults = {
     PORT: 8055,
     PUBLIC_URL: '/',
     MAX_PAYLOAD_SIZE: '100kb',
-    DB_EXCLUDE_TABLES: 'spatial_ref_sys',
+    DB_EXCLUDE_TABLES: 'spatial_ref_sys,sysdiagrams',
     STORAGE_LOCATIONS: 'local',
     STORAGE_LOCAL_DRIVER: 'local',
     STORAGE_LOCAL_ROOT: './uploads',

package/dist/services/authentication.js

@@ -206,12 +206,12 @@ class AuthenticationService {
             .leftJoin('directus_shares AS d', 's.share', 'd.id')
             .joinRaw('LEFT JOIN directus_roles AS r ON r.id IN (u.role, d.role)')
             .where('s.token', refreshToken)
-            .andWhere('s.expires', '>=', this.knex.fn.now())
+            .andWhere('s.expires', '>=', new Date())
             .andWhere((subQuery) => {
-            subQuery.whereNull('d.date_end').orWhere('d.date_end', '>=', this.knex.fn.now());
+            subQuery.whereNull('d.date_end').orWhere('d.date_end', '>=', new Date());
         })
             .andWhere((subQuery) => {
-            subQuery.whereNull('d.date_start').orWhere('d.date_start', '<=', this.knex.fn.now());
+            subQuery.whereNull('d.date_start').orWhere('d.date_start', '<=', new Date());
         })
             .first();
         if (!record || (!record.share_id && !record.user_id)) {

package/dist/services/graphql.js

@@ -334,6 +334,8 @@ class GraphQLService {
             }
             for (const relation of schema[action].relations) {
                 if (relation.related_collection) {
+                    if (SYSTEM_DENY_LIST.includes(relation.related_collection))
+                        continue;
                     (_a = CollectionTypes[relation.collection]) === null || _a === void 0 ? void 0 : _a.addFields({
                         [relation.field]: {
                             type: CollectionTypes[relation.related_collection],
@@ -768,6 +770,8 @@ class GraphQLService {
             }
             for (const relation of schema.read.relations) {
                 if (relation.related_collection) {
+                    if (SYSTEM_DENY_LIST.includes(relation.related_collection))
+                        continue;
                     (_a = ReadableCollectionFilterTypes[relation.collection]) === null || _a === void 0 ? void 0 : _a.addFields({
                         [relation.field]: ReadableCollectionFilterTypes[relation.related_collection],
                     });

package/dist/services/shares.js

@@ -46,10 +46,10 @@ class SharesService extends items_1.ItemsService {
             .from('directus_shares')
             .where('id', payload.share)
             .andWhere((subQuery) => {
-            subQuery.whereNull('date_end').orWhere('date_end', '>=', this.knex.fn.now());
+            subQuery.whereNull('date_end').orWhere('date_end', '>=', new Date());
         })
             .andWhere((subQuery) => {
-            subQuery.whereNull('date_start').orWhere('date_start', '<=', this.knex.fn.now());
+            subQuery.whereNull('date_start').orWhere('date_start', '<=', new Date());
         })
             .andWhere((subQuery) => {
             subQuery.whereNull('max_uses').orWhere('max_uses', '>=', this.knex.ref('times_used'));

package/dist/utils/get-default-value.js

@@ -16,12 +16,14 @@ function getDefaultValue(column) {
         return null;
     if (defaultValue === 'NULL')
         return null;
-    // Check if the default is wrapped in an extra pair of quotes, this happens in SQLite
+    // Check if the default is wrapped in an extra pair of quotes, this happens in SQLite / MariaDB
     if (typeof defaultValue === 'string' &&
         ((defaultValue.startsWith(`'`) && defaultValue.endsWith(`'`)) ||
             (defaultValue.startsWith(`"`) && defaultValue.endsWith(`"`)))) {
         defaultValue = defaultValue.slice(1, -1);
     }
+    if (defaultValue === '0000-00-00 00:00:00')
+        return null;
     switch (type) {
         case 'bigInteger':
         case 'integer':

package/example.env

@@ -44,7 +44,7 @@ DB_PASSWORD="secret"
 # DB_PASSWORD="Test@123"
 
 ## OracleDB
-# DB_CLIENT="oracle"
+# DB_CLIENT="oracledb"
 # DB_CONNECT_STRING="localhost:5104/XE"
 # DB_USER="secretsysuser"
 # DB_PASSWORD="secretpassword"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.4.0",
+	"version": "9.4.1",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -60,7 +60,7 @@
 		"prebuild": "npm run cleanup",
 		"build": "tsc --build && copyfiles \"src/**/*.*\" -e \"src/**/*.ts\" -u 1 dist",
 		"cleanup": "rimraf dist",
-		"dev": "cross-env NODE_ENV=development SERVE_APP=false ts-node-dev --files --transpile-only --respawn --watch \".env\" --inspect --exit-child -- src/start.ts",
+		"dev": "cross-env NODE_ENV=development SERVE_APP=false ts-node-dev --files --transpile-only --respawn --watch \".env\" --inspect=0 --exit-child -- src/start.ts",
 		"cli": "cross-env NODE_ENV=development SERVE_APP=false ts-node --script-mode --transpile-only src/cli/run.ts",
 		"test": "jest --coverage",
 		"test:watch": "jest --watchAll"
@@ -76,16 +76,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.4.0",
-		"@directus/drive": "9.4.0",
-		"@directus/drive-azure": "9.4.0",
-		"@directus/drive-gcs": "9.4.0",
-		"@directus/drive-s3": "9.4.0",
-		"@directus/extensions-sdk": "9.4.0",
-		"@directus/format-title": "9.4.0",
-		"@directus/schema": "9.4.0",
-		"@directus/shared": "9.4.0",
-		"@directus/specs": "9.4.0",
+		"@directus/app": "9.4.1",
+		"@directus/drive": "9.4.1",
+		"@directus/drive-azure": "9.4.1",
+		"@directus/drive-gcs": "9.4.1",
+		"@directus/drive-s3": "9.4.1",
+		"@directus/extensions-sdk": "9.4.1",
+		"@directus/format-title": "9.4.1",
+		"@directus/schema": "9.4.1",
+		"@directus/shared": "9.4.1",
+		"@directus/specs": "9.4.1",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.2",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -169,7 +169,7 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "a47b9cec0f24a7585108744b3c816bfc620297c4",
+	"gitHead": "4991ba858bdde8bdf03aee475d77a218da6e46ab",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/atob": "2.1.2",