Skip to content

Commit

Permalink
Merge branch 'hotfix/2.5.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
denis-yuen committed Apr 28, 2020
2 parents 9a1732a + a8125a6 commit 54dd769
Show file tree
Hide file tree
Showing 6 changed files with 524 additions and 103 deletions.
102 changes: 6 additions & 96 deletions src/app/funding/funding.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,110 +14,20 @@ <h3 class="available-containers">
<p class="lead">
Support for Dockstore is provided by grants from Genome Canada, the National Institutes of Health, and the Province of Ontario.
</p>
<div class="col-xs-12 col-md-6 col-lg-6">
<div *ngFor="let funder of funders" class="col-xs-12 col-md-6 col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Genome Canada</h3>
<h3 class="panel-title">{{ funder.title }}</h3>
</div>
<div class="panel-body">
<div class="col-sm-12" style="min-height:150px !important;">
<a href="https://www.genomecanada.ca/">
<img
src="../assets/images/sponsors/genomecanada.png"
class="center-block img-responsive funding-img"
alt="Genome Canada Logo"
/>
<a [href]="funder.website">
<img [src]="funder.imageSource" class="center-block img-responsive funding-img" [alt]="funder.altImageText" />
</a>
</div>
<div class="col-sm-12" style="min-height:200px !important;">
<div class="col-sm-12" style="min-height:210px !important;">
<p>
Genome Canada is a not-for-profit organization, funded by the Government of Canada. We act as a catalyst for developing and
applying genomics+ and genomic-based technologies to create economic and social benefits for Canadians.
</p>
</div>
</div>
</div>
</div>

<div class="col-xs-12 col-md-6 col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Province of Ontario</h3>
</div>
<div class="panel-body">
<div class="col-sm-12" style="min-height:150px !important;">
<a href="https://www.ontario.ca">
<img
src="../assets/images/sponsors/ontario_new.png"
class="center-block img-responsive funding-img"
alt="Government of Ontario Logo"
/>
</a>
</div>
<div class="col-sm-12" style="min-height:200px !important;">
<p>This work was funded by the Government of Canada through Genome Canada and the Ontario Genomics Institute (OGI-168).</p>
</div>
</div>
</div>
</div>

<div class="col-xs-12 col-md-6 col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">National Institutes of Health</h3>
</div>
<div class="panel-body">
<div class="col-sm-12" style="min-height:150px !important;">
<a href="https://www.nih.gov/">
<img src="../assets/images/sponsors/NIH.png" class="center-block img-responsive funding-img" alt="NIH Logo" />
</a>
</div>
<div class="col-sm-12" style="min-height:200px !important;">
<p>A part of the U.S. Department of Health and Human Services, NIH is the largest biomedical research agency in the world.</p>
</div>
</div>
</div>
</div>

<div class="col-xs-12 col-md-6 col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">BISTI</h3>
</div>
<div class="panel-body">
<div class="col-sm-12" style="min-height:150px !important;">
<a href="https://www.nih.gov/">
<img src="../assets/images/sponsors/bisti-logo.png" class="center-block img-responsive funding-img" alt="NIH Logo" />
</a>
</div>
<div class="col-sm-12" style="min-height:200px !important;">
<p>
The Biomedical Information Science and Technology Initiative is a consortium of representatives from each of the NIH
institutes and centers. The mission of BISTI is to make optimal use of computer science and technology to address problems in
biology and medicine by fostering new basic understandings, collaborations, and transdisciplinary initiatives between the
computational and biomedical sciences.
</p>
</div>
</div>
</div>
</div>

<div class="col-xs-12 col-md-6 col-lg-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">DataSTAGE</h3>
</div>
<div class="panel-body">
<div class="col-sm-12" style="min-height:150px !important;">
<a href="https://www.nih.gov/">
<img src="../assets/images/sponsors/DataSTAGE_logo.png" class="center-block img-responsive funding-img" alt="NIH Logo" />
</a>
</div>
<div class="col-sm-12" style="min-height:200px !important;">
<p>
The DataSTAGE (Storage, Toolspace, Access and analytics for biG data Empowerment) project aims to create a community of
practice that is motivated to collaboratively solve technical challenges to enable NHLBI investigators to find, access, share,
store, cross-link, and compute on large-scale data sets.
{{ funder.content }}
</p>
</div>
</div>
Expand Down
63 changes: 63 additions & 0 deletions src/app/funding/funding.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,73 @@
import { Component } from '@angular/core';

export interface Funder {
title: string;
website: string;
imageSource: string;
altImageText: string;
content: string;
}

