Commit 135a8e14 authored by Jérémy Destin's avatar Jérémy Destin Committed by Célia Michotey
Browse files

fix: Minor fixes. GNP-5490

parent 0def31cc
......@@ -29,12 +29,6 @@ gpds:
cropOntology-repository-url:
https://urgi.versailles.inra.fr/files/ephesis/trait-ontology/data_16.3/ontology-repository.json
gnpis-legacy-url:
https://urgi.versailles.inra.fr/
siregal-files-url:
/files/siregal/images/
# Provides access to user group WS used to query private data ES aliases
security-user-group-ws-url:
security-user-group-ws-token:
......
......@@ -40,7 +40,7 @@
"@id": "https://urgi.versailles.inra.fr",
"schema:identifier": "URGI",
"schema:name": "URGI GnpIS",
"schema:url": "https://urgi.versailles.inra.fr",
"schema:url": "https://urgi.versailles.inra.fr/gnpis/",
"schema:image": "./logos/GnpIS.png"
},
{
......
......@@ -406,6 +406,7 @@ describe('BrapiService', () => {
});
// TODO test the progeny call when the information about parent will be added
/*it('should fetch the germplasm progeny', () => {
let fetchedGermplasmProgeny: GermplasmResult<BrapiGermplasmProgeny>;
......
......@@ -33,7 +33,7 @@ export class BrapiService {
return this.http
.get<BrapiResult<BrapiGermplasmPedigree>>(`${BASE_URL}/germplasm/${germplasmDbId}/pedigree`);
}
// TODO use the progeny call when the information about parent will be added
/*germplasmProgeny(germplasmDbId: string): Observable<GermplasmResult<BrapiGermplasmProgeny>> {
return this.http.get<GermplasmResult<BrapiGermplasmProgeny>>(`${BASE_URL}/germplasm/${germplasmDbId}/progeny`);
}*/
......
......@@ -242,12 +242,13 @@
</gpds-card-row>
<gpds-card-row
label="Accession synonyms"
[test]="germplasmGnpis.synonyms && germplasmGnpis.synonyms.length > 0">
<ng-template>
{{ germplasmGnpis.synonyms.join(', ') }}
<div class="content-overflow">
{{ germplasmGnpis.synonyms.join(', ') }}
</div>
</ng-template>
</gpds-card-row>
......@@ -264,7 +265,9 @@
label="Taxon common names"
[test]="germplasmGnpis.taxonCommonNames && germplasmGnpis.taxonCommonNames.length > 0">
<ng-template>
{{ germplasmGnpis.taxonCommonNames.join(', ') }}
<div class="content-overflow">
{{ germplasmGnpis.taxonCommonNames.join(', ') }}
</div>
</ng-template>
</gpds-card-row>
......@@ -272,7 +275,9 @@
label="Taxon synonyms"
[test]="germplasmGnpis.taxonSynonyms && germplasmGnpis.taxonSynonyms.length > 0">
<ng-template>
<i>{{ germplasmGnpis.taxonSynonyms.join(', ') }}</i>
<div class="content-overflow">
<i>{{ germplasmGnpis.taxonSynonyms.join(', ') }}</i>
</div>
</ng-template>
</gpds-card-row>
......@@ -850,6 +855,6 @@
</gpds-card-section>
<!--XRefs part -->
<gpds-xrefs [xrefId]="germplasmGnpis.germplasmPUI"></gpds-xrefs>
<gpds-xrefs [xrefId]="germplasmGnpis.germplasmPUI"></gpds-xrefs>
</ng-container>
......@@ -37,6 +37,8 @@ export class GermplasmCardComponent implements OnInit {
germplasmId: string;
germplasmPuid: string;
germplasmSource: DataDiscoverySource;
// TODO extract those url in a configuration file.
IMAGES_ACCESSION_URL = 'https://urgi.versailles.inra.fr/files/siregal/images/accession/';
IMAGES_INSTITUTION_URL = 'https://urgi.versailles.inra.fr/files/siregal/images//institution/';
IMAGES_BRC_URL = 'https://urgi.versailles.inra.fr/files/siregal/images/grc/inra_brc_en.png';
......@@ -55,6 +57,7 @@ export class GermplasmCardComponent implements OnInit {
germplasm$.then(result => {
const germplasmId = this.germplasmId ? this.germplasmId : result.germplasmDbId;
// TODO use the progeny call when the information about parent will be added.
/*const germplasmProgeny$ = this.brapiService.germplasmProgeny(germplasmId).toPromise();
germplasmProgeny$
.then(germplasmProgeny => {
......
......@@ -4,7 +4,6 @@ export const environment = {
navbar: {
title: 'GnpIS Plant Data Search',
links: [
{ label: 'INRA', url: 'http://www.inra.fr/' },
{
label: 'URGI',
url: '#',
......@@ -14,52 +13,10 @@ export const environment = {
{ label: 'About us', url: 'https://urgi.versailles.inra.fr/About-us' }
]
},
{
label: 'Taxon/Germplasm',
url: '#',
subMenu: [
{ label: 'Taxon', url: 'https://urgi.versailles.inra.fr/siregal/common/taxon/form.do' },
{ label: 'Accession Simple', url: 'https://urgi.versailles.inra.fr/gnpis-core' },
{ label: 'Accession passport', url: 'https://urgi.versailles.inra.fr/siregal/siregal/accessionForm.do' },
{ label: 'Collections CRB', url: 'https://urgi.versailles.inra.fr/siregal/siregal/grc.do' },
]
},
{ label: 'Phenotyping', url: 'https://urgi.versailles.inra.fr/ephesis/ephesis/viewer.do' },
{
label: 'Polymorphism',
url: '#',
subMenu: [
{ label: 'Genotyping', url: 'https://urgi.versailles.inra.fr/GnpSNP/snp/genotyping/form.do' },
{ label: 'SNP Discovery', url: 'https://urgi.versailles.inra.fr/GnpSNP/snp/welcome.do' },
]
},
{ label: 'Association', url: 'https://urgi.versailles.inra.fr/association/association/viewer.do#form' },
{
label: 'Map/Marker/QTL',
url: '#',
subMenu: [
{ label: 'Map', url: 'https://urgi.versailles.inra.fr/GnpMap/mapping/searchMap.do' },
{ label: 'Loci', url: 'https://urgi.versailles.inra.fr/GnpMap/mapping/loci/queryLociSelect.do' },
{ label: 'QTL', url: 'https://urgi.versailles.inra.fr/GnpMap/mapping/qtl/queryQtlSelect.do' },
{ label: 'MetaQTLs', url: 'https://urgi.versailles.inra.fr/GnpMap/mapping/metaqtl/form.do' },
{ label: 'Marker', url: 'https://urgi.versailles.inra.fr/GnpMap/mapping/marker/markerForm.do' },
{ label: 'Pool', url: 'https://urgi.versailles.inra.fr/GnpMap/mapping/pool/poolForm.do' },
{ label: 'Traits', url: 'https://urgi.versailles.inra.fr/GnpMap/mapping/queryTraitSelect.do' },
{ label: 'Biomercator', url: 'https://urgi.versailles.inra.fr/Tools/BioMercator-V4' },
]
},
{ label: 'Genomes', url: 'https://urgi.versailles.inra.fr/Data/Genome/Genome-data-access' },
{ label: 'Synteny', url: 'https://urgi.versailles.inra.fr/synteny/synteny/viewer.do#dataset' },
{
label: 'Sequence',
url: '#',
subMenu: [
{ label: 'Sequence', url: 'https://urgi.versailles.inra.fr/sequence/sequence/sequence/form.do' },
{ label: 'Experiment', url: 'https://urgi.versailles.inra.fr/sequence/sequence/experiment/form.do' },
{ label: 'Analysis', url: 'https://urgi.versailles.inra.fr/sequence/sequence/analysis/form.do' },
{ label: 'Project', url: 'https://urgi.versailles.inra.fr/sequence/sequence/project/form.do' },
]
}
{ label: 'GNPIS', url: 'https://urgi.versailles.inra.fr/gnpis/' },
{ label: 'CIRAD', url: 'http://tropgenedb.cirad.fr/' },
{ label: 'VIB', url: 'http://pippa.psb.ugent.be' },
{ label: 'IBET', url: 'https://biodata.pt' }
]
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment