Merge branch 'staging' into main

dataesr · Mar 7, 2022 · 40189f0 · 40189f0
2 parents 37181c5 + 82104a8
commit 40189f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/components/Charts/publications/general/dynamique-ouverture/get-data.js b/src/components/Charts/publications/general/dynamique-ouverture/get-data.js
@@ -105,9 +105,9 @@ function useGetData(observationSnaps, domain = '') {
           bsoDomain,
           y:
             ((el.by_is_oa.buckets.find((b) => b.key === 1)?.doc_count || 0)
-              * 100)
-            / (el.by_is_oa.buckets[0].doc_count
-              + el.by_is_oa.buckets[1]?.doc_count),
+              / ((el.by_is_oa.buckets?.[0]?.doc_count || 0)
+                + (el.by_is_oa.buckets?.[1]?.doc_count || 0)))
+            * 100,
         }));
         serie.ratios = filtered.map(
           (el) => `(${el.by_is_oa.buckets[0].doc_count}/${el.doc_count})`,

diff --git a/src/utils/helpers.js b/src/utils/helpers.js
@@ -297,28 +297,29 @@ export function getURLSearchParams(search) {
   let startYear = 2013;
   if (bsoLocalAffiliation) {
     commentsName = urlSearchParams.get('commentsName')?.toLowerCase()
-      || locals[bsoLocalAffiliation].commentsName
+      || locals?.[bsoLocalAffiliation]?.commentsName
       || 'françaises';
     displayTitle = !(
       (
         urlSearchParams.get('displayTitle')
-        || locals[bsoLocalAffiliation].displayTitle
+        || locals?.[bsoLocalAffiliation]?.displayTitle
       )?.toLowerCase() === 'false'
     );
     endYear = parseInt(
       urlSearchParams.get('endYear')?.toLowerCase()
-        || locals[bsoLocalAffiliation].endYear,
+        || locals?.[bsoLocalAffiliation]?.endYear,
       10,
     );
     name = urlSearchParams.get('name')?.toLowerCase()
-      || locals[bsoLocalAffiliation].name;
+      || locals?.[bsoLocalAffiliation]?.name;
     startYear = parseInt(
       urlSearchParams.get('startYear')?.toLowerCase()
-        || locals[bsoLocalAffiliation].startYear
+        || locals?.[bsoLocalAffiliation]?.startYear
         || 2013,
       10,
     );
   }
+
   return {
     bsoLocalAffiliation,
     commentsName,