Make the 'project_supplementary_links' field available on the project overview page. Resolves #848.

Author: Fran McDade

spa/src/app/files/files.module.ts

@@ -81,6 +81,7 @@ import { ProjectDownloadMatrixComponent } from "./project-download-matrix/projec
 import { ProjectGuardComponent } from "./project-guard/project-guard.component";
 import { ProjectIntegrationsComponent } from "./project-integrations/project-integrations.component";
 import { ProjectIngestInProgressComponent } from "./project-ingest-in-progress/project-ingest-in-progress.component";
+import { ProjectSupplementaryLinksComponent } from "./project-supplementary-links/project-supplementary-links.component";
 import { ProjectTSVDownloadComponent } from "./project-tsv-download/project-tsv-download.component";
 import { SearchTermService } from "./shared/search-term.service";
 import { DownloadService } from "./shared/download.service";
@@ -144,13 +145,14 @@ import { TableScroll } from "./table-scroll/table-scroll.component";
         MatrixUrlRequestFormComponent,
         MatrixUrlRequestCompletedComponent,
         ProjectDeprecatedComponent,
+        ProjectDownloadMatrixComponent,
+        ProjectDownloadMatrixModalComponent,
+        ProjectDownloadMatrixModalContainerComponent,
         ProjectGuardComponent,
         ProjectIngestInProgressComponent,
         ProjectIntegrationsComponent,
+        ProjectSupplementaryLinksComponent,
         ProjectTSVDownloadComponent,
-        ProjectDownloadMatrixComponent,
-        ProjectDownloadMatrixModalComponent,
-        ProjectDownloadMatrixModalContainerComponent,
         HCAGetDataComponent,
         HCAGetDataDownloadsComponent,
         HCAGetDataPanelComponent,

spa/src/app/files/hca-project/hca-project-mapper.mock.ts

