Merge branch 'staging' of https://github.com/dataesr/bso-ui into staging

dataesr · Jan 4, 2024 · 0e2cbbe · 0e2cbbe
2 parents 0a06012 + 3da3efd
commit 0e2cbbe
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 27 deletions.
diff --git a/.env b/.env
@@ -3,8 +3,8 @@ ES_INDEX_ORCID=bso-orcid
 ES_INDEX_PUBLICATIONS=bso-publications
 ES_INDEX_STUDIES=bso-clinical-trials
 REACT_APP_ENV=production
-REACT_APP_ES_API_URL_DATACITE=https://cluster-staging.elasticsearch.dataesr.ovh/$ES_INDEX_DATACITE/_search
-REACT_APP_ES_API_URL_ORCID=https://cluster-staging.elasticsearch.dataesr.ovh/$ES_INDEX_ORCID/_search
+REACT_APP_ES_API_URL_DATACITE=https://cluster-production.elasticsearch.dataesr.ovh/$ES_INDEX_DATACITE/_search
+REACT_APP_ES_API_URL_ORCID=https://cluster-production.elasticsearch.dataesr.ovh/$ES_INDEX_ORCID/_search
 REACT_APP_ES_API_URL_PUBLICATIONS=https://cluster-production.elasticsearch.dataesr.ovh/$ES_INDEX_PUBLICATIONS/_search
 REACT_APP_ES_API_URL_STUDIES=https://cluster-staging.elasticsearch.dataesr.ovh/$ES_INDEX_STUDIES/_search
 REACT_APP_LAST_OBSERVATION=2022Q4

diff --git a/.env.development b/.env.development
@@ -3,6 +3,6 @@ ES_INDEX_ORCID=bso-orcid-staging
 ES_INDEX_PUBLICATIONS=bso-publications-staging
 ES_INDEX_STUDIES=bso-clinical-trials-staging
 REACT_APP_ENV=development
-REACT_APP_LAST_OBSERVATION=2023Q1
-REACT_APP_LAST_OBSERVATION_THESIS=2022Q4
+REACT_APP_LAST_OBSERVATION=2023Q4
+REACT_APP_LAST_OBSERVATION_THESIS=2023Q4
 REACT_APP_PIWIK_SITE=44
diff --git a/src/translations/en.json b/src/translations/en.json
@@ -1346,21 +1346,21 @@
   "app.national-orcid.general.present.chart-evolution.comments": "This graph shows the evolution of the number of French ORCIDs. An ORCID is considered French on the observation date (last available dump) if at least one of these conditions is met: a French employer on the date, a training course in progress in France on the date, the country indicated on the ORCID account is France, or a (public) email in .fr. Please note that very few emails are actually public in the ORCID dump.",
   "app.national-orcid.general.present.chart-evolution.tooltip": "<b>{series.name}</b><br><b>{point.y}</b> ORCID accounts created (cumulated) until {point.creation_date:%Y}",
   "app.software.navigation.disciplines.creation": "Code or software creation",
-  "app.repositories.label.hal": "HAL (France)",
-  "app.repositories.label.pubmedcentral": "Pubmed Central (USA)",
+  "app.repositories.label.archimer": "Archimer (France)",
   "app.repositories.label.arxiv": "ArXiv (USA)",
   "app.repositories.label.biorxiv": "bioRxiv (USA)",
-  "app.repositories.label.researchsquare": "Research Square (Springer)",
-  "app.repositories.label.archimer": "Archimer (France)",
-  "app.repositories.label.ucldiscovery": "UCL Discovery (USA)",
-  "app.repositories.label.pure(denmark)": "Pure (Denmark)",
-  "app.repositories.label.zenodo": "Zenodo (Europe)",
   "app.repositories.label.digital.csic(spain)": "DIGITALCSIC (Spain)",
-  "app.repositories.label.univoak": "univOAK (France)",
-  "app.repositories.label.lirias(kuleuven)": "LIRIAS (Belgium)",
+  "app.repositories.label.diva.org": "DiVA (Sweden)",
+  "app.repositories.label.hal": "HAL (France)",
   "app.repositories.label.lilloa(lilleopenarchive)": "LillOA (France)",
