From 54d12894a7c900e06f7c00f1e3b6e3b5d45fe8e6 Mon Sep 17 00:00:00 2001 From: Marc-Roig Date: Mon, 17 Jul 2023 17:36:15 +0200 Subject: [PATCH] feat: allow default sorting by creator fields --- .../controllers/validation/model-configuration.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/core/content-manager/server/controllers/validation/model-configuration.js b/packages/core/content-manager/server/controllers/validation/model-configuration.js index 04bd67568d..3139db5394 100644 --- a/packages/core/content-manager/server/controllers/validation/model-configuration.js +++ b/packages/core/content-manager/server/controllers/validation/model-configuration.js @@ -8,7 +8,8 @@ const { hasEditableAttribute, } = require('../../services/utils/configuration/attributes'); -const { getNonVisibleAttributes, getWritableAttributes } = contentTypes; +const { getNonVisibleAttributes, getWritableAttributes, constants } = contentTypes; +const { CREATED_BY_ATTRIBUTE, UPDATED_BY_ATTRIBUTE } = constants; /** * Creates the validation schema for content-type configurations @@ -46,7 +47,14 @@ const createSettingsSchema = (schema) => { // should be reset when the type changes defaultSortBy: yup .string() - .oneOf(validAttributes.concat(['id', ...nonVisibleWritableAttributes])) + .oneOf( + validAttributes.concat([ + 'id', + ...nonVisibleWritableAttributes, + CREATED_BY_ATTRIBUTE, + UPDATED_BY_ATTRIBUTE, + ]) + ) .default('id'), defaultSortOrder: yup.string().oneOf(['ASC', 'DESC']).default('ASC'), })