From bee99617f26b5e011b5f75cc204035a2dfac8e34 Mon Sep 17 00:00:00 2001
From: belhouda <bilal.el-houdaigui@inra.fr>
Date: Wed, 4 Sep 2019 17:45:40 +0200
Subject: [PATCH 1/5] added Genotyping Study badge and the url in the frontend
---
backend/src/main/resources/application.yml | 10 +++++-----
.../app/result-page/document/document.component.html | 4 ++--
.../src/app/result-page/document/document.component.ts | 6 ++++--
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index fc4853e5..2c62f19c 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -42,27 +42,27 @@ faidare:
name: URGI GnpIS
image: https://urgi.versailles.inra.fr/files/faidare/logo/GnpIS.png
# WUR EU-SOL BreeDB
- - uri: WUR
+ - 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: VIB
+ - 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: IBET
+ - 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: NIB
+ - 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: CIRAD
+ - uri: http://tropgenedb.cirad.fr
url: http://tropgenedb.cirad.fr
name: CIRAD TropGENE
image: https://urgi.versailles.inra.fr/files/faidare/logo/CIRAD.jpg
diff --git a/frontend/src/app/result-page/document/document.component.html b/frontend/src/app/result-page/document/document.component.html
index 1dd743fa..20277352 100644
--- a/frontend/src/app/result-page/document/document.component.html
+++ b/frontend/src/app/result-page/document/document.component.html
@@ -7,11 +7,11 @@
<a class="badge badge-source mr-2" [href]="dataSource['schema:url']" target="_blank">
{{ dataSource['schema:name'] }}
</a>
- <a class="title" *ngIf="getRouterLink() && document['@type'].includes('Phenotyping Study')"
+ <a class="title" *ngIf="getRouterLink() && (document['@type'].includes('Phenotyping Study') || document['@type'].includes('Genotyping Study'))"
[routerLink]="getRouterLink()">
{{ document["schema:name"] }}
</a>
- <a class="title" *ngIf="getRouterLink() && !document['@type'].includes('Phenotyping Study')"
+ <a class="title" *ngIf="getRouterLink() && !document['@type'].includes('Phenotyping Study') && !document['@type'].includes('Genotyping Study')"
[routerLink]="getRouterLink()" [queryParams]="getQueryParam()">
{{ document["schema:name"] }}
</a>
diff --git a/frontend/src/app/result-page/document/document.component.ts b/frontend/src/app/result-page/document/document.component.ts
index e92877de..fe0ba6fe 100644
--- a/frontend/src/app/result-page/document/document.component.ts
+++ b/frontend/src/app/result-page/document/document.component.ts
@@ -10,12 +10,14 @@ export class DocumentComponent implements OnInit {
private static MAX_LENGTH = 256;
private static BADGE_TYPE = {
'Germplasm': 'badge-germplasm',
- 'Phenotyping Study': 'badge-study'
+ 'Phenotyping Study': 'badge-study',
+ 'Genotyping Study': 'badge-study'
};
private static CARD_TYPE = {
'Germplasm': 'germplasm',
- 'Phenotyping Study': 'studies'
+ 'Phenotyping Study': 'studies',
+ 'Genotyping Study': 'studies'
};
@Input() document: DataDiscoveryDocument;
--
GitLab
From 9facfea085a9b7a64ac01c0448af86513e2aab69 Mon Sep 17 00:00:00 2001
From: belhouda <bilal.el-houdaigui@inra.fr>
Date: Mon, 9 Sep 2019 10:53:53 +0200
Subject: [PATCH 2/5] added EVA to application.yml
---
backend/src/main/resources/application.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 2c62f19c..4ca6204a 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -66,6 +66,11 @@ faidare:
url: http://tropgenedb.cirad.fr
name: CIRAD TropGENE
image: https://urgi.versailles.inra.fr/files/faidare/logo/CIRAD.jpg
+ # EVA
+ - uri: https://www.ebi.ac.uk/eva
+ url: https://www.ebi.ac.uk/eva
+ name: EVA
+ image: https://urgi.versailles.inra.fr/files/faidare/logo/EVA.jpg
server:
compression:
--
GitLab
From 22e440a5491f9d7f5c3c673d07ae00d6f989e17b Mon Sep 17 00:00:00 2001
From: belhouda <bilal.el-houdaigui@inra.fr>
Date: Tue, 10 Sep 2019 17:43:47 +0200
Subject: [PATCH 3/5] added Genotyping Study to data-discovery model
---
frontend/src/app/models/data-discovery.model.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/app/models/data-discovery.model.ts b/frontend/src/app/models/data-discovery.model.ts
index 9538c5e5..d8682915 100644
--- a/frontend/src/app/models/data-discovery.model.ts
+++ b/frontend/src/app/models/data-discovery.model.ts
@@ -88,7 +88,7 @@ export interface DataDiscoveryDocument extends schema.Dataset {
}
// TODO: use enum
-export type DataDiscoveryType = 'Germplasm' | 'Phenotyping Study';
+export type DataDiscoveryType = 'Germplasm' | 'Phenotyping Study' | 'Genotyping Study';
export interface DataDiscoveryResults extends BrapiResults<DataDiscoveryDocument> {
facets: DataDiscoveryFacet[];
--
GitLab
From 5ec555a4b0204b81ee4e2273d1ae33c1f6a1c949 Mon Sep 17 00:00:00 2001
From: jdestin <jeremy.destin@inra.fr>
Date: Wed, 11 Sep 2019 17:18:37 +0200
Subject: [PATCH 4/5] refactor: Change the color of the genotyping study badge.
---
.../app/result-page/document/document.component.scss | 7 ++++++-
.../src/app/result-page/document/document.component.ts | 10 +++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/frontend/src/app/result-page/document/document.component.scss b/frontend/src/app/result-page/document/document.component.scss
index fb44cb18..03d7cf72 100644
--- a/frontend/src/app/result-page/document/document.component.scss
+++ b/frontend/src/app/result-page/document/document.component.scss
@@ -9,7 +9,12 @@
color: white;
}
-.badge-study {
+.badge-phenotyping-study {
background-color: #437b9c;
color: white;
}
+
+.badge-genotyping-study {
+ background-color: #c39d35;
+ color: white;
+}
diff --git a/frontend/src/app/result-page/document/document.component.ts b/frontend/src/app/result-page/document/document.component.ts
index fe0ba6fe..a2508341 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',
@@ -10,8 +14,8 @@ export class DocumentComponent implements OnInit {
private static MAX_LENGTH = 256;
private static BADGE_TYPE = {
'Germplasm': 'badge-germplasm',
- 'Phenotyping Study': 'badge-study',
- 'Genotyping Study': 'badge-study'
+ 'Phenotyping Study': 'badge-phenotyping-study',
+ 'Genotyping Study': 'badge-genotyping-study'
};
private static CARD_TYPE = {
--
GitLab
From 3d20e2f26c60467f989ad50bd5aa4fcb210cdb3a Mon Sep 17 00:00:00 2001
From: jdestin <jeremy.destin@inra.fr>
Date: Thu, 12 Sep 2019 09:47:06 +0200
Subject: [PATCH 5/5] fix: fix test and add the test on Genotyping study badge.
fix the url of the EVA logo.
---
backend/src/main/resources/application.yml | 2 +-
.../app/result-page/document/document.component.spec.ts | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 4ca6204a..b739853b 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -70,7 +70,7 @@ faidare:
- uri: https://www.ebi.ac.uk/eva
url: https://www.ebi.ac.uk/eva
name: EVA
- image: https://urgi.versailles.inra.fr/files/faidare/logo/EVA.jpg
+ image: https://urgi.versailles.inra.fr/files/faidare/logo/EVA.png
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 e905943a..f1261dfc 100644
--- a/frontend/src/app/result-page/document/document.component.spec.ts
+++ b/frontend/src/app/result-page/document/document.component.spec.ts
@@ -44,7 +44,7 @@ describe('DocumentComponent', () => {
const component = tester.componentInstance;
component.document = {
- '@type': ['Germplasm', 'Phenotyping Study'],
+ '@type': ['Germplasm', 'Phenotyping Study', 'Genotyping Study'],
'@id': 'urn',
'schema:identifier': 'doc1',
'schema:name': 'doc_name',
@@ -64,7 +64,10 @@ describe('DocumentComponent', () => {
expect(tester.types[0].classes).toContain('badge-germplasm');
expect(tester.types[1]).toContainText('Phenotyping Study');
- expect(tester.types[1].classes).toContain('badge-study');
+ expect(tester.types[1].classes).toContain('badge-phenotyping-study');
+
+ expect(tester.types[2]).toContainText('Genotyping Study');
+ expect(tester.types[2].classes).toContain('badge-genotyping-study');
expect(tester.source).toContainText('source1');
expect(tester.source.attr('href')).toEqual('http://dco/url');
--
GitLab