@Component({
selector: 'app-funding',
templateUrl: './funding.component.html',
styleUrls: ['./funding.component.scss']
})
export class FundingComponent {
GenomeCanadaFunder: Funder = {
title: 'Genome Canada',
website: 'https://www.genomecanada.ca/',
imageSource: '../assets/images/sponsors/genomecanada.png',
altImageText: 'Genome Canada Logo',
content: `Genome Canada is a not-for-profit organization, funded by the Government of Canada. We act as a catalyst for developing and
applying genomics+ and genomic-based technologies to create economic and social benefits for Canadians.`
};
ProvinceOfOntarioFunder: Funder = {
title: 'Province of Ontario',
website: 'https://www.ontario.ca',
imageSource: '../assets/images/sponsors/ontario_new.png',
altImageText: 'Government of Ontario Logo',
content: 'This work was funded by the Government of Canada through Genome Canada and the Ontario Genomics Institute (OGI-168).'
};
NIHFunder: Funder = {
title: 'National Institutes of Health',
website: 'https://www.nih.gov/',
imageSource: '../assets/images/sponsors/NIH.png',
altImageText: 'NIH Logo',
content: 'A part of the U.S. Department of Health and Human Services, NIH is the largest biomedical research agency in the world.'
};
BISTIFunder: Funder = {
title: 'BISTI',
website: 'https://www.nih.gov/',
imageSource: '../assets/images/sponsors/bisti-logo.png',
altImageText: 'BISTI Logo',
content: `The Biomedical Information Science and Technology Initiative is a consortium of representatives from each of the NIH
institutes and centers. The mission of BISTI is to make optimal use of computer science and technology to address problems in
biology and medicine by fostering new basic understandings, collaborations, and transdisciplinary initiatives between the
computational and biomedical sciences.`
};
BioDataCatalyst: Funder = {
title: 'BioData Catalyst',
website: 'http://biodatacatalyst.nhlbi.nih.gov/',
imageSource: '../assets/images/sponsors/bioDataCatalyst.svg',
altImageText: 'BioData Catalyst Logo',
content: `NHLBI BioData Catalyst is a cloud-based platform providing tools, applications, and workflows in secure workspaces. By increasing access to NHLBI datasets and innovative data analysis capabilities, BioData Catalyst accelerates efficient biomedical research that drives discovery and scientific advancement, leading to novel diagnostic tools, therapeutics, and prevention strategies for heart, lung, blood, and sleep disorders.`
};
CFIFunder: Funder = {
title: 'CFI',
website: 'https://www.innovation.ca/',
imageSource: '../assets/images/sponsors/CFI_CMYK.png',
altImageText: 'CFI Logo',
content: `The CFI makes financial contributions to Canada’s universities, colleges, research hospitals and non-profit research
organizations to increase their capability to carry out high quality research.`
};
funders: Funder[] = [
this.GenomeCanadaFunder,
this.ProvinceOfOntarioFunder,
this.NIHFunder,
this.BISTIFunder,
this.BioDataCatalyst,
this.CFIFunder
];
constructor() {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -162,19 +162,21 @@ export class LaunchThirdPartyComponent extends Base implements OnChanges, OnInit
);

terraTooltip$: Observable<string> = combineLatest(this.hasContent$, this.hasFileImports$).pipe(
map(([hasContent, hasFileImports]) => this.terraTooltip(hasContent, hasFileImports, 'Terra'))
map(([hasContent, hasFileImports]) => this.terraBasedPlatformTooltip(hasContent, hasFileImports, 'Terra'))
);

anvilTooltip$: Observable<string> = combineLatest(this.hasContent$, this.hasFileImports$).pipe(
map(([hasContent, hasFileImports]) => this.terraTooltip(hasContent, hasFileImports, 'AnVIL'))
map(([hasContent, hasFileImports]) => this.terraBasedPlatformTooltip(hasContent, hasFileImports, 'AnVIL'))
);

bdCatalystTerraTooltip$: Observable<string> = combineLatest(this.hasContent$, this.hasFileImports$).pipe(
map(([hasContent, hasFileImports]) => this.terraTooltip(hasContent, hasFileImports, 'NHLBI BioData Catalyst powered by Terra'))
map(([hasContent, hasFileImports]) =>
this.terraBasedPlatformTooltip(hasContent, hasFileImports, 'NHLBI BioData Catalyst powered by Terra')
)
);

disableTerraPlatform$: Observable<boolean> = combineLatest(this.hasContent$, this.hasFileImports$).pipe(
map(([hasContent, hasFileImports]) => !hasContent || hasFileImports)
map(([hasContent, hasFileImports]) => !hasContent || (hasFileImports && !this.isGitHubWorkflow()))
);

constructor(
Expand Down Expand Up @@ -237,12 +239,16 @@ export class LaunchThirdPartyComponent extends Base implements OnChanges, OnInit
return `Export this workflow version to ${platform}.`;
}

private terraTooltip(hasContent: boolean, hasFileImports, platform: string): string {
private isGitHubWorkflow(): boolean {
return this.workflow && this.workflow.gitUrl && this.workflow.gitUrl.startsWith('[email protected]');
}

private terraBasedPlatformTooltip(hasContent: boolean, hasFileImports, platform: string): string {
if (!hasContent) {
return 'The WDL has no content.';
}
if (hasFileImports) {
return `${platform} does not support file-path imports in WDL. It only supports http(s) imports.`;
if (!this.isGitHubWorkflow() && hasFileImports) {
return `This version of the WDL has file-path imports, which are only supported by ${platform} for GitHub-based workflows.`;
}
return `Export this workflow version to ${platform}.`;
}
Expand Down
Binary file added src/assets/images/sponsors/CFI_CMYK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/images/sponsors/DataSTAGE_logo.png
Binary file not shown.
Loading

0 comments on commit 54dd769

Please sign in to comment.