Merge branch 'staging'

dataesr · Jul 15, 2024 · 5423794 · 5423794
2 parents 59e3761 + b8c74c3
commit 5423794
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/.env b/.env
@@ -3,6 +3,7 @@ ES_INDEX_ORCID=bso-orcid
 ES_INDEX_PUBLICATIONS=bso-publications
 ES_INDEX_STUDIES=bso-clinical-trials
 REACT_APP_ENV=production
+REACT_APP_ES_API_SOURCES_STUDIES=["clinical_trials", "euctr"]
 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

diff --git a/.env.development b/.env.development
@@ -3,6 +3,7 @@ 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_ES_API_SOURCES_STUDIES=["clinical_trials", "ctis", "euctr"]
 REACT_APP_LAST_OBSERVATION=2023Q4
 REACT_APP_LAST_OBSERVATION_THESIS=2023Q4
 REACT_APP_PIWIK_SITE=44
diff --git a/.env.staging b/.env.staging
@@ -3,5 +3,6 @@ ES_INDEX_ORCID=bso-orcid-staging
 ES_INDEX_PUBLICATIONS=bso-publications-staging
 ES_INDEX_STUDIES=bso-clinical-trials-staging
 REACT_APP_ENV=staging
+REACT_APP_ES_API_SOURCES_STUDIES=["clinical_trials", "ctis", "euctr"]
 REACT_APP_PIWIK_SITE=2
 REACT_APP_PIWIK_URL=https://matomo.staging.dataesr.ovh/
diff --git a/src/config/config.js b/src/config/config.js
@@ -1,7 +1,10 @@
 export const ES_API_URL = process.env.REACT_APP_ES_API_URL_PUBLICATIONS;
-export const ES_STUDIES_API_URL = process.env.REACT_APP_ES_API_URL_STUDIES;
-export const ES_ORCID_API_URL = process.env.REACT_APP_ES_API_URL_ORCID;
 export const ES_DATACITE_API_URL = process.env.REACT_APP_ES_API_URL_DATACITE;
+export const ES_ORCID_API_URL = process.env.REACT_APP_ES_API_URL_ORCID;
+export const ES_STUDIES_API_SOURCES = JSON.parse(
+  process.env.REACT_APP_ES_API_SOURCES_STUDIES,
+);
+export const ES_STUDIES_API_URL = process.env.REACT_APP_ES_API_URL_STUDIES;
 
 export const HEADERS = {
   headers: {

diff --git a/src/utils/chartFetchOptions.js b/src/utils/chartFetchOptions.js
@@ -1,3 +1,4 @@
+import { ES_STUDIES_API_SOURCES } from '../config/config';
 import {
   getPublicationYearFromObservationSnap,
   getURLSearchParams,
@@ -2470,6 +2471,10 @@ export default function getFetchOptions({
     // On graphs about interventional trials and observational studies, no filter on country is needed because it is only about France
     // TODO to remove once the data is in the index
     useBsoCountry = false;
+    // Filter on chosen sources (ClinicalTrials, eudrCTR and / or CTIS)
+    queryResponse.query.bool.filter.push({
+      terms: { 'all_sources.keyword': ES_STUDIES_API_SOURCES },
+    });
   }
   if (bsoCountry && useBsoCountry) {
     queryResponse.query.bool.filter.push({