From 9ec2a40274ea9b3a32e43cb992df3897baf62e63 Mon Sep 17 00:00:00 2001
From: Jacob Fletcher <jacobsfletch@gmail.com>
Date: Tue, 30 May 2023 12:41:28 -0400
Subject: [PATCH] fix: searches on correct useAsTitle field in polymorphic list
 drawers #2710

---
 .../elements/ListControls/index.tsx           | 25 ++++++++++++++-----
 .../elements/SearchFilter/index.tsx           |  4 ++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/admin/components/elements/ListControls/index.tsx b/src/admin/components/elements/ListControls/index.tsx
index 61aba80411..7f71276ef5 100644
--- a/src/admin/components/elements/ListControls/index.tsx
+++ b/src/admin/components/elements/ListControls/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import AnimateHeight from 'react-animate-height';
 import { useTranslation } from 'react-i18next';
 import { useWindowInfo } from '@faceless-ui/window-info';
@@ -20,11 +20,24 @@ import EditMany from '../EditMany';
 import DeleteMany from '../DeleteMany';
 import PublishMany from '../PublishMany';
 import UnpublishMany from '../UnpublishMany';
+import { SanitizedCollectionConfig } from '../../../../collections/config/types';
 
 import './index.scss';
 
 const baseClass = 'list-controls';
 
+const getUseAsTitle = (collection: SanitizedCollectionConfig) => {
+  const {
+    admin: {
+      useAsTitle,
+    },
+    fields,
+  } = collection;
+
+  const topLevelFields = flattenFields(fields);
+  return topLevelFields.find((field) => fieldAffectsData(field) && field.name === useAsTitle);
+};
+
 const ListControls: React.FC<Props> = (props) => {
   const {
     collection,
@@ -37,7 +50,6 @@ const ListControls: React.FC<Props> = (props) => {
     collection: {
       fields,
       admin: {
-        useAsTitle,
         listSearchableFields,
       },
     },
@@ -46,10 +58,11 @@ const ListControls: React.FC<Props> = (props) => {
   const params = useSearchParams();
   const shouldInitializeWhereOpened = validateWhereQuery(params?.where);
 
-  const [titleField] = useState(() => {
-    const topLevelFields = flattenFields(fields);
-    return topLevelFields.find((field) => fieldAffectsData(field) && field.name === useAsTitle);
-  });
+  const [titleField, setTitleField] = useState(getUseAsTitle(collection));
+  useEffect(() => {
+    setTitleField(getUseAsTitle(collection));
+  }, [collection]);
+
   const [textFieldsToBeSearched] = useState(getTextFieldsToBeSearched(listSearchableFields, fields));
   const [visibleDrawer, setVisibleDrawer] = useState<'where' | 'sort' | 'columns'>(shouldInitializeWhereOpened ? 'where' : undefined);
   const { t, i18n } = useTranslation('general');
diff --git a/src/admin/components/elements/SearchFilter/index.tsx b/src/admin/components/elements/SearchFilter/index.tsx
index e4ee5e355c..a3e90188cc 100644
--- a/src/admin/components/elements/SearchFilter/index.tsx
+++ b/src/admin/components/elements/SearchFilter/index.tsx
@@ -85,8 +85,10 @@ const SearchFilter: React.FC<Props> = (props) => {
         }
         return `${prev}, ${getTranslation(curr.label || curr.name, i18n)}`;
       }, placeholder.current);
+    } else {
+      placeholder.current = t('searchBy', { label: getTranslation(fieldLabel, i18n) });
     }
-  }, [t, listSearchableFields, i18n]);
+  }, [t, listSearchableFields, i18n, fieldLabel]);
 
   return (
     <div className={baseClass}>