+  "app.repositories.label.lirias(kuleuven)": "LIRIAS (Belgium)",
+  "app.repositories.label.oskar-bordeaux.fr": "Oskar Bordeaux (France)",
+  "app.repositories.label.pubmedcentral": "Pubmed Central (USA)",
+  "app.repositories.label.pure(denmark)": "Pure (Denmark)",
   "app.repositories.label.pure.rug.nl": "Pure (The Netherlands)",
+  "app.repositories.label.researchsquare": "Research Square (Springer)",
+  "app.repositories.label.ucldiscovery": "UCL Discovery (USA)",
+  "app.repositories.label.univoak": "univOAK (France)",
   "app.repositories.label.usofficeofscientificandtechnicalinformation": "US OSTP (USA)",
-  "app.repositories.label.diva.org": "DiVA (Sweden)",
-  "app.repositories.label.oskar-bordeaux.fr": "Oskar Bordeaux (France)"
+  "app.repositories.label.zenodo": "Zenodo (Europe)"
 }
diff --git a/src/translations/fr.json b/src/translations/fr.json
@@ -1401,21 +1401,21 @@
   "url.sante.etudes": "/sante/etudes-observationnelles/general",
   "url.sante.publications.general": "/sante/publications/general",
   "app.pages.does-not-exist": "Cette page n'existe pas.",
-  "app.repositories.label.hal": "HAL (France)",
-  "app.repositories.label.pubmedcentral": "Pubmed Central (USA)",
+  "app.repositories.label.archimer": "Archimer (France)",
   "app.repositories.label.arxiv": "ArXiv (USA)",
   "app.repositories.label.biorxiv": "bioRxiv (USA)",
-  "app.repositories.label.researchsquare": "Research Square (Springer)",
-  "app.repositories.label.archimer": "Archimer (France)",
-  "app.repositories.label.ucldiscovery": "UCL Discovery (USA)",
-  "app.repositories.label.pure(denmark)": "Pure (Danemark)",
-  "app.repositories.label.zenodo": "Zenodo (Europe)",
   "app.repositories.label.digital.csic(spain)": "DIGITALCSIC (Espagne)",
-  "app.repositories.label.univoak": "univOAK (France)",
-  "app.repositories.label.lirias(kuleuven)": "LIRIAS (Belgique)",
+  "app.repositories.label.diva.org": "DiVA (Suède)",
+  "app.repositories.label.hal": "HAL (France)",
   "app.repositories.label.lilloa(lilleopenarchive)": "LillOA (France)",
+  "app.repositories.label.lirias(kuleuven)": "LIRIAS (Belgique)",
+  "app.repositories.label.oskar-bordeaux.fr": "Oskar Bordeaux (France)",
+  "app.repositories.label.pubmedcentral": "Pubmed Central (USA)",
+  "app.repositories.label.pure(denmark)": "Pure (Danemark)",
   "app.repositories.label.pure.rug.nl": "Pure (Pays-Bas)",
+  "app.repositories.label.researchsquare": "Research Square (Springer)",
+  "app.repositories.label.ucldiscovery": "UCL Discovery (USA)",
+  "app.repositories.label.univoak": "univOAK (France)",
   "app.repositories.label.usofficeofscientificandtechnicalinformation": "US OSTP (USA)",
-  "app.repositories.label.diva.org": "DiVA (Suède)",
-  "app.repositories.label.oskar-bordeaux.fr": "Oskar Bordeaux (France)"
+  "app.repositories.label.zenodo": "Zenodo (Europe)"
 }
diff --git a/src/utils/chartFetchOptions.js b/src/utils/chartFetchOptions.js
@@ -802,7 +802,11 @@ export default function getFetchOptions({
         by_repository: {
           terms: {
             field: `oa_details.${observationSnap}.repositories.keyword`,
-            exclude: ['pdfs.semanticscholar.org', 'edpsciences.org'],
+            exclude: [
+              'pdfs.semanticscholar.org',
+              'edpsciences.org',
+              'theses.fr',
+            ],
             size: 25,
           },
         },