fix: #2711 index sortable field global versions fields (#2775)

payloadcms · Jun 6, 2023 · 576af01 · 576af01
1 parent 8b767a1
commit 576af01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/globals/initLocal.ts b/src/globals/initLocal.ts
@@ -25,6 +25,7 @@ export default function initGlobalsLocal(ctx: Payload): void {
           ctx.config,
           versionGlobalFields,
           {
+            indexSortableFields: ctx.config.indexSortableFields,
             disableUnique: true,
             draftsEnabled: true,
             options: {

diff --git a/src/mongoose/buildSchema.ts b/src/mongoose/buildSchema.ts
@@ -15,7 +15,8 @@ import {
   EmailField,
   Field,
   FieldAffectingData,
-  fieldAffectsData, fieldIsLocalized,
+  fieldAffectsData,
+  fieldIsLocalized,
   fieldIsPresentationalOnly,
   GroupField,
   JSONField,
@@ -31,7 +32,8 @@ import {
   tabHasName,
   TabsField,
   TextareaField,
-  TextField, UnnamedTab,
+  TextField,
+  UnnamedTab,
   UploadField,
 } from '../fields/config/types';
 
@@ -384,6 +386,9 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
   group: (field: GroupField, schema: Schema, config: SanitizedConfig, buildSchemaOptions: BuildSchemaOptions): void => {
     const formattedBaseSchema = formatBaseSchema(field, buildSchemaOptions);
 
+    // carry indexSortableFields through to versions if drafts enabled
+    const indexSortableFields = (buildSchemaOptions.indexSortableFields && field.name === 'version' && buildSchemaOptions.draftsEnabled);
+
     const baseSchema = {
       ...formattedBaseSchema,
       type: buildSchema(
@@ -395,6 +400,7 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
             id: false,
             minimize: false,
           },
+          indexSortableFields,
           disableUnique: buildSchemaOptions.disableUnique,
           draftsEnabled: buildSchemaOptions.draftsEnabled,
         },

diff --git a/test/versions/config.ts b/test/versions/config.ts
@@ -21,6 +21,7 @@ export default buildConfig({
     locales: ['en', 'es'],
     defaultLocale: 'en',
   },
+  indexSortableFields: true,
   onInit: async (payload) => {
     await payload.create({
       collection: 'users',