From bc105d3ffa5d477128268903faf7e7ac2dcc1cc4 Mon Sep 17 00:00:00 2001
From: jdestin <jeremy.destin@inra.fr>
Date: Tue, 27 Aug 2019 11:40:10 +0200
Subject: [PATCH 1/5] fix: Encode all the schema:identifier use for the id of
the germplasm card.
---
.../result-page/document/document.component.ts | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/frontend/src/app/result-page/document/document.component.ts b/frontend/src/app/result-page/document/document.component.ts
index e92877de..0cd1638e 100644
--- a/frontend/src/app/result-page/document/document.component.ts
+++ b/frontend/src/app/result-page/document/document.component.ts
@@ -1,5 +1,9 @@
import { Component, Input, OnInit } from '@angular/core';
-import { DataDiscoveryDocument, DataDiscoverySource, DataDiscoveryType } from '../../models/data-discovery.model';
+import {
+ DataDiscoveryDocument,
+ DataDiscoverySource,
+ DataDiscoveryType
+} from '../../models/data-discovery.model';
@Component({
selector: 'faidare-document',
@@ -47,13 +51,8 @@ export class DocumentComponent implements OnInit {
getQueryParam() {
if (this.document['schema:identifier']) {
const id: string = this.document['schema:identifier'];
- // TODO: remove condition when GnpIS schema:identifier will store an encoded
- // value (manage the same way as partners data
- if (id.includes('doi.org') || id.includes('gnpis_pui')) {
- return { id: btoa(id) };
- } else {
- return { id: id };
- }
+ // TODO: remove condition when schema:identifier will store an encoded
+ return { id: btoa(id) };
} else {
return {
pui: this.document['@id']
--
GitLab
From 0dc35df719fd6975bb55ca720834a92423cb17e0 Mon Sep 17 00:00:00 2001
From: jdestin <jeremy.destin@inra.fr>
Date: Tue, 27 Aug 2019 15:15:22 +0200
Subject: [PATCH 2/5] fix: Rename the api into Faidare api.
---
.../{gnpis => faidare}/v1/DataDiscoveryController.java | 6 +++---
.../api/{gnpis => faidare}/v1/GnpISExceptionHandler.java | 4 ++--
.../{gnpis => faidare}/v1/GnpISGermplasmController.java | 6 +++---
.../api/{gnpis => faidare}/v1/GnpISJSONViewHandler.java | 4 ++--
.../{gnpis => faidare}/v1/XRefDocumentController.java | 6 +++---
.../fr/inra/urgi/faidare/filter/AngularRouteFilter.java | 2 +-
.../repository/es/DataDiscoveryRepositoryImpl.java | 2 +-
.../urgi/faidare/service/es/GermplasmServiceImpl.java | 2 +-
.../v1/GnpISGermplasmControllerTest.java | 8 ++++----
.../inra/urgi/faidare/filter/AngularRouteFilterTest.java | 2 +-
frontend/proxy.conf.js | 2 +-
frontend/src/app/gnpis.service.ts | 9 +++++++--
.../app/result-page/document/document.component.spec.ts | 3 ++-
13 files changed, 31 insertions(+), 25 deletions(-)
rename backend/src/main/java/fr/inra/urgi/faidare/api/{gnpis => faidare}/v1/DataDiscoveryController.java (94%)
rename backend/src/main/java/fr/inra/urgi/faidare/api/{gnpis => faidare}/v1/GnpISExceptionHandler.java (95%)
rename backend/src/main/java/fr/inra/urgi/faidare/api/{gnpis => faidare}/v1/GnpISGermplasmController.java (95%)
rename backend/src/main/java/fr/inra/urgi/faidare/api/{gnpis => faidare}/v1/GnpISJSONViewHandler.java (89%)
rename backend/src/main/java/fr/inra/urgi/faidare/api/{gnpis => faidare}/v1/XRefDocumentController.java (88%)
rename backend/src/test/java/fr/inra/urgi/faidare/api/{gnpis => faidare}/v1/GnpISGermplasmControllerTest.java (96%)
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/DataDiscoveryController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/DataDiscoveryController.java
similarity index 94%
rename from backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/DataDiscoveryController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/DataDiscoveryController.java
index 36e0782a..59aa42f8 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/DataDiscoveryController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/DataDiscoveryController.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.faidare.api.gnpis.v1;
+package fr.inra.urgi.faidare.api.faidare.v1;
import fr.inra.urgi.faidare.config.FaidareProperties;
import fr.inra.urgi.faidare.domain.brapi.v1.response.BrapiListResponse;
@@ -21,9 +21,9 @@ import java.util.List;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-@Api(tags = {"GnpIS API"}, description = "Extended GnpIS API")
+@Api(tags = {"Faidare API"}, description = "Extended Faidare API")
@RestController
-@RequestMapping(value = "/gnpis/v1/datadiscovery")
+@RequestMapping(value = "/faidare/v1/datadiscovery")
public class DataDiscoveryController {
private final DataDiscoveryRepository dataDiscoveryRepository;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISExceptionHandler.java b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISExceptionHandler.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISExceptionHandler.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISExceptionHandler.java
index 96ee0096..c53270fd 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISExceptionHandler.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISExceptionHandler.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.faidare.api.gnpis.v1;
+package fr.inra.urgi.faidare.api.faidare.v1;
import fr.inra.urgi.faidare.api.BadRequestException;
import fr.inra.urgi.faidare.api.NotFoundException;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
*
* @author gcornut
*/
-@ControllerAdvice(basePackages = "fr.inra.urgi.faidare.api.gnpis.v1")
+@ControllerAdvice(basePackages = "fr.inra.urgi.faidare.api.faidare.v1")
public class GnpISExceptionHandler {
/**
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISGermplasmController.java
similarity index 95%
rename from backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISGermplasmController.java
index 5b32adbb..8676ec01 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISGermplasmController.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.faidare.api.gnpis.v1;
+package fr.inra.urgi.faidare.api.faidare.v1;
import com.google.common.base.Strings;
import fr.inra.urgi.faidare.api.BadRequestException;
@@ -23,9 +23,9 @@ import java.util.Collections;
import static org.springframework.web.bind.annotation.RequestMethod.GET;
-@Api(tags = {"GnpIS API"}, description = "Extended GnpIS API")
+@Api(tags = {"Faidare API"}, description = "Extended Faidare API")
@RestController
-@RequestMapping(value = "/gnpis/v1/germplasm")
+@RequestMapping(value = "/faidare/v1/germplasm")
public class GnpISGermplasmController {
private final GermplasmService germplasmService;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISJSONViewHandler.java b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISJSONViewHandler.java
similarity index 89%
rename from backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISJSONViewHandler.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISJSONViewHandler.java
index b7836a4b..fee692e0 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISJSONViewHandler.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISJSONViewHandler.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.faidare.api.gnpis.v1;
+package fr.inra.urgi.faidare.api.faidare.v1;
import fr.inra.urgi.faidare.domain.JSONView;
import org.springframework.core.MethodParameter;
@@ -12,7 +12,7 @@ import org.springframework.web.servlet.mvc.method.annotation.AbstractMappingJack
/**
* @author gcornut
*/
-@ControllerAdvice(basePackages = "fr.inra.urgi.faidare.api.gnpis.v1")
+@ControllerAdvice(basePackages = "fr.inra.urgi.faidare.api.faidare.v1")
public class GnpISJSONViewHandler extends AbstractMappingJacksonResponseBodyAdvice {
@Override
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/XRefDocumentController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/XRefDocumentController.java
similarity index 88%
rename from backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/XRefDocumentController.java
rename to backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/XRefDocumentController.java
index 95bdc960..ef1a05f8 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/api/gnpis/v1/XRefDocumentController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/XRefDocumentController.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.faidare.api.gnpis.v1;
+package fr.inra.urgi.faidare.api.faidare.v1;
import fr.inra.urgi.faidare.domain.response.PaginatedList;
import fr.inra.urgi.faidare.domain.xref.XRefDocumentSearchCriteria;
@@ -17,7 +17,7 @@ import java.util.List;
/**
* Imported and adapted from unified-interface legacy
*/
-@Api(tags = {"GnpIS API"}, description = "Extended GnpIS API")
+@Api(tags = {"Faidare API"}, description = "Extended Faidare API")
@RestController
public class XRefDocumentController {
@@ -29,7 +29,7 @@ public class XRefDocumentController {
}
@ApiOperation("Find xref documents")
- @GetMapping(value = "/gnpis/v1/xref/documentbyfulltextid")
+ @GetMapping(value = "/faidare/v1/xref/documentbyfulltextid")
public PaginatedList<XRefDocumentVO> documentByFullTextId(
@RequestParam(required = false, value = "entry_type") String entryType,
@RequestParam(required = false) List<String> linkedRessourcesID
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/filter/AngularRouteFilter.java b/backend/src/main/java/fr/inra/urgi/faidare/filter/AngularRouteFilter.java
index b3c2fa7f..81978e5f 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/filter/AngularRouteFilter.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/filter/AngularRouteFilter.java
@@ -34,7 +34,7 @@ import java.util.Arrays;
public class AngularRouteFilter implements Filter {
private static final String[] API_PREFIXES = {
- "/brapi/v1", "/gnpis/v1", "/actuator", "/v2/api-docs", "/swagger-resources"
+ "/brapi/v1", "/faidare/v1", "/actuator", "/v2/api-docs", "/swagger-resources"
};
private static final String[] STATIC_SUFFIXES = {
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepositoryImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepositoryImpl.java
index 08d6a6d7..73662c5d 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepositoryImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/repository/es/DataDiscoveryRepositoryImpl.java
@@ -1,6 +1,6 @@
package fr.inra.urgi.faidare.repository.es;
-import fr.inra.urgi.faidare.api.gnpis.v1.DataDiscoveryController;
+import fr.inra.urgi.faidare.api.faidare.v1.DataDiscoveryController;
import fr.inra.urgi.faidare.domain.datadiscovery.criteria.DataDiscoveryCriteria;
import fr.inra.urgi.faidare.domain.datadiscovery.criteria.DataDiscoveryCriteriaImpl;
import fr.inra.urgi.faidare.domain.datadiscovery.data.DataDiscoveryDocument;
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/service/es/GermplasmServiceImpl.java b/backend/src/main/java/fr/inra/urgi/faidare/service/es/GermplasmServiceImpl.java
index 2c851d63..f6217f52 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/service/es/GermplasmServiceImpl.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/service/es/GermplasmServiceImpl.java
@@ -1,7 +1,7 @@
package fr.inra.urgi.faidare.service.es;
import com.opencsv.CSVWriter;
-import fr.inra.urgi.faidare.api.gnpis.v1.GnpISGermplasmController;
+import fr.inra.urgi.faidare.api.faidare.v1.GnpISGermplasmController;
import fr.inra.urgi.faidare.domain.criteria.GermplasmSearchCriteria;
import fr.inra.urgi.faidare.domain.data.germplasm.GermplasmVO;
import fr.inra.urgi.faidare.domain.data.germplasm.PedigreeVO;
diff --git a/backend/src/test/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmControllerTest.java b/backend/src/test/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISGermplasmControllerTest.java
similarity index 96%
rename from backend/src/test/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmControllerTest.java
rename to backend/src/test/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISGermplasmControllerTest.java
index 521f6af3..a9150b26 100644
--- a/backend/src/test/java/fr/inra/urgi/faidare/api/gnpis/v1/GnpISGermplasmControllerTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISGermplasmControllerTest.java
@@ -1,4 +1,4 @@
-package fr.inra.urgi.faidare.api.gnpis.v1;
+package fr.inra.urgi.faidare.api.faidare.v1;
import fr.inra.urgi.faidare.domain.criteria.GermplasmGETSearchCriteria;
import fr.inra.urgi.faidare.domain.criteria.GermplasmSearchCriteria;
@@ -71,7 +71,7 @@ class GnpISGermplasmControllerTest {
when(service.find(criteriaCaptor.capture())).thenReturn(germplasmPage);
String pui = "doi:10.15454/1.4921786234137117E12";
- mockMvc.perform(get("/gnpis/v1/germplasm?pui=" + pui)
+ mockMvc.perform(get("/faidare/v1/germplasm?pui=" + pui)
.contentType(MediaType.APPLICATION_JSON_UTF8))
.andExpect(status().isOk());
@@ -85,7 +85,7 @@ class GnpISGermplasmControllerTest {
@Test
void should_Return_Bad_Request_With_No_Param() throws Exception {
- mockMvc.perform(get("/gnpis/v1/germplasm")
+ mockMvc.perform(get("/faidare/v1/germplasm")
.contentType(MediaType.APPLICATION_JSON_UTF8))
.andExpect(status().isBadRequest());
}
@@ -114,7 +114,7 @@ class GnpISGermplasmControllerTest {
when(service.find(any(GermplasmSearchCriteria.class))).thenReturn(germplasmPage);
- mockMvc.perform(get("/gnpis/v1/germplasm?pui=foo")
+ mockMvc.perform(get("/faidare/v1/germplasm?pui=foo")
.contentType(MediaType.APPLICATION_JSON_UTF8))
// Should not have private fields
diff --git a/backend/src/test/java/fr/inra/urgi/faidare/filter/AngularRouteFilterTest.java b/backend/src/test/java/fr/inra/urgi/faidare/filter/AngularRouteFilterTest.java
index 40426992..b71e9e39 100644
--- a/backend/src/test/java/fr/inra/urgi/faidare/filter/AngularRouteFilterTest.java
+++ b/backend/src/test/java/fr/inra/urgi/faidare/filter/AngularRouteFilterTest.java
@@ -69,7 +69,7 @@ class AngularRouteFilterTest {
"/font.ttf",
// APIs
"/brapi/v1/studies",
- "/gnpis/v1/datadiscovery/suggest",
+ "/faidare/v1/datadiscovery/suggest",
"/actuator/info",
})
void shouldNotForward(String url) throws Exception {
diff --git a/frontend/proxy.conf.js b/frontend/proxy.conf.js
index 68d1cb39..771e4ce7 100644
--- a/frontend/proxy.conf.js
+++ b/frontend/proxy.conf.js
@@ -2,7 +2,7 @@ const PROXY_CONFIG = [
{
context: [
"/faidare-dev/brapi",
- "/faidare-dev/gnpis",
+ "/faidare-dev/faidare",
],
target: "http://localhost:8380",
secure: false
diff --git a/frontend/src/app/gnpis.service.ts b/frontend/src/app/gnpis.service.ts
index 0e91070d..5146ebdb 100644
--- a/frontend/src/app/gnpis.service.ts
+++ b/frontend/src/app/gnpis.service.ts
@@ -1,7 +1,12 @@
import { Injectable } from '@angular/core';
import { Observable, ReplaySubject, zip } from 'rxjs';
import { HttpClient } from '@angular/common/http';
-import { DataDiscoveryCriteria, DataDiscoveryFacet, DataDiscoveryResults, DataDiscoverySource } from './models/data-discovery.model';
+import {
+ DataDiscoveryCriteria,
+ DataDiscoveryFacet,
+ DataDiscoveryResults,
+ DataDiscoverySource
+} from './models/data-discovery.model';
import { BrapiResults } from './models/brapi.model';
import { map } from 'rxjs/operators';
import { Germplasm } from './models/gnpis.model';
@@ -9,7 +14,7 @@ import { XrefResponse } from './models/xref.model';
import { removeNullUndefined } from './utils';
-export const BASE_URL = 'gnpis/v1';
+export const BASE_URL = 'faidare/v1';
@Injectable({
providedIn: 'root'
diff --git a/frontend/src/app/result-page/document/document.component.spec.ts b/frontend/src/app/result-page/document/document.component.spec.ts
index e905943a..16e2bb3b 100644
--- a/frontend/src/app/result-page/document/document.component.spec.ts
+++ b/frontend/src/app/result-page/document/document.component.spec.ts
@@ -95,7 +95,8 @@ describe('DocumentComponent', () => {
expect(tester.title).toContainText('doc_name');
expect(tester.title.nativeElement['routerLink']).toEqual('/germplasm');
- expect(component.getQueryParam().id).toEqual('g1');
+ const encodedId = btoa('g1');
+ expect(component.getQueryParam().id).toEqual(encodedId);
});
--
GitLab
From 94957e8a736ee0731fe8cc4a25e9f56a0d411c5d Mon Sep 17 00:00:00 2001
From: jdestin <jeremy.destin@inra.fr>
Date: Wed, 28 Aug 2019 17:08:28 +0200
Subject: [PATCH 3/5] fix: Use the pui to access to the germplasm card of the
progeny.
---
frontend/src/app/germplasm-card/germplasm-card.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/app/germplasm-card/germplasm-card.component.html b/frontend/src/app/germplasm-card/germplasm-card.component.html
index 7d8b923b..fc045073 100644
--- a/frontend/src/app/germplasm-card/germplasm-card.component.html
+++ b/frontend/src/app/germplasm-card/germplasm-card.component.html
@@ -658,7 +658,7 @@
<ng-template>
<ng-container *ngFor="let sibling of child.sibblings">
- <a [routerLink]="['/germplasm']" [queryParams]="{id:sibling.pui}">
+ <a [routerLink]="['/germplasm']" [queryParams]="{pui:sibling.pui}">
{{ sibling.name }}
</a>
</ng-container>
--
GitLab
From 303c92c35f9fc4a5b1307e5fb10f6f5af27d600e Mon Sep 17 00:00:00 2001
From: jdestin <jeremy.destin@inra.fr>
Date: Tue, 3 Sep 2019 19:09:08 +0200
Subject: [PATCH 4/5] fix: Remove the schema:identifier encoding by the
application (encode with the ETL). Change the sources uri in the
application.yml file to correspond to the new uri of the sources.
---
backend/src/main/resources/application.yml | 60 +++++++++----------
.../document/document.component.spec.ts | 3 +-
.../document/document.component.ts | 3 +-
3 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index fc4853e5..a6ad41ed 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -36,36 +36,36 @@ faidare:
# TODO: Update URIs to match URL (update in generated JSON document too)
# Warning! URIs should match with FAIDARE datadiscovery 'schema:includedInDataCatalog' field value
data-sources:
- # URGI GnpIS
- - uri: https://urgi.versailles.inra.fr/gnpis
- url: https://urgi.versailles.inra.fr/gnpis
- name: URGI GnpIS
- image: https://urgi.versailles.inra.fr/files/faidare/logo/GnpIS.png
- # WUR EU-SOL BreeDB
- - uri: WUR
- url: https://www.eu-sol.wur.nl/
- name: WUR EU-SOL BreeDB
- image: https://urgi.versailles.inra.fr/files/faidare/logo/EU-SOL.png
- # VIB PIPPA
- - uri: VIB
- url: http://pippa.psb.ugent.be
- name: VIB PIPPA
- image: https://urgi.versailles.inra.fr/files/faidare/logo/VIB.png
- # IBET BioData
- - uri: IBET
- url: https://biodata.pt
- name: IBET BioData
- image: https://urgi.versailles.inra.fr/files/faidare/logo/biodata.png
- # NIB PISA
- - uri: NIB
- url: http://www.pisa.nib.si
- name: NIB PISA
- image: https://urgi.versailles.inra.fr/files/faidare/logo/NIB.png
- # CIRAD TropGENE
- - uri: CIRAD
- url: http://tropgenedb.cirad.fr
- name: CIRAD TropGENE
- image: https://urgi.versailles.inra.fr/files/faidare/logo/CIRAD.jpg
+ # URGI GnpIS
+ - uri: https://urgi.versailles.inra.fr/gnpis
+ url: https://urgi.versailles.inra.fr/gnpis
+ name: URGI GnpIS
+ image: https://urgi.versailles.inra.fr/files/faidare/logo/GnpIS.png
+ # WUR EU-SOL BreeDB
+ - uri: https://www.eu-sol.wur.nl/
+ url: https://www.eu-sol.wur.nl/
+ name: WUR EU-SOL BreeDB
+ image: https://urgi.versailles.inra.fr/files/faidare/logo/EU-SOL.png
+ # VIB PIPPA
+ - uri: http://pippa.psb.ugent.be
+ url: http://pippa.psb.ugent.be
+ name: VIB PIPPA
+ image: https://urgi.versailles.inra.fr/files/faidare/logo/VIB.png
+ # IBET BioData
+ - uri: https://biodata.pt
+ url: https://biodata.pt
+ name: IBET BioData
+ image: https://urgi.versailles.inra.fr/files/faidare/logo/biodata.png
+ # NIB PISA
+ - uri: http://nib.si
+ url: http://www.pisa.nib.si
+ name: NIB PISA
+ image: https://urgi.versailles.inra.fr/files/faidare/logo/NIB.png
+ # CIRAD TropGENE
+ - uri: http://tropgenedb.cirad.fr
+ url: http://tropgenedb.cirad.fr
+ name: CIRAD TropGENE
+ image: https://urgi.versailles.inra.fr/files/faidare/logo/CIRAD.jpg
server:
compression:
diff --git a/frontend/src/app/result-page/document/document.component.spec.ts b/frontend/src/app/result-page/document/document.component.spec.ts
index 16e2bb3b..e905943a 100644
--- a/frontend/src/app/result-page/document/document.component.spec.ts
+++ b/frontend/src/app/result-page/document/document.component.spec.ts
@@ -95,8 +95,7 @@ describe('DocumentComponent', () => {
expect(tester.title).toContainText('doc_name');
expect(tester.title.nativeElement['routerLink']).toEqual('/germplasm');
- const encodedId = btoa('g1');
- expect(component.getQueryParam().id).toEqual(encodedId);
+ expect(component.getQueryParam().id).toEqual('g1');
});
diff --git a/frontend/src/app/result-page/document/document.component.ts b/frontend/src/app/result-page/document/document.component.ts
index 0cd1638e..fd3a6ee5 100644
--- a/frontend/src/app/result-page/document/document.component.ts
+++ b/frontend/src/app/result-page/document/document.component.ts
@@ -51,8 +51,7 @@ export class DocumentComponent implements OnInit {
getQueryParam() {
if (this.document['schema:identifier']) {
const id: string = this.document['schema:identifier'];
- // TODO: remove condition when schema:identifier will store an encoded
- return { id: btoa(id) };
+ return { id: id };
} else {
return {
pui: this.document['@id']
--
GitLab
From 8665b5f0d6dc8504a52d542bcce0b61586158a5d Mon Sep 17 00:00:00 2001
From: jdestin <jeremy.destin@inra.fr>
Date: Fri, 13 Sep 2019 10:00:28 +0200
Subject: [PATCH 5/5] fix: Use upper case for the acronym FAIDARE.
---
.../urgi/faidare/api/faidare/v1/DataDiscoveryController.java | 2 +-
.../urgi/faidare/api/faidare/v1/GnpISGermplasmController.java | 2 +-
.../urgi/faidare/api/faidare/v1/XRefDocumentController.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/DataDiscoveryController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/DataDiscoveryController.java
index 59aa42f8..b4bef53d 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/DataDiscoveryController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/DataDiscoveryController.java
@@ -21,7 +21,7 @@ import java.util.List;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-@Api(tags = {"Faidare API"}, description = "Extended Faidare API")
+@Api(tags = {"FAIDARE API"}, description = "Extended FAIDARE API")
@RestController
@RequestMapping(value = "/faidare/v1/datadiscovery")
public class DataDiscoveryController {
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISGermplasmController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISGermplasmController.java
index 8676ec01..7e6a21ff 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISGermplasmController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/GnpISGermplasmController.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import static org.springframework.web.bind.annotation.RequestMethod.GET;
-@Api(tags = {"Faidare API"}, description = "Extended Faidare API")
+@Api(tags = {"FAIDARE API"}, description = "Extended FAIDARE API")
@RestController
@RequestMapping(value = "/faidare/v1/germplasm")
public class GnpISGermplasmController {
diff --git a/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/XRefDocumentController.java b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/XRefDocumentController.java
index ef1a05f8..14b8f046 100644
--- a/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/XRefDocumentController.java
+++ b/backend/src/main/java/fr/inra/urgi/faidare/api/faidare/v1/XRefDocumentController.java
@@ -17,7 +17,7 @@ import java.util.List;
/**
* Imported and adapted from unified-interface legacy
*/
-@Api(tags = {"Faidare API"}, description = "Extended Faidare API")
+@Api(tags = {"FAIDARE API"}, description = "Extended FAIDARE API")
@RestController
public class XRefDocumentController {
--
GitLab