fix(openalex): Fix search by ror id

dataesr · Nov 25, 2024 · fb96d39 · fb96d39
1 parent 75d0b5a
commit fb96d39
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 28 deletions.
diff --git a/client/src/pages/openalex-ror/results/index.jsx b/client/src/pages/openalex-ror/results/index.jsx
@@ -59,7 +59,6 @@ export default function Affiliations() {
   const [rorMessage, setRorMessage] = useState('');
   const [rorMessageType, setRorMessageType] = useState('');
   const [selectedOpenAlex, setSelectedOpenAlex] = useState([]);
-  const [timer, setTimer] = useState();
   const [uniqueRors, setUniqueRors] = useState({});
 
   const { data, error, isFetched, isFetching, refetch } = useQuery({
@@ -214,31 +213,21 @@ export default function Affiliations() {
   }, [data]);
 
   useEffect(() => {
-    if (timer) {
-      clearTimeout(timer);
+    const regex = new RegExp(removeDiacritics(filteredAffiliationName));
+    const filteredAffiliationsTmp = affiliations.filter(
+      (affiliation) => regex.test(
+        `${affiliation.key.replace('[ source: ', '').replace(' ]', '')} ${affiliation.rors.map((_ror) => _ror.rorId).join(' ')}`,
+      ),
+    );
+    // Recompute corrections only when the array has changed
+    if (filteredAffiliationsTmp.length !== filteredAffiliations.length) {
+      setAllOpenalexCorrections([
+        ...allOpenalexCorrections,
+        ...getAffiliationsCorrections(filteredAffiliationsTmp),
+      ]);
     }
-    const timerTmp = setTimeout(() => {
-      const filteredAffiliationsTmp = affiliations.filter(
-        (affiliation) => {
-          const regex = new RegExp(removeDiacritics(filteredAffiliationName));
-          return regex.test(
-            affiliation.key.replace('[ source: ', '').replace(' ]', ''),
-          );
-        },
-      );
-      // Recompute corrections only when the array has changed
-      if (filteredAffiliationsTmp.length !== filteredAffiliations.length) {
-        setAllOpenalexCorrections([
-          ...allOpenalexCorrections,
-          ...getAffiliationsCorrections(filteredAffiliationsTmp),
-        ]);
-      }
-      setFilteredAffiliations(filteredAffiliationsTmp);
-    }, 500);
-    setTimer(timerTmp);
-    // The timer should not be tracked
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [affiliations, filteredAffiliationName, filteredStatus]);
+    setFilteredAffiliations(filteredAffiliationsTmp);
+  }, [affiliations, allOpenalexCorrections, filteredAffiliationName, filteredAffiliations.length, filteredStatus]);
 
   useEffect(() => {
     if (ror === '') {
@@ -557,9 +546,9 @@ export default function Affiliations() {
                 <div
                   className="wm-external-actions"
                   style={{
+                    alignItems: 'center',
                     display: 'flex',
                     justifyContent: 'space-between',
-                    alignItems: 'center',
                   }}
                 >
                   <div className="left-content">

diff --git a/client/src/pages/openalex-ror/results/views-selector.jsx b/client/src/pages/openalex-ror/results/views-selector.jsx
@@ -16,7 +16,7 @@ import { isRor } from '../../../utils/ror';
 import DataTableView from './datatable-view';
 import ListView from './list-view';
 
-export default function OpenalexView({
+export default function ViewsSelector({
   allAffiliations,
   allOpenalexCorrections,
   filteredAffiliationName,
@@ -292,7 +292,7 @@ export default function OpenalexView({
   );
 }
 
-OpenalexView.propTypes = {
+ViewsSelector.propTypes = {
   allAffiliations: PropTypes.arrayOf(
     PropTypes.shape({
       name: PropTypes.string.isRequired,