fix duplicated affiliations when excluded

dataesr · Sep 21, 2023 · 5306922 · 5306922
1 parent 9009054
commit 5306922
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/client/src/pages/home/index.jsx b/client/src/pages/home/index.jsx
@@ -139,14 +139,17 @@ export default function Home() {
   const groupByAffiliations = (works) => {
     setIsLoading(true);
     let allAffiliationsTmp = {};
+
+    // save already tagged affiliations
     const taggedAffiliations = Object.values(allAffiliations).filter((affiliation) => affiliation.status !== TO_BE_DECIDED_STATUS);
+
     works.filter((work) => work.status === TO_BE_DECIDED_STATUS).forEach((work) => {
       (work?.affiliations ?? [])
         .filter((affiliation) => Object.keys(affiliation).length)
         .forEach((affiliation) => {
-          const affiliationName = normalizedName(affiliation.name);
+          const name = getAffiliationName(affiliation);
+          const affiliationName = normalizedName(name);
           if (!allAffiliationsTmp?.[affiliationName]) {
-            const name = getAffiliationName(affiliation);
             allAffiliationsTmp[affiliationName] = {
               matches: [...new Set(name.match(regexp))].length,
               name,
@@ -158,14 +161,17 @@ export default function Home() {
           allAffiliationsTmp[affiliationName].works.push(work.id);
         });
     });
+
     taggedAffiliations.forEach((affiliation) => {
       const affiliationName = normalizedName(affiliation.name);
+
       if (!allAffiliationsTmp?.[affiliationName]) {
         allAffiliationsTmp[affiliationName] = affiliation;
       } else {
         allAffiliationsTmp[affiliationName].status = affiliation.status;
       }
     });
+
     allAffiliationsTmp = Object.values(allAffiliationsTmp)
       .map((affiliation, index) => ({ ...affiliation, works: [...new Set(affiliation.works)], id: index.toString(), worksNumber: [...new Set(affiliation.works)].length }));
     setAllAffiliations(allAffiliationsTmp);