diff --git a/src/app/funding/funding.component.html b/src/app/funding/funding.component.html index 034e1b64fd..df5653430d 100644 --- a/src/app/funding/funding.component.html +++ b/src/app/funding/funding.component.html @@ -14,110 +14,20 @@

Support for Dockstore is provided by grants from Genome Canada, the National Institutes of Health, and the Province of Ontario.

-
+
-

Genome Canada

+

{{ funder.title }}

- - Genome Canada Logo + +
-
+

- 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. -

-
-
-
-
- -
-
-
-

Province of Ontario

-
-
-
- - Government of Ontario Logo - -
-
-

This work was funded by the Government of Canada through Genome Canada and the Ontario Genomics Institute (OGI-168).

-
-
-
-
- -
-
-
-

National Institutes of Health

-
-
-
- - NIH Logo - -
-
-

A part of the U.S. Department of Health and Human Services, NIH is the largest biomedical research agency in the world.

-
-
-
-
- -
-
-
-

BISTI

-
-
-
- - NIH Logo - -
-
-

- 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. -

-
-
-
-
- -
-
-
-

DataSTAGE

-
-
-
- - NIH Logo - -
-
-

- 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 }}

diff --git a/src/app/funding/funding.component.ts b/src/app/funding/funding.component.ts index b67e24e043..ab0e539133 100644 --- a/src/app/funding/funding.component.ts +++ b/src/app/funding/funding.component.ts @@ -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() {} } diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.ts b/src/app/workflow/launch-third-party/launch-third-party.component.ts index e59ec927ff..6d20412454 100644 --- a/src/app/workflow/launch-third-party/launch-third-party.component.ts +++ b/src/app/workflow/launch-third-party/launch-third-party.component.ts @@ -162,19 +162,21 @@ export class LaunchThirdPartyComponent extends Base implements OnChanges, OnInit ); terraTooltip$: Observable = combineLatest(this.hasContent$, this.hasFileImports$).pipe( - map(([hasContent, hasFileImports]) => this.terraTooltip(hasContent, hasFileImports, 'Terra')) + map(([hasContent, hasFileImports]) => this.terraBasedPlatformTooltip(hasContent, hasFileImports, 'Terra')) ); anvilTooltip$: Observable = combineLatest(this.hasContent$, this.hasFileImports$).pipe( - map(([hasContent, hasFileImports]) => this.terraTooltip(hasContent, hasFileImports, 'AnVIL')) + map(([hasContent, hasFileImports]) => this.terraBasedPlatformTooltip(hasContent, hasFileImports, 'AnVIL')) ); bdCatalystTerraTooltip$: Observable = 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 = combineLatest(this.hasContent$, this.hasFileImports$).pipe( - map(([hasContent, hasFileImports]) => !hasContent || hasFileImports) + map(([hasContent, hasFileImports]) => !hasContent || (hasFileImports && !this.isGitHubWorkflow())) ); constructor( @@ -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('git@github.com'); + } + + 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}.`; } diff --git a/src/assets/images/sponsors/CFI_CMYK.png b/src/assets/images/sponsors/CFI_CMYK.png new file mode 100755 index 0000000000..ac13d232f8 Binary files /dev/null and b/src/assets/images/sponsors/CFI_CMYK.png differ diff --git a/src/assets/images/sponsors/DataSTAGE_logo.png b/src/assets/images/sponsors/DataSTAGE_logo.png deleted file mode 100644 index 8c844c7155..0000000000 Binary files a/src/assets/images/sponsors/DataSTAGE_logo.png and /dev/null differ diff --git a/src/assets/images/sponsors/bioDataCatalyst.svg b/src/assets/images/sponsors/bioDataCatalyst.svg new file mode 100644 index 0000000000..71cc999889 --- /dev/null +++ b/src/assets/images/sponsors/bioDataCatalyst.svg @@ -0,0 +1,442 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file