Skip to content

Commit 74de0fa

Browse files
authored
FireCloud Data Library now powered by DUOS (#5278)
1 parent bf9545b commit 74de0fa

File tree

4 files changed

+5
-29
lines changed

4 files changed

+5
-29
lines changed

config/dev.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"devUrlRoot": "https://bvdp-saturn-dev.appspot.com",
99
"dockstoreUrlRoot": "https://staging.dockstore.org",
1010
"drsHubUrlRoot": "https://drshub.dsde-dev.broadinstitute.org",
11+
"duosUrlRoot": "https://duos-k8s.dsde-dev.broadinstitute.org",
1112
"externalCreds": {
1213
"providers": ["ras", "fence", "dcf-fence", "kids-first", "github", "sage"],
1314
"urlRoot": "https://externalcreds.dsde-dev.broadinstitute.org"

config/prod.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"dataRepoUrlRoot": "https://data.terra.bio",
88
"dockstoreUrlRoot": "https://dockstore.org",
99
"drsHubUrlRoot": "https://drshub.dsde-prod.broadinstitute.org",
10+
"duosUrlRoot": "https://duos.org",
1011
"firecloudBucketRoot": "https://storage.googleapis.com/firecloud-alerts",
1112
"firecloudUrlRoot": "https://portal.firecloud.org",
1213
"externalCreds": {

config/staging.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"devUrlRoot": "https://bvdp-saturn-staging.appspot.com",
99
"dockstoreUrlRoot": "https://staging.dockstore.org",
1010
"drsHubUrlRoot": "https://drshub.dsde-staging.broadinstitute.org",
11+
"duosUrlRoot": "https://duos-k8s.dsde-staging.broadinstitute.org",
1112
"externalCreds": {
1213
"providers": ["ras", "fence", "dcf-fence", "kids-first", "github", "sage"],
1314
"urlRoot": "https://externalcreds.dsde-staging.broadinstitute.org"

src/pages/library/Datasets.js

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import targetLogo from 'src/images/library/datasets/target_logo.jpeg';
2121
import tcgaLogo from 'src/images/library/datasets/TCGALogo.jpg';
2222
import topMedLogo from 'src/images/library/datasets/[email protected]';
2323
import { Metrics } from 'src/libs/ajax/Metrics';
24-
import { getEnabledBrand } from 'src/libs/brand-utils';
2524
import colors from 'src/libs/colors';
2625
import { getConfig } from 'src/libs/config';
2726
import Events from 'src/libs/events';
@@ -384,31 +383,6 @@ const encode = () =>
384383
]
385384
);
386385

387-
const fcDataLib = () =>
388-
h(
389-
Participant,
390-
{
391-
logo: { src: broadLogo, alt: 'Broad logo', height: '40%' },
392-
title: 'Broad Dataset Workspace Library',
393-
description: `Search for datasets sequenced at the Broad Institute, or public datasets hosted at the Broad. Datasets
394-
are pre-loaded as workspaces. You can clone these, or copy data into the workspace of your choice.`,
395-
sizeText: h(TooltipTrigger, { content: 'As of October 2018' }, [span('Samples: > 158,629')]),
396-
},
397-
[
398-
h(
399-
ButtonPrimary,
400-
{
401-
'aria-label': 'Browse Broad Institute datasets',
402-
tooltip: 'Search for dataset workspaces',
403-
href: `${getConfig().firecloudUrlRoot}/?return=${getEnabledBrand().queryName}#library`,
404-
onClick: () => captureBrowseDataEvent('Broad Institute Datasets'),
405-
...Utils.newTabLinkProps,
406-
},
407-
['Browse Datasets']
408-
),
409-
]
410-
);
411-
412386
const framingham = () =>
413387
h(
414388
Participant,
@@ -554,7 +528,7 @@ const target = () =>
554528
ButtonPrimary,
555529
{
556530
'aria-label': 'Browse TARGET data',
557-
href: `${getConfig().firecloudUrlRoot}/?return=${getEnabledBrand().queryName}&project=TARGET#library`,
531+
href: `${getConfig().duosUrlRoot}/datalibrary/firecloud`,
558532
onClick: () => captureBrowseDataEvent('TARGET'),
559533
...Utils.newTabLinkProps,
560534
},
@@ -583,7 +557,7 @@ const tcga = () =>
583557
ButtonPrimary,
584558
{
585559
'aria-label': 'Browse Cancer Genome Atlas data',
586-
href: `${getConfig().firecloudUrlRoot}/?return=${getEnabledBrand().queryName}&project=TCGA#library`,
560+
href: `${getConfig().duosUrlRoot}/datalibrary/firecloud`,
587561
onClick: () => captureBrowseDataEvent('Cancer Genome Atlas'),
588562
...Utils.newTabLinkProps,
589563
},
@@ -671,7 +645,6 @@ export const Datasets = () => {
671645
ccdg(),
672646
cmg(),
673647
encode(),
674-
fcDataLib(),
675648
framingham(),
676649
gp2(),
677650
hca(),

0 commit comments

Comments
 (0)