diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index a6ad41ed45035aa96f6a08e6e3cbfdc94228f7a0..b739853b103ac85943fc4c33bf4078dd6bacfa20 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -36,36 +36,41 @@ 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: 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 + # 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 + # 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.png server: compression: diff --git a/frontend/src/app/models/data-discovery.model.ts b/frontend/src/app/models/data-discovery.model.ts index 9538c5e50ad679e7350415067106393fabbe6938..d8682915c745547d9387218e39ed2420aad53e92 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[]; diff --git a/frontend/src/app/result-page/document/document.component.html b/frontend/src/app/result-page/document/document.component.html index 1dd743faa62ede26f72f457e5966ffefce18d6de..202773526873e97f04f4c0986a81d6a298e0da86 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.scss b/frontend/src/app/result-page/document/document.component.scss index fb44cb186291fce961d4deda6a34fbac2b0c3e9a..03d7cf72dbfd8404e2dcc44f9d8f9267abdf84aa 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.spec.ts b/frontend/src/app/result-page/document/document.component.spec.ts index e905943a68ccdae408ffbc66306349b7ce34daa2..f1261dfc57090e06e57b5a14f67a6330e34fe9bb 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'); diff --git a/frontend/src/app/result-page/document/document.component.ts b/frontend/src/app/result-page/document/document.component.ts index fd3a6ee57eec8e35069a292e5fd2fe5576109d2b..72cae0f5d95b729f8a2c1fab3a1d20c931d4111a 100644 --- a/frontend/src/app/result-page/document/document.component.ts +++ b/frontend/src/app/result-page/document/document.component.ts @@ -14,12 +14,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-phenotyping-study', + 'Genotyping Study': 'badge-genotyping-study' }; private static CARD_TYPE = { 'Germplasm': 'germplasm', - 'Phenotyping Study': 'studies' + 'Phenotyping Study': 'studies', + 'Genotyping Study': 'studies' }; @Input() document: DataDiscoveryDocument;