Clarify the meanings of 'Supplementary Links' vs 'External Resources'. Resolves #1124. (#1128)

Author: frano-m

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

@@ -73,9 +73,8 @@ import { HCATablePaginationComponent } from "./hca-table-pagination/hca-table-pa
 import { HCATableProjectsComponent } from "./hca-table-projects/hca-table-projects.component";
 import { HCATableSamplesComponent } from "./hca-table-samples/hca-table-samples.component";
 import { HCATableSortComponent } from "./hca-table-sort/hca-table-sort.component";
-import { HCATooltipComponent } from "./hca-tooltip/hca-tooltip.component";
 import { ModalModule } from "../modal/modal.module";
-import { ProjectService } from "./project/project.service";
+import { ProjectAnalysisPortalsComponent } from "./project-analysis-portals/project-analysis-portals.component";
 import { ProjectDataCitationComponent } from "./project-data-citation/project-data-citation.component";
 import { ProjectDeprecatedComponent } from "./project-deprecated/project-deprecated.component";
 import { ProjectDetailComponent } from "./project-detail/project-detail.component";
@@ -97,6 +96,7 @@ import { ProjectNavComponent } from "./project-nav/project-nav.component";
 import { ProjectOverviewComponent } from "./project-overview/project-overview.component";
 import { ProjectOverviewDataSummaryComponent } from "./project-overview-data-summary/project-overview-data-summary.component";
 import { ProjectReleaseComponent } from "./project-release/project-release.component";
+import { ProjectService } from "./project/project.service";
 import { ProjectSummaryStatsComponent } from "./project-summary-stats-component/project-summary-stats.component";
 import { ProjectViewFactory } from "./project-view/project-view.factory";
 import { ReleaseComponent } from "./releases/release.component";
@@ -186,11 +186,11 @@ import { ReleaseService } from "./shared/release.service";
         HCATableProjectsComponent,
         HCATableSamplesComponent,
         HCATableSortComponent,
-        HCATooltipComponent,
         LeftBarComponent,
         MatrixPartialQueryMatchWarningComponent,
         MatrixUrlRequestCompletedComponent,
         MatrixUrlRequestFormComponent,
+        ProjectAnalysisPortalsComponent,
         ProjectDataCitationComponent,
         ProjectDeprecatedComponent,
         ProjectDetailComponent,

spa/src/app/files/files.routes.ts

@@ -21,7 +21,6 @@ import { ProjectMetadataComponent } from "./project-metadata/project-metadata.co
 import { ProjectOverviewComponent } from "./project-overview/project-overview.component";
 import { ProjectReleaseComponent } from "./project-release/project-release.component";
 import { ProjectSummaryStatsComponent } from "./project-summary-stats-component/project-summary-stats.component";
-import { ProjectSupplementaryLinksComponent } from "./project-supplementary-links/project-supplementary-links.component";
 import { ReleaseComponent } from "./releases/release.component";
 import { ReleaseFilesModalContainerComponent } from "./releases/release-files-modal-container/release-files-modal-container.component";
 
@@ -62,10 +61,6 @@ export const routes: Route[] = [
                         path: "expression-matrices",
                         component: ProjectExpressionMatricesComponent
                     },
