fix(search): Restore search on RoR

dataesr · Sep 28, 2023 · 1175dc3 · 1175dc3
1 parent cc0bf17
commit 1175dc3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/client/src/pages/home/index.jsx b/client/src/pages/home/index.jsx
@@ -150,11 +150,18 @@ export default function Home() {
           const ror = getAffiliationRor(affiliation);
           const normalizedAffiliationName = normalizedName(affiliation.name);
           if (!allAffiliationsTmp?.[normalizedAffiliationName]) {
+            // Check matches in affiliation name and ror
+            let matches = `${affiliation?.name} ${ror}`?.match(regexp) ?? [];
+            // Normalize matched strings
+            matches = matches.map((name) => normalizedName(name));
+            // Filter matches as uniq
+            matches = [...new Set(matches)];
             allAffiliationsTmp[normalizedAffiliationName] = {
-              matches: [...new Set((affiliation?.name?.match(regexp) ?? []).map((name) => normalizedName(name)))].length,
+              matches: matches.length,
               name: affiliation.name,
               nameHtml: affiliation.name.replace(regexp, '<b>$&</b>'),
               ror,
+              rorHtml: ror?.replace(regexp, '<b>$&</b>'),
               status: TO_BE_DECIDED_STATUS,
               works: [],
             };

diff --git a/client/src/pages/home/views/affiliations.jsx b/client/src/pages/home/views/affiliations.jsx
@@ -4,6 +4,7 @@ import { DataTable } from 'primereact/datatable';
 
 import {
   nameTemplate,
+  rorTemplate,
   statusFilterTemplate,
   statusTemplate,
 } from '../../../utils/templates';
@@ -39,7 +40,7 @@ export default function AffiliationsView({
       <Column selectionMode="multiple" />
       <Column field="status" header="Status" body={statusTemplate} filter showFilterMenu={false} filterElement={statusFilterTemplate} />
       <Column field="nameHtml" header="Affiliation" body={nameTemplate} filter filterField="name" filterMatchMode="contains" filterPlaceholder="Search by affiliation" />
-      <Column field="ror" header="RoR" filter />
+      <Column field="rorHtml" header="RoR" body={rorTemplate} filter filterField="ror" filterMatchMode="contains" filterPlaceholder="Search by RoR" />
       <Column field="worksNumber" header="Number of works" sortable />
       <Column field="matches" header="Number of matches" sortable />
     </DataTable>

diff --git a/client/src/utils/templates.jsx b/client/src/utils/templates.jsx
@@ -80,6 +80,8 @@ const getAuthorsTooltipField = (rowData) => {
 
 const nameTemplate = (rowData) => <span dangerouslySetInnerHTML={{ __html: rowData.nameHtml }} />;
 
+const rorTemplate = (rowData) => <span dangerouslySetInnerHTML={{ __html: rowData.rorHtml }} />;
+
 const getBadgeTypeByStatus = (status) => {
   let type;
   switch (status) {
@@ -146,6 +148,7 @@ export {
   getAuthorsHtmlField,
   getAuthorsTooltipField,
   nameTemplate,
+  rorTemplate,
   sourcesFilterTemplate,
   statusFilterTemplate,
   statusTemplate,