fix: separate sort and search fields when looking up relationsip.

Fixes: payloadcms#4815 payloadcms#5222
andershermansen · Apr 23, 2024 · 9f33d74 · 9f33d74
1 parent 9152a23
commit 9f33d74
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/packages/payload/src/admin/components/forms/field-types/Relationship/index.tsx b/packages/payload/src/admin/components/forms/field-types/Relationship/index.tsx
@@ -146,13 +146,12 @@ const Relationship: React.FC<Props> = (props) => {
 
           if (resultsFetched < 10) {
             const collection = collections.find((coll) => coll.slug === relation)
-            let fieldToSearch = collection?.defaultSort || collection?.admin?.useAsTitle || 'id'
-            if (!searchArg) {
-              if (typeof sortOptions === 'string') {
-                fieldToSearch = sortOptions
-              } else if (sortOptions?.[relation]) {
-                fieldToSearch = sortOptions[relation]
-              }
+            const fieldToSearch = collection?.admin?.useAsTitle || 'id'
+            let fieldToSort = collection?.defaultSort || 'id'
+            if (typeof sortOptions === 'string') {
+              fieldToSort = sortOptions
+            } else if (sortOptions?.[relation]) {
+              fieldToSort = sortOptions[relation]
             }
 
             const query: {
@@ -164,7 +163,7 @@ const Relationship: React.FC<Props> = (props) => {
               limit: maxResultsPerRequest,
               locale,
               page: lastLoadedPageToUse,
-              sort: fieldToSearch,
+              sort: fieldToSort,
               where: {
                 and: [
                   {