-                    {
-                        path: "supplementary-links",
-                        component: ProjectSupplementaryLinksComponent
-                    },
                     {
                         path: "external-resources",
                         component: ProjectExternalResourcesComponent

spa/src/app/files/hca-content-ellipsis/hca-content-ellipsis.component.ts

@@ -9,7 +9,7 @@
 import { Component, ElementRef, Input, ViewChild } from "@angular/core";
 
 // App dependencies
-import { HCATooltipComponent } from "../hca-tooltip/hca-tooltip.component";
+import { HCATooltipComponent } from "../../shared/hca-tooltip/hca-tooltip.component";
 import { HCAEllipsisTextComponent } from "./hca-ellipsis-text.component";
 
 @Component({

spa/src/app/files/hca-get-data/hca-get-data-file-summary/hca-get-data-file-summary.component.spec.ts

@@ -14,8 +14,8 @@ import { By, HAMMER_LOADER } from "@angular/platform-browser";
 import { CcPipeModule } from "../../../cc-pipe/cc-pipe.module";
 import { CountSizePipe } from "../../../cc-pipe/count-size/count-size.pipe";
 import { FileSizePipe } from "../../../cc-pipe/file-size/file-size.pipe";
-import { HCATooltipComponent } from "../../hca-tooltip/hca-tooltip.component";
 import { DEFAULT_FILE_SUMMARY } from "../../shared/file-summary.mock";
+import { HCATooltipComponent } from "../../../shared/hca-tooltip/hca-tooltip.component";
 import { DownloadViewState } from "../download-view-state.model";
 import { HCAGetDataFileSummaryComponent } from "./hca-get-data-file-summary.component";
 import { Term } from "../../shared/term.model";

spa/src/app/files/hca-get-data/hca-get-data-summary/hca-get-data-summary.component.spec.ts

@@ -14,9 +14,9 @@ import { of } from "rxjs";
 
 // App dependencies
 import { CcPipeModule } from "../../../cc-pipe/cc-pipe.module";
+import { HCATooltipComponent } from "../../../shared/hca-tooltip/hca-tooltip.component";
 import { HCAFileFilterResultComponent } from "../../hca-file-filter-result/hca-file-filter-result.component";
 import { HCAGetDataFileSummaryComponent } from "../hca-get-data-file-summary/hca-get-data-file-summary.component";
-import { HCATooltipComponent } from "../../hca-tooltip/hca-tooltip.component";
 import { SearchFileFacetTerm } from "../../search/search-file-facet-term.model";
 import { FileFacetDisplayService } from "../../shared/file-facet-display.service";
 import { DEFAULT_FILE_SUMMARY } from "../../shared/file-summary.mock";

spa/src/app/files/hca-table-files/hca-table-files.component.spec.ts

@@ -24,6 +24,7 @@ import { of } from "rxjs";
 import { CcPipeModule } from "../../cc-pipe/cc-pipe.module";
 import { ConfigService } from "../../config/config.service";
 import { ResponsiveService } from "../../shared/responsive/responsive.service";
+import { HCATooltipComponent } from "../../shared/hca-tooltip/hca-tooltip.component";
 import { AnalysisProtocolPipelineLinkerComponent } from "../analysis-protocol-pipeline-linker/analysis-protocol-pipeline-linker.component";
 import { HCAContentEllipsisComponent } from "../hca-content-ellipsis/hca-content-ellipsis.component";
 import { HCAEllipsisTextComponent } from "../hca-content-ellipsis/hca-ellipsis-text.component";
@@ -37,7 +38,6 @@ import { HCATableColumnHeaderTitleComponent } from "../hca-table-column-header-t
 import { HCATableDataStatusPlaceholderComponent } from "../hca-table-data-status-placeholder/hca-table-data-status-placeholder.component";
 import { HCATablePaginationComponent } from "../hca-table-pagination/hca-table-pagination.component";
 import { HCATableSortComponent } from "../hca-table-sort/hca-table-sort.component";
-import { HCATooltipComponent } from "../hca-tooltip/hca-tooltip.component";
 import { DEFAULT_FILE_SUMMARY } from "../shared/file-summary.mock";
 import { DownloadService } from "../shared/download.service";
 import { DownloadButtonComponent } from "../../shared/download-button/download-button.component";

spa/src/app/files/hca-table-projects/hca-table-projects.component.spec.ts

@@ -28,6 +28,7 @@ import { CopyToClipboardComponent } from "../../shared/copy-to-clipboard/copy-to
 import { DownloadButtonComponent } from "../../shared/download-button/download-button.component";
 import { FileDownloadComponent } from "../../shared/file-download/file-download.component";
 import { ResponsiveService } from "../../shared/responsive/responsive.service";
+import { HCATooltipComponent } from "../../shared/hca-tooltip/hca-tooltip.component";
 import { SelectProjectIdAction } from "../_ngrx/search/select-project-id.action";
 import { AnalysisProtocolPipelineLinkerComponent } from "../analysis-protocol-pipeline-linker/analysis-protocol-pipeline-linker.component";
 import { DataDownloadCitationComponent } from "../data-download-citation/data-download-citation.component";
@@ -42,7 +43,6 @@ import { HCATableColumnHeaderTitleComponent } from "../hca-table-column-header-t
 import { HCATableDataStatusPlaceholderComponent } from "../hca-table-data-status-placeholder/hca-table-data-status-placeholder.component";
 import { HCATablePaginationComponent } from "../hca-table-pagination/hca-table-pagination.component";
 import { HCATableSortComponent } from "../hca-table-sort/hca-table-sort.component";
-import { HCATooltipComponent } from "../hca-tooltip/hca-tooltip.component";
 import { LeftBarComponent } from "../left-bar/left-bar.component";
 import { ProjectDownloadMatrixComponent } from "../project-download-matrix/project-download-matrix.component";
 import { ProjectTSVUrlRequestStatus } from "../project/project-tsv-url-request-status.model";

spa/src/app/files/hca-table-samples/hca-table-samples.component.spec.ts

@@ -23,22 +23,22 @@ import { of } from "rxjs";
 // App components
 import { CcPipeModule } from "../../cc-pipe/cc-pipe.module";
 import { ConfigService } from "../../config/config.service";
+import { CopyToClipboardComponent } from "../../shared/copy-to-clipboard/copy-to-clipboard.component";
+import { DownloadButtonComponent } from "../../shared/download-button/download-button.component";
+import { HCATooltipComponent } from "../../shared/hca-tooltip/hca-tooltip.component";
+import { ResponsiveService } from "../../shared/responsive/responsive.service";
 import { AnalysisProtocolPipelineLinkerComponent } from "../analysis-protocol-pipeline-linker/analysis-protocol-pipeline-linker.component";
 import { HCAContentEllipsisComponent } from "../hca-content-ellipsis/hca-content-ellipsis.component";
 import { HCAEllipsisTextComponent } from "../hca-content-ellipsis/hca-ellipsis-text.component";
 import { HCAContentUnspecifiedDashComponent } from "../hca-content-unspecified-bar/hca-content-unspecified-dash.component";
 import { HCATableCellComponent } from "../hca-table-cell/hca-table-cell.component";
 import { HCATableColumnHeaderComponent } from "../hca-table-column-header/hca-table-column-header.component";
-import { CopyToClipboardComponent } from "../../shared/copy-to-clipboard/copy-to-clipboard.component";
 import { HCATableColumnHeaderTitleComponent } from "../hca-table-column-header-title/hca-table-column-header-title.component";
 import { HCATableDataStatusPlaceholderComponent } from "../hca-table-data-status-placeholder/hca-table-data-status-placeholder.component";
 import { HCATablePaginationComponent } from "../hca-table-pagination/hca-table-pagination.component";
 import { HCATableSortComponent } from "../hca-table-sort/hca-table-sort.component";
 import { HCATableColumnHeaderCountComponent } from "../hca-table-column-header-count/hca-table-column-header-count.component";
-import { HCATooltipComponent } from "../hca-tooltip/hca-tooltip.component";
-import { DownloadButtonComponent } from "../../shared/download-button/download-button.component";
 import { DEFAULT_FILE_SUMMARY } from "../shared/file-summary.mock";
-import { ResponsiveService } from "../../shared/responsive/responsive.service";
 import { TableScroll } from "../table-scroll/table-scroll.component";
 import { TableRendererService } from "../table/table-renderer.service";
 import { SAMPLES_TABLE_MODEL } from "./table-state-table-model-samples.mock";

spa/src/app/files/project-analysis-portals/project-analysis-portals.component.html

@@ -0,0 +1,13 @@
+<ng-container *ngIf="state$ | async as state">
+    <ng-container *ngIf="state.loaded">
+        <h4 class="fontsize-m semi-bold">Analysis Portals</h4>
+        <p class="fontsize-xs">Analysis Portals are external resources providing further analysis, such as
+            visualizations.</p>
+        <ng-container [ngSwitch]="state.integratedWithTertiaryPortals">
+            <ng-container *ngSwitchCase="true">
+                <project-integrations [integrations]="state.integrations"></project-integrations>
+            </ng-container>
+            <no-hits *ngSwitchDefault><p class="fontsize-xs">There are no Analysis Portals associated with this project.</p></no-hits>
+        </ng-container>
+    </ng-container>
+</ng-container>

spa/src/app/files/project-analysis-portals/project-analysis-portals.component.scss

@@ -0,0 +1,10 @@
+/*
+ * Human Cell Atlas
+ * https://www.humancellatlas.org/
+ *
+ * Styles for project analysis portals component.
+ */
+
+no-hits p {
+    margin-bottom: 0;
+}