@directus/api 12.0.0 → 12.0.1

package/dist/services/collections.js

@@ -1,6 +1,6 @@
 import { createInspector } from '@directus/schema';
 import { addFieldFlag } from '@directus/utils';
-import { chunk, omit } from 'lodash-es';
+import { chunk, groupBy, merge, omit } from 'lodash-es';
 import { clearSystemCache, getCache } from '../cache.js';
 import { ALIAS_TYPES } from '../constants.js';
 import { getHelpers } from '../database/helpers/index.js';
@@ -108,7 +108,22 @@ export class CollectionsService {
                         schema: this.schema,
                     });
                     const fieldPayloads = payload.fields.filter((field) => field.meta).map((field) => field.meta);
-                    await fieldItemsService.createMany(fieldPayloads, {
+                    // Sort new fields that does not have any group defined, in ascending order.
+                    // Lodash merge is used so that the "sort" can be overridden if defined.
+                    let sortedFieldPayloads = fieldPayloads
+                        .filter((field) => field?.group === undefined || field?.group === null)
+                        .map((field, index) => merge({ sort: index + 1 }, field));
+                    // Sort remaining new fields with group defined, if any, in ascending order.
+                    // sortedFieldPayloads will be less than fieldPayloads if it filtered out any fields with group defined.
+                    if (sortedFieldPayloads.length < fieldPayloads.length) {
+                        const fieldsWithGroups = groupBy(fieldPayloads.filter((field) => field?.group), (field) => field?.group);
+                        // The sort order is restarted from 1 for fields in each group and appended to sortedFieldPayloads.
+                        // Lodash merge is used so that the "sort" can be overridden if defined.
+                        for (const [_group, fields] of Object.entries(fieldsWithGroups)) {
+                            sortedFieldPayloads = sortedFieldPayloads.concat(fields.map((field, index) => merge({ sort: index + 1 }, field)));
+                        }
+                    }
+                    await fieldItemsService.createMany(sortedFieldPayloads, {
                         bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                         bypassLimits: true,
                     });

package/dist/services/fields.js

@@ -1,7 +1,7 @@
 import { KNEX_TYPES, REGEX_BETWEEN_PARENS } from '@directus/constants';
 import { createInspector } from '@directus/schema';
 import { addFieldFlag, toArray } from '@directus/utils';
-import { isEqual, isNil } from 'lodash-es';
+import { isEqual, isNil, merge } from 'lodash-es';
 import { clearSystemCache, getCache } from '../cache.js';
 import { ALIAS_TYPES } from '../constants.js';
 import { translateDatabaseError } from '../database/errors/translate.js';
@@ -241,8 +241,14 @@ export class FieldsService {
                     }
                 }
                 if (hookAdjustedField.meta) {
+                    const existingSortRecord = await trx
+                        .from('directus_fields')
+                        .where(hookAdjustedField.meta?.group ? { collection, group: hookAdjustedField.meta.group } : { collection })
+                        .max('sort', { as: 'max' })
+                        .first();
+                    const newSortValue = existingSortRecord?.max ? existingSortRecord.max + 1 : 1;
                     await itemsService.createOne({
-                        ...hookAdjustedField.meta,
+                        ...merge({ sort: newSortValue }, hookAdjustedField.meta),
                         collection: collection,
                         field: hookAdjustedField.field,
                     }, { emitEvents: false });

package/dist/services/meta.js

@@ -10,7 +10,6 @@ export class MetaService {
         this.accountability = options.accountability || null;
         this.schema = options.schema;
     }
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     async getMetaForQuery(collection, query) {
         if (!query || !query.meta)
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -143,7 +143,7 @@
     "ws": "8.12.1",
     "zod": "3.21.4",
     "zod-validation-error": "1.0.1",
-    "@directus/app": "10.4.0",
+    "@directus/app": "10.4.1",
     "@directus/constants": "10.2.1",
     "@directus/errors": "0.0.1",
     "@directus/extensions-sdk": "10.1.5",