Skip to content

Commit

Permalink
Merge pull request #2851 from alisman/coexOnly
Browse files Browse the repository at this point in the history
Take down coexpression tab ONLY on cbioportal.org hosts.  Skip coexpr…

Former-commit-id: 704ef20c45c20971975a60f192c9f083c8a7d3c0
  • Loading branch information
alisman authored Nov 7, 2019
2 parents e511629 + ea3fa67 commit aa92e8e
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var {
} = require('../../../shared/specUtils');


describe("coexpression tab screenshot tests", function() {
describe.skip("coexpression tab screenshot tests", function() {

this.retries(2);

Expand Down
4 changes: 2 additions & 2 deletions end-to-end-test/remote/specs/core/results.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ describe('Results Page', function() {
assert(!browser.isVisible(`${noBannerSelector}.mutations-oql-status-banner`));
assert(!browser.isVisible(`${unaffectedBannerSelector}.mutations-oql-status-banner`));
});
it("should not be present in coexpression tab with simple query", function(){
it.skip("should not be present in coexpression tab with simple query", function(){
browser.click("a.tabAnchor_coexpression");
browser.pause(500);
assert(!browser.isVisible(`${yesBannerSelector}.coexp-oql-status-banner`));
Expand Down Expand Up @@ -296,7 +296,7 @@ describe('Results Page', function() {
assert(!browser.isVisible(`${noBannerSelector}.mutations-oql-status-banner`));
assert(browser.isVisible(`${unaffectedBannerSelector}.mutations-oql-status-banner`));
});
it("should be present in coexpression tab with explicit query", function(){
it.skip("should be present in coexpression tab with explicit query", function(){
browser.click("a.tabAnchor_coexpression");
browser.waitForVisible(`${noBannerSelector}.coexp-oql-status-banner`, 10000);
assert(!browser.isVisible(`${yesBannerSelector}.coexp-oql-status-banner`));
Expand Down
1 change: 0 additions & 1 deletion end-to-end-test/remote/specs/core/screenshot.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ describe('expression tab', function() {
});
});


describe("download tab screenshot tests", function() {
it("download tab - msk_impact_2017 with ALK and SOS1 - SOS1 should be not sequenced", function() {
var url = `${CBIOPORTAL_URL}/index.do?cancer_study_id=msk_impact_2017&Z_SCORE_THRESHOLD=2&RPPA_SCORE_THRESHOLD=2&data_priority=0&case_set_id=msk_impact_2017_all&gene_list=ALK%2520SOS1&geneset_list=+&tab_index=tab_visualize&Action=Submit&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=msk_impact_2017_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=msk_impact_2017_cna`;
Expand Down
2 changes: 1 addition & 1 deletion env/master.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export CBIOPORTAL_URL="https://www.cbioportal.org"
export CBIOPORTAL_URL="https://master.cbioportal.org"
export GENOME_NEXUS_URL="https://www.genomenexus.org"
17 changes: 13 additions & 4 deletions src/pages/resultsView/ResultsViewPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as React from 'react';
import * as _ from 'lodash';
import $ from 'jquery';
import {If, Then, Else} from 'react-if';
import URL from 'url';
import { inject, observer } from 'mobx-react';
import { computed, observable, reaction, runInAction } from 'mobx';
Expand Down Expand Up @@ -341,10 +342,18 @@ export default class ResultsViewPage extends React.Component<
id={ResultsViewTab.COEXPRESSION}
linkText={'Co-expression'}
>
<div className={"alert alert-info"}>
The Coexpression feature is temporarily down for maintenance (11/7/2019). Please check again tomorrow.
</div>
{/*<CoExpressionTab store={store} />*/}
<If condition={getBrowserWindow().location.hostname.includes("cbioportal.org")}>
<Then>
<div className={"alert alert-info"}>
The Coexpression feature is temporarily down for maintenance (11/7/2019). Please check again tomorrow.
</div>
</Then>
<Else>
{()=>{
return <CoExpressionTab store={store} />
}}
</Else>
</If>
</MSKTab>
);
},
Expand Down

0 comments on commit aa92e8e

Please sign in to comment.