diff --git a/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESRequestFactory.java b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESRequestFactory.java index 302aa42cbfddfe42b543949f546edab17797f0c7..21102c83919f51e9633045de96d5ba94a4aa2b34 100644 --- a/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESRequestFactory.java +++ b/backend/src/main/java/fr/inra/urgi/faidare/elasticsearch/ESRequestFactory.java @@ -113,9 +113,7 @@ public class ESRequestFactory { List<Integer> groupIds = userGroupsResourceClient.getUserGroups(); List<String> aliases = new ArrayList<>(); for (Integer groupId : groupIds) { - for (String sourceId : sourceIds) { - aliases.add(properties.getAliasName(documentType, groupId)); - } + aliases.add(properties.getAliasName(documentType, groupId)); } return aliases; } diff --git a/frontend/src/app/result-page/result-page.component.html b/frontend/src/app/result-page/result-page.component.html index b5a0c9d0bffdd28f213759652cef1311fd18cc37..234ba4a45b64bdc3f04f441581975e60165b4d8e 100644 --- a/frontend/src/app/result-page/result-page.component.html +++ b/frontend/src/app/result-page/result-page.component.html @@ -1,4 +1,4 @@ -<h3 align="center" class="mb-4">FAIDARE: FAIR Data-finder for Agronomic REsearch</h3> +<h3 align="center" class="mb-4">{{ appTitle }}</h3> <div class="row justify-content-end"> <!-- Column for form --> diff --git a/frontend/src/app/result-page/result-page.component.ts b/frontend/src/app/result-page/result-page.component.ts index 9a200f719d7d33ce3e80d3a0059623f02159a4f5..9f9d7dbd66ecdff5ee8ba7c2d5a598898a35220a 100644 --- a/frontend/src/app/result-page/result-page.component.ts +++ b/frontend/src/app/result-page/result-page.component.ts @@ -12,6 +12,7 @@ import { BehaviorSubject } from 'rxjs'; import { GnpisService } from '../gnpis.service'; import { filter } from 'rxjs/operators'; import { FormComponent } from '../form/form.component'; +import { environment } from '../../environments/environment'; @Component({ @@ -22,6 +23,7 @@ import { FormComponent } from '../form/form.component'; export class ResultPageComponent implements OnInit { @ViewChild('form') form: FormComponent; + appTitle: string = environment.appTitle; criteria$ = new BehaviorSubject<DataDiscoveryCriteria>(DataDiscoveryCriteriaUtils.emptyCriteria()); documents: DataDiscoveryDocument[] = []; diff --git a/frontend/src/app/study-card/study-card.component.ts b/frontend/src/app/study-card/study-card.component.ts index 05ef7272dea10b4ce9af33050f0f9ee5db3f9819..1fa0d7f5a42c6d1211c95a9ac547bbc8f3dd5e9a 100644 --- a/frontend/src/app/study-card/study-card.component.ts +++ b/frontend/src/app/study-card/study-card.component.ts @@ -71,10 +71,12 @@ export class StudyCardComponent implements OnInit { }); study$.finally(() => { - this.brapiService.location(this.study.locationDbId).subscribe( - location => { - this.location = location.result; - }); + if (this.study.locationDbId) { + this.brapiService.location(this.study.locationDbId).subscribe( + location => { + this.location = location.result; + }); + } }); this.studyObservationVariables = []; diff --git a/frontend/src/assets/faidare/applicationLogo.png b/frontend/src/assets/faidare/applicationLogo.png index 16d4a77bc231332c1918cb684bcb199a8c0da555..0a8aa7ebcd17afde597ea938d3d106680a2f0f98 100644 Binary files a/frontend/src/assets/faidare/applicationLogo.png and b/frontend/src/assets/faidare/applicationLogo.png differ diff --git a/frontend/src/assets/faidare/favicon.ico b/frontend/src/assets/faidare/favicon.ico index 09e4ae7c90d722540b6c95906e1290af509c922f..7fc066f132eb58eeaf30b6259da59f5ed92aca8e 100644 Binary files a/frontend/src/assets/faidare/favicon.ico and b/frontend/src/assets/faidare/favicon.ico differ diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts index ef19fa7e5e348830ca746e7a93885023d4d3aad0..8b30554b7bfcb14d8c820f9f12edd73271ac2310 100644 --- a/frontend/src/environments/environment.prod.ts +++ b/frontend/src/environments/environment.prod.ts @@ -1,6 +1,7 @@ export const environment = { production: false, + appTitle: 'FAIR Data-finder for Agronomic REsearch', navbar: { name: 'FAIDARE', title: 'FAIR Data-finder for Agronomic REsearch', diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index ab1a4c20fa5060fb7067af7df1f043c3eee505a4..91c34aa9bdd61710e101113961b084ae7f78f5ca 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -4,6 +4,7 @@ export const environment = { production: false, + appTitle: 'FAIR Data-finder for Agronomic REsearch', navbar: { name: 'FAIDARE', title: 'FAIR Data-finder for Agronomic REsearch', diff --git a/frontend/src/index.html b/frontend/src/index.html index 1fc845f584a1a28f6d5554c6dd1160a30fc47e8d..de174438eef6b693ddff3f9eeb7d06c846f1dedb 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -6,7 +6,7 @@ <base href="./"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <link rel="icon" type="image/x-icon" href="favicon.ico"> + <link rel="icon" type="image/x-icon" href="assets/favicon.ico"> </head> <body> <faidare-root></faidare-root>