@@ -52,6 +52,7 @@ export const PROJECT_DETAIL_SINGLE_VALUES = {
     "rawCount": 199640,
     "sampleEntityType": "cellLines",
     "selectedCellType": "arcuate artery endothelial cell",
+    "supplementaryLinks": ["ftp://ftp.ncbi.nlm.nih.gov/geo/series/GSE109nnn/GSE109774/suppl/GSE109774_RAW.tar"],
     "totalCells": 53755,
     "totalCount": 199640,
     "workflow": "optimus_v1.3.1"
@@ -112,6 +113,7 @@ export const PROJECT_DETAIL_MULTIPLE_VALUES = {
     "rawCount": 199640,
     "sampleEntityType": "cellLines, specimens",
     "selectedCellType": "arcuate artery endothelial cell, stromal cell",
+    "supplementaryLinks": ["https://github.com/czbiohub/tabula-muris", "ftp://ftp.ncbi.nlm.nih.gov/geo/series/GSE109nnn/GSE109774/suppl/GSE109774_Liver.tar.gz"],
     "totalCells": 53755,
     "totalCount": 199640,
     "workflow": "optimus_v1.3.1, optimus_v1.3.2"
@@ -147,6 +149,7 @@ export const PROJECT_DETAIL_EMPTY_VALUES = {
     "rawCount": "",
     "sampleEntityType": "",
     "selectedCellType": "",
+    "supplementaryLinks": [],
     "totalCells": "",
     "totalCount": "",
     "workflow": ""
@@ -196,6 +199,7 @@ export const PROJECT_DETAIL_UNSPECIFIED_VALUES = {
     "rawCount": "Unspecified",
     "sampleEntityType": "Unspecified",
     "selectedCellType": "Unspecified",
+    "supplementaryLinks": ["Unspecified"],
     "totalCells": "Unspecified",
     "totalCount": "Unspecified",
     "workflow": "Unspecified"
@@ -231,6 +235,7 @@ export const PROJECT_DETAIL_NULL_VALUES = {
     "rawCount": null,
     "sampleEntityType": null,
     "selectedCellType": null,
+    "supplementaryLinks": null,
     "totalCells": null,
     "totalCount": null,
     "workflow": null
@@ -240,6 +245,7 @@ export const PROJECT_DETAIL_NULL_VALUES = {
 // sample entity type as "specimens",
 // workflow as "Unspecified"
 // projectShortname as sentence case e.g. "Healthy and type 2 diabetes pancreas"
+// supplementaryLinks with link ending in "/", and invalid link
 export const PROJECT_DETAIL_SPECIFIC_VALUES = {
     "ageUnit": "month",
     "arrayExpressAccessions": "E-AAAA-00",
@@ -282,6 +288,7 @@ export const PROJECT_DETAIL_SPECIFIC_VALUES = {
     "rawCount": 199640,
     "sampleEntityType": "specimens",
     "selectedCellType": "arcuate artery endothelial cell",
+    "supplementaryLinks": ["ftp://ftp.ncbi.nlm.nih.gov/geo/series/GSE109nnn/GSE109774/suppl/GSE109774_RAW.tar/", "GSE109774_Liver.tar.gz"],
     "totalCells": 53755,
     "totalCount": 199640,
     "workflow": "optimus_v1.3.1"

spa/src/app/files/hca-project/hca-project.component.html

@@ -17,7 +17,7 @@ <h2 class="fontsize-xl">{{state.project.project.projectTitle}}</h2>
             <div>
                 <div class="project-description">
                     <h4 class="fontsize-m semi-bold">Description</h4>
-                    <p class="fontsize-s">{{state.project.project.projectDescription}}</p>
+                    <p class="description fontsize-s">{{state.project.project.projectDescription}}</p>
                     <div class="stretch">
                         <h4 class="fontsize-m semi-bold">Contact</h4>
                         <ng-container [ngSwitch]="isAnyContactAssociated(state.project.contacts)">
@@ -296,6 +296,18 @@ <h4 class="fontsize-m semi-bold">Project Details</h4>
                             <p class="fontsize-xs rhs">{{state.project.project.donorCount | countSize}}</p>
                         </div>
                     </div>
+                    <div class="project-supplementary">
+                        <h4 class="fontsize-m semi-bold">Supplementary Links</h4>
+                        <ng-container [ngSwitch]="isSupplementaryLinks(state.project.project.supplementaryLinks)">
+                            <project-supplementary-links
+                                    *ngSwitchCase="true"
+                                    [supplementaryLinks]="state.project.project.supplementaryLinks">
+                            </project-supplementary-links>
+                            <p class="fontsize-xs"
+                               *ngSwitchDefault>There are currently no supplementary links for this project at this
+                                time.</p>
+                        </ng-container>
+                    </div>
                 </div>
                 <div>
                     <div class="project-counts">

spa/src/app/files/hca-project/hca-project.component.scss

@@ -23,7 +23,12 @@
         margin-bottom: 36px;
     }
 
-    /* Project title */
+    /* First column, second column, and inner containers */
+    .project-overview > div, .project-overview > div:last-of-type > div {
+        min-width: 0; /* Required to maintain flex with equal proportions, where flex child is an ellipsis (supplementary links) */
+    }
+
+        /* Project title */
     h2 {
         margin: 0;
         max-width: 500px;
@@ -147,6 +152,11 @@
         display: flex;
         flex-wrap: wrap;
 
+        /* Text to describe project */
+        .description {
+            max-width: 650px; /* Required for tablet */
+        }
+
         > div {
 
             /* Contacts, publications */
@@ -198,7 +208,7 @@
     }
 
     /* Project downloads, details, accessions, data release policy etc. */
-    .project-details, .project-downloads, .project-counts, .project-integrations, 
+    .project-details, .project-downloads, .project-counts, .project-integrations, .project-supplementary,
     .project-views, .project-workflows, .project-accessions, .data-release-policy {
 
         /* Row - excludes last row in each group */
@@ -288,8 +298,8 @@
         }
 
         /* Project downloads, details, accessions etc. */
-        .project-details, .project-accessions, .project-downloads, .project-counts, .project-views, .project-workflows, .data-release-policy {
-
+        .project-details, .project-accessions, .project-downloads, .project-supplementary,
+        .project-counts, .project-views, .project-workflows, .data-release-policy {
             /* Row */
             > div {
                 flex-direction: row;
@@ -416,7 +426,7 @@
             }
         }
 
-        /* First column */
+        /* First column, second column inner containers */
         .project-overview > div:first-of-type, .project-overview > div:last-of-type > div {
             max-width: 650px;
         }