fix: Minor fixes on display and link redirection. Change the links on the navbar. GNP-5490

frontend/src/app/germplasm-card/germplasm-card.component.html

@@ -54,7 +54,7 @@
         label="Website"
         [test]="germplasmGnpis.holdingInstitute.webSite">
         <ng-template>
-          <a [href]="germplasmGnpis.breeder.institute.webSite">
+          <a [href]="germplasmGnpis.breeder.institute.webSite" target="_blank">
             {{ germplasmGnpis.holdingInstitute.webSite }}
           </a>
         </ng-template>
@@ -103,7 +103,7 @@
         label="Website"
         [test]="germplasmGnpis.breeder.institute.webSite">
         <ng-template>
-          <a [href]="germplasmGnpis.breeder.institute.webSite">
+          <a [href]="germplasmGnpis.breeder.institute.webSite" target="_blank">
             {{ germplasmGnpis.breeder.institute.webSite }}
           </a>
         </ng-template>
@@ -146,7 +146,7 @@
         label="Website"
         [test]="germplasmGnpis.collector.institute.webSite">
         <ng-template>
-          <a [href]="germplasmGnpis.collector.institute.webSite">
+          <a [href]="germplasmGnpis.collector.institute.webSite" target="_blank">
             {{ germplasmGnpis.collector.institute.webSite }}
           </a>
         </ng-template>
@@ -305,7 +305,7 @@
           label="Stock center name"
           [test]="germplasmGnpis.holdingGenbank.instituteName && germplasmGnpis.holdingGenbank.webSite">
           <ng-template>
-            <a [href]="germplasmGnpis.holdingGenbank.webSite">
+            <a [href]="germplasmGnpis.holdingGenbank.webSite" target="_blank">
               {{ germplasmGnpis.holdingGenbank.instituteName }}
             </a>
           </ng-template>
@@ -506,7 +506,7 @@
                 label="Website"
                 [test]="row.donorInstitute.webSite">
                 <ng-template>
-                  <a [href]=" row.donorInstitute.webSite ">
+                  <a [href]=" row.donorInstitute.webSite " target="_blank">
                     {{ row.donorInstitute.webSite }}
                   </a>
                 </ng-template>
@@ -587,7 +587,7 @@
                 label="Website"
                 [test]="row.institute.webSite">
                 <ng-template>
-                  <a [href]="row.institute.webSite">
+                  <a [href]="row.institute.webSite" target="_blank">
                     {{ row.institute.webSite }}
                   </a>
                 </ng-template>

frontend/src/app/navbar/navbar.component.html

@@ -38,7 +38,6 @@
               </div>
             </div>
           </div>
-
         </li>
       </ul>
     </div>

frontend/src/app/result-page/document/document.component.html

@@ -7,17 +7,19 @@
     <a class="badge badge-source mr-2" [href]="getSourceURL()" target="_blank">
       {{ getSource() }}
     </a>
-    <a class="title" *ngIf="getRouterLink() && document['@type'].includes('Phenotyping Study')" [routerLink]="getRouterLink()">
+    <a class="title" *ngIf="getRouterLink() && document['@type'].includes('Phenotyping Study')"
+       [routerLink]="getRouterLink()">
       {{ document["schema:name"] }}
     </a>
-    <a class="title" *ngIf="getRouterLink() && !document['@type'].includes('Phenotyping Study')" [routerLink]="getRouterLink()" [queryParams]="getQueryParam()">
+    <a class="title" *ngIf="getRouterLink() && !document['@type'].includes('Phenotyping Study')"
+       [routerLink]="getRouterLink()" [queryParams]="getQueryParam()">
       {{ document["schema:name"] }}
     </a>
   </h5>
 
   <h5>
     <a class="title" *ngIf="getURL()" [href]="getURL()" target="_blank">
-      (external link to this {{ document["@type"] }} card)
+      ({{ document['schema:includedInDataCatalog']['schema:identifier'] }} data source link)
     </a>
   </h5>
   <span class="text-justify description">

frontend/src/app/study-card/study-card.component.html

@@ -21,13 +21,7 @@
 
         <gpds-card-row
           label="Identifier"
-          [test]="study.studyDbId">
-          <ng-template>
-            {{ study.studyDbId }}
-            <a target="_blank" *ngIf="studySource && study.documentationURL" [href]="study.documentationURL">
-              ( Link to this study on {{ studySource["schema:identifier"] }} )
-            </a>
-          </ng-template>
+          [value]="study.studyDbId">
         </gpds-card-row>
 
         <gpds-card-row
@@ -52,7 +46,7 @@
           [test]="studySource && study.documentationURL">
           <ng-template>
             <a target="_blank" *ngIf="study.documentationURL" [href]="study.documentationURL">
-              ( Link to this study on {{ studySource["schema:identifier"] }} )
+              Link to this study on {{ studySource["schema:identifier"] }}
             </a>
           </ng-template>
         </gpds-card-row>

frontend/src/app/study-card/study-card.component.spec.ts

@@ -266,7 +266,8 @@ describe('StudyCardComponent', () => {
 
             expect(tester.cardHeader[0]).toContainText('Identification');
 
-            expect(tester.studyInfo[1]).toContainText('Link to this study on srcId');
+            expect(tester.studyInfo[0]).toContainText('study1');
+            expect(tester.studyInfo[1]).toContainText('s1');
 
             expect(tester.cardHeader[1]).toContainText('Genotype');
             expect(component.studyGermplasms.length).toEqual(2);

frontend/src/environments/environment.ts

@@ -18,51 +18,33 @@ export const environment = {
                 ]
             },
             {
-                label: 'Taxon/Germplasm',
+                label: 'Genomes & Synteny',
                 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: '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: 'Phenotyping', url: 'https://urgi.versailles.inra.fr/ephesis/ephesis/viewer.do' },
             {
-                label: 'Polymorphism',
+                label: 'Genetic resources',
                 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: 'Plant genetic resources', url: 'https://urgi.versailles.inra.fr/beta/gnpis-core' },
+                    { label: 'BRC collections', url: 'https://urgi.versailles.inra.fr/beta/siregal/siregal/grc.do' },
                 ]
             },
-            { label: 'Association', url: 'https://urgi.versailles.inra.fr/association/association/viewer.do#form' },
             {
-                label: 'Map/Marker/QTL',
+                label: 'Genetic analyses',
                 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: 'Genetic maps & QTL', url: 'https://urgi.versailles.inra.fr/beta/GnpMap/mapping/welcome.do' },
+                    { label: 'GnpAsso', url: 'https://urgi.versailles.inra.fr/beta/association/association/viewer.do#form' },
                 ]
             },
-            { 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: 'Phenotypes', url: 'https://urgi.versailles.inra.fr/beta/ephesis' },
+            { label: 'Polymorphisms', url: 'https://urgi.versailles.inra.fr/beta/GnpSNP/snp/genotyping/form.do' },
+            { label: 'Sequences', url: 'https://urgi.versailles.inra.fr/beta/sequence' },
+            { label: 'Transcriptomic', url: 'https://urgi.versailles.inra.fr/beta/GnpArray' },
 
         ]
     }