Merge pull request #1396 from VEuPathDB/fix-1395-mesa-text-search

Make links searchable in tables, and sort out search on paged tables

Author: aurreco-uga

packages/libs/eda/src/lib/core/components/filter/TableFilter.tsx

@@ -232,13 +232,13 @@ export function TableFilter({
       analysisState.setVariableUISettings((currentState) => ({
         ...currentState,
         [uiStateKey]: {
-          ...uiState,
+          ...currentState[uiStateKey],
           sort,
           currentPage: 1,
         },
       }));
     },
-    [analysisState, uiStateKey, uiState]
+    [analysisState, uiStateKey]
   );
 
   const handleSearch = useCallback(
@@ -254,39 +254,39 @@ export function TableFilter({
       analysisState.setVariableUISettings((currentState) => ({
         ...currentState,
         [uiStateKey]: {
-          ...uiState,
+          ...currentState[uiStateKey],
           searchTerm,
           ...(shouldResetPaging ? { currentPage: 1 } : {}),
         },
       }));
     },
-    [analysisState, uiStateKey, uiState]
+    [analysisState, uiStateKey]
   );
 
   const handlePagination = useCallback(
     (_: unknown, currentPage: number) => {
       analysisState.setVariableUISettings((currentState) => ({
         ...currentState,
         [uiStateKey]: {
-          ...uiState,
+          ...currentState[uiStateKey],
           currentPage,
         },
       }));
     },
-    [analysisState, uiStateKey, uiState]
+    [analysisState, uiStateKey]
   );
 
   const handleRowsPerPage = useCallback(
     (_: unknown, rowsPerPage: number) => {
       analysisState.setVariableUISettings((currentState) => ({
         ...currentState,
         [uiStateKey]: {
-          ...uiState,
+          ...currentState[uiStateKey],
           rowsPerPage,
         },
       }));
     },
-    [analysisState, uiStateKey, uiState]
+    [analysisState, uiStateKey]
   );
 
   const allValues = useMemo(() => {

packages/libs/wdk-client/src/Views/Records/RecordTable/RecordTable.jsx

@@ -264,7 +264,9 @@ class RecordTable extends Component {
         )
       : displayableAttributes;
     const filteredRows = sortedMesaRows.filter((row) => {
-      return searchableAttributes.some((attr) => regex.test(row[attr.name]));
+      return searchableAttributes.some((attr) =>
+        regex.test(row[attr.name].text ?? row[attr.name])
+      );
     });
 
     const tableState = {

packages/sites/ortho-site/webapp/wdkCustomization/js/client/records/Sequences.tsx

@@ -339,6 +339,11 @@ export function RecordTable_Sequences(
     [mesaColumns]
   );
 
+  const handleSearchQueryChange = useCallback((query: string) => {
+    setSearchQuery(query);
+    setTablePageNumber(1);
+  }, []);
+
   const handleSpeciesSelection = useCallback((species: string[]) => {
     setSelectedSpecies(species);
     setTablePageNumber(1);
@@ -742,7 +747,7 @@ export function RecordTable_Sequences(
         <RecordFilter
           key={`text-search-${resetCounter}`}
           searchTerm={searchQuery}
-          onSearchTermChange={setSearchQuery}
+          onSearchTermChange={handleSearchQueryChange}
           recordDisplayName="Proteins"
           filterAttributes={filterAttributes}
           selectedColumnFilters={volatileSelectedColumnFilters}