From 3a21303c0d9981f1d69b1e81149ee2d7f89fe670 Mon Sep 17 00:00:00 2001
From: Florian Boulnois <fboulnoi@broadinstitute.org>
Date: Wed, 30 Oct 2024 15:34:50 -0400
Subject: [PATCH] fix: get search working again

---
 .../data_search/DatasetFilterList.jsx         |  6 +--
 .../data_search/DatasetSearchTable.jsx        | 38 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/components/data_search/DatasetFilterList.jsx b/src/components/data_search/DatasetFilterList.jsx
index 73551e620..f9f9392b8 100644
--- a/src/components/data_search/DatasetFilterList.jsx
+++ b/src/components/data_search/DatasetFilterList.jsx
@@ -11,7 +11,7 @@ import { Checkbox } from '@mui/material';
 import { flatten, uniq, compact, capitalize } from 'lodash';
 
 export const DatasetFilterList = (props) => {
-  const { datasets, filters, filterHandler, isFiltered, searchRef } = props;
+  const { datasets, filters, filterHandler, isFiltered } = props;
 
   const accessManagementFilters = uniq(compact(datasets.map((dataset) => dataset.accessManagement)));
   const dataUseFilters = uniq(compact(flatten(datasets.map((dataset) => dataset.dataUse?.primary))).map((dataUse) => dataUse.code));
@@ -32,7 +32,7 @@ export const DatasetFilterList = (props) => {
             const category = 'accessManagement';
             return (
               <ListItem disablePadding key={filter}>
-                <ListItemButton sx={{ padding: '0' }} onClick={(event) => filterHandler(event, datasets, category, filter, searchRef.current.value)}>
+                <ListItemButton sx={{ padding: '0' }} onClick={(event) => filterHandler(event, datasets, category, filter)}>
                   <ListItemIcon>
                     <Checkbox checked={isFiltered(filter, category)} />
                   </ListItemIcon>
@@ -53,7 +53,7 @@ export const DatasetFilterList = (props) => {
             const category = 'dataUse';
             return (
               <ListItem disablePadding key={filter}>
-                <ListItemButton sx={{ padding: '0' }} onClick={(event) => filterHandler(event, datasets, category, filter, searchRef.current.value)}>
+                <ListItemButton sx={{ padding: '0' }} onClick={(event) => filterHandler(event, datasets, category, filter)}>
                   <ListItemIcon>
                     <Checkbox checked={isFiltered(filter, category)} />
                   </ListItemIcon>
diff --git a/src/components/data_search/DatasetSearchTable.jsx b/src/components/data_search/DatasetSearchTable.jsx
index 6d53d55c7..183380434 100644
--- a/src/components/data_search/DatasetSearchTable.jsx
+++ b/src/components/data_search/DatasetSearchTable.jsx
@@ -34,6 +34,7 @@ const styles = {
 const defaultFilters = {
   accessManagement: [],
   dataUse: [],
+  search: []
 };
 
 export const DatasetSearchTable = (props) => {
@@ -43,7 +44,7 @@ export const DatasetSearchTable = (props) => {
   const [filtered, setFiltered] = useState([]);
   const [selected, setSelected] = useState([]);
   const [selectedTable, setSelectedTable] = useState(datasetSearchTableTabs.study);
-  const searchRef = useRef('');
+  const [searchTerm, setSearchTerm] = useState('');
 
   const isFiltered = (filter, category) => (filters[category]).indexOf(filter) > -1;
   const numSelectedFilters = (filters) => Object.values(filters).reduce((sum, array) => sum + array.length, 0);
@@ -62,7 +63,7 @@ export const DatasetSearchTable = (props) => {
     }
   };
 
-  const assembleFullQuery = (searchTerm, filters) => {
+  const assembleFullQuery = (filters) => {
     const queryChunks = [
       {
         'match': {
@@ -76,12 +77,12 @@ export const DatasetSearchTable = (props) => {
       }
     ];
 
-    // do not apply search modifier if there is no searchTerm
-    if (searchTerm !== '') {
+    // do not apply search modifier if there is no search term
+    if (filters.search.length > 0) {
       const searchModifier = [
         {
           'multi_match': {
-            'query': searchTerm,
+            'query': filters.search[filters.search.length - 1],
             'type':'phrase_prefix',
             'fields': [
               'datasetName',
@@ -159,17 +160,21 @@ export const DatasetSearchTable = (props) => {
     }
   };
 
-  const filterHandler = (event, data, category, filter, searchTerm) => {
+  const filterHandler = (event, data, category, filter) => {
     var newFilters = defaultFilters;
+    if (category === 'search') {
+      newFilters[category] = [];
+      setSearchTerm(filter);
+    }
     if (!isFiltered(filter, category) && filter !== '') {
       newFilters[category] = filters[category].concat(filter);
     } else {
       newFilters[category] = filters[category].filter((f) => f !== filter);
     }
     setFilters(newFilters);
-
-    const fullQuery = assembleFullQuery(searchTerm, newFilters);
-    const search = async () => {
+    
+    const fullQuery = assembleFullQuery(newFilters);
+    const doSearch = async () => {
       try {
         await DataSet.searchDatasetIndex(fullQuery).then((filteredDatasets) => {
           var newFiltered = datasets.filter(value => filteredDatasets.some(item => _.isEqual(item, value)));
@@ -179,18 +184,13 @@ export const DatasetSearchTable = (props) => {
         Notifications.showError({ text: 'Failed to load Elasticsearch index' });
       }
     };
-    search();
+    doSearch();
   };
   const applyForAccess = async () => {
     const darDraft = await DAR.postDarDraft({ datasetId: selected });
     history.push(`/dar_application/${darDraft.referenceId}`);
   };
 
-  const clearSearchRef = () => {
-    searchRef.current.value = '';
-    filterHandler(null, datasets, '', '');
-  };
-
   useEffect(() => {
     if (isEmpty(filtered)) {
       return;
@@ -222,12 +222,12 @@ export const DatasetSearchTable = (props) => {
                 fontFamily: 'Montserrat',
                 fontSize: '1.5rem'
               }}
-              onChange={() => filterHandler(null, datasets, '', searchRef.current.value)}
-              ref={searchRef}
+              value={searchTerm}
+              onChange={() => filterHandler(null, datasets, 'search', event.target.value)}
             />
             <div/>
             <Box sx={{ display: 'flex', flexDirection: 'row', justifyContent: 'flex-end', paddingLeft: '1em', height: '4rem' }}>
-              <Button variant="contained" onClick={clearSearchRef} sx={{ width: '100px' }}>
+              <Button variant="contained" onClick={() => {filterHandler(null, datasets, 'search', '')}} sx={{ width: '100px' }}>
                 Clear Search
               </Button>
             </Box>
@@ -253,7 +253,7 @@ export const DatasetSearchTable = (props) => {
         </Box>
         <Box sx={{display: 'flex', flexDirection: 'row', paddingTop: '2em'}}>
           <Box sx={{width: '14%', padding: '0 1em'}}>
-            <DatasetFilterList datasets={datasets} filters={filters} filterHandler={filterHandler} isFiltered={isFiltered} searchRef={searchRef}/>
+            <DatasetFilterList datasets={datasets} filters={filters} filterHandler={filterHandler} isFiltered={isFiltered}/>
           </Box>
           <Box sx={{width: '85%', padding: '0 1em'}}>
             {(() => {