From 369423a6683c761750f09a49628db0c75aa213ca Mon Sep 17 00:00:00 2001 From: Zakir Gowani Date: Wed, 25 Mar 2020 11:30:48 -0500 Subject: [PATCH 1/2] chore: update terra template to support multiple values --- data/config/gtex.json | 5 ++++- src/GuppyDataExplorer/ExplorerButtonGroup/index.jsx | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/data/config/gtex.json b/data/config/gtex.json index 0fc5dd7f60..0fdd8e9d05 100644 --- a/data/config/gtex.json +++ b/data/config/gtex.json @@ -340,7 +340,10 @@ }, "getAccessButtonLink": "https://dbgap.ncbi.nlm.nih.gov/", "terraExportURL": "https://bvdp-saturn-dev.appspot.com/#import-data", - "terraTemplate": "bdc" + "terraTemplate": [ + "bdc", + "gen3" + ] }, "fileExplorerConfig": { "charts": { diff --git a/src/GuppyDataExplorer/ExplorerButtonGroup/index.jsx b/src/GuppyDataExplorer/ExplorerButtonGroup/index.jsx index d1d75d6747..2fcdee5819 100644 --- a/src/GuppyDataExplorer/ExplorerButtonGroup/index.jsx +++ b/src/GuppyDataExplorer/ExplorerButtonGroup/index.jsx @@ -313,9 +313,15 @@ class ExplorerButtonGroup extends React.Component { sendPFBToCloud = () => { const url = encodeURIComponent(this.state.exportPFBURL); let templateParam = ''; + console.log('316'); + console.log(this.props.buttonConfig.terraTemplate); if (typeof this.props.buttonConfig.terraTemplate !== 'undefined' && this.props.buttonConfig.terraTemplate != null) { - templateParam = `&template=${this.props.buttonConfig.terraTemplate}`; + const templateParam = this.props.buttonConfig.terraTemplate.map( + x => '&template=' + x + ).join(''); + console.log('321'); + console.log(templateParam); } window.location = `${this.props.buttonConfig.terraExportURL}?format=PFB${templateParam}&url=${url}`; } From 5658bcc4f5fcf4d2ce80fa233546d20e148c1da0 Mon Sep 17 00:00:00 2001 From: Zakir Gowani Date: Wed, 25 Mar 2020 12:47:32 -0500 Subject: [PATCH 2/2] chore: update terra template --- src/GuppyDataExplorer/ExplorerButtonGroup/index.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/GuppyDataExplorer/ExplorerButtonGroup/index.jsx b/src/GuppyDataExplorer/ExplorerButtonGroup/index.jsx index 2fcdee5819..96604eb164 100644 --- a/src/GuppyDataExplorer/ExplorerButtonGroup/index.jsx +++ b/src/GuppyDataExplorer/ExplorerButtonGroup/index.jsx @@ -313,15 +313,11 @@ class ExplorerButtonGroup extends React.Component { sendPFBToCloud = () => { const url = encodeURIComponent(this.state.exportPFBURL); let templateParam = ''; - console.log('316'); - console.log(this.props.buttonConfig.terraTemplate); if (typeof this.props.buttonConfig.terraTemplate !== 'undefined' && this.props.buttonConfig.terraTemplate != null) { - const templateParam = this.props.buttonConfig.terraTemplate.map( + templateParam = this.props.buttonConfig.terraTemplate.map( x => '&template=' + x ).join(''); - console.log('321'); - console.log(templateParam); } window.location = `${this.props.buttonConfig.terraExportURL}?format=PFB${templateParam}&url=${url}`; }