Skip to content

Commit

Permalink
Merge pull request #4542 from aditygrg2/tweak-onco
Browse files Browse the repository at this point in the history 
Oncoprint Add Track UI Tweak
  • Loading branch information
@alisman
alisman authored Apr 17, 2023
2 parents 9e1a37c + d8e880d commit bb350fa
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 54 deletions.
28 changes: 23 additions & 5 deletions end-to-end-test/local/specs/core/studyview.screenshot.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {
setDropdownOpen,
jsApiHover,
getElementByTestHandle,
jq,
} = require('../../../shared/specUtils');

const CBIOPORTAL_URL = process.env.CBIOPORTAL_URL.replace(/\/$/, '');
Expand All @@ -25,7 +26,9 @@ const CANCER_GENE_FILTER_ICON = "[data-test='header-filter-icon']";
const ADD_CUSTOM_CHART_TAB = '.addChartTabs a.tabAnchor.tabAnchor_Custom_Data';

describe('study view generic assay categorical/binary features', function() {
it('generic assay pie chart should be added in the summary tab', () => {
it.skip('generic assay pie chart should be added in the summary tab', function() {
this.retries(0);

const url = `${CBIOPORTAL_URL}/study?id=lgg_ucsf_2014_test_generic_assay`;
goToUrlAndSetLocalStorage(url, true);

Expand All @@ -38,6 +41,7 @@ describe('study view generic assay categorical/binary features', function() {
$(ADD_CHART_GENERIC_ASSAY_TAB).waitForDisplayed({
timeout: WAIT_FOR_VISIBLE_TIMEOUT,
});
//browser.debug();
$(ADD_CHART_GENERIC_ASSAY_TAB).click();

// Select category mutational signature profile
Expand All @@ -57,10 +61,11 @@ describe('study view generic assay categorical/binary features', function() {

// wait for generic assay data loading complete
// and select a option
$('div[data-test="GenericAssaySelection"]').waitForExist();
$('div[data-test="GenericAssaySelection"] input').setValue(
$('div[data-test="GenericAssayEntitySelection"]').waitForExist();
$('div[data-test="GenericAssayEntitySelection"] input').setValue(
'mutational_signature_category_10'
);

$('div=Select all filtered options (1)').waitForExist();
$('div=Select all filtered options (1)').click();
// close the dropdown
Expand All @@ -69,13 +74,26 @@ describe('study view generic assay categorical/binary features', function() {
var selectedOptions = $$('div[class$="multiValue"]');
assert.equal(selectedOptions.length, 1);

// this needs to be done twice for some reason on circleci
$('button=Add Chart').click();
$('button=Add Chart').click();
//$('button=Add Chart').click();
// Wait for chart to be added
waitForNetworkQuiet();

const res = checkElementWithMouseDisabled(
'div[data-test="chart-container-mutational_signature_category_10_mutational_signature_category_v2"]'
// allow time to render
browser.pause(1000);

const el = jq(
"[data-test*='chart-container-mutational_signature_category_10_mutational']"
);
const att = $(el[0]).getAttribute('data-test');

console.log('AARON');
console.log(att);

const res = checkElementWithMouseDisabled(`[data-test='${att}']`);

assertScreenShotMatch(res);
});
});
Expand Down
Binary file modified ...s/reference/excluding_unprofiled_samples_plots_tab_element_chrome_1600x1000.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ric_assay_chart_should_be_added_in_the_summary_tab_element_chrome_1600x1000.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 12 additions & 5 deletions end-to-end-test/remote/specs/core/studyview.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,8 @@ describe('submit genes to results view query', () => {
goToUrlAndSetLocalStorage(url);
waitForNetworkQuiet();
});
it('generic assay chart should be added in the summary tab', () => {
it('generic assay chart should be added in the summary tab', function() {
this.retries(0);
$(ADD_CHART_BUTTON).waitForEnabled({
timeout: 60000,
});
Expand All @@ -735,17 +736,23 @@ describe('submit genes to results view query', () => {

// wait for generic assay data loading complete
// and select a option
$('div[data-test="GenericAssaySelection"]').waitForExist();
$('div[data-test="GenericAssaySelection"] input').setValue(
'Prasinovirus'
);
$(
'div[data-test="GenericAssayEntitySelection"] #react-select-3-input'
).waitForExist();
$(
'div[data-test="GenericAssayEntitySelection"] #react-select-3-input'
).setValue('Prasinovirus');

$('div=Select all filtered options (1)').click();
// close the dropdown
var indicators = $$('div[class$="indicatorContainer"]');
indicators[0].click();
var selectedOptions = $$('div[class$="multiValue"]');
assert.equal(selectedOptions.length, 1);

// this is necessary to get the options selection to "take"
$(ADD_CHART_GENERIC_ASSAY_TAB).click();

$('button=Add Chart').click();
// Wait for chart to be added
waitForNetworkQuiet();
Expand Down
2 changes: 2 additions & 0 deletions end-to-end-test/shared/specUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,8 @@ function checkElementWithMouseDisabled(selector, pauseTime, options) {
);
});

$(selector).waitForExist({ timeout: 5000 });

const ret = checkElementWithTemporaryClass(
selector,
selector,
Expand Down
95 changes: 51 additions & 44 deletions src/pages/studyView/addChartButton/genericAssaySelection/GenericAssaySelection.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ export default class GenericAssaySelection extends React.Component<
: 'auto',
}}
>
<div data-test="GenericAssayEntitySelection">
<div data-test="GenericAssayProfileSelection">
{/* {this.isSelectedGenericAssayOptionsOverLimit && (
<div className="alert alert-warning">
<i
Expand All @@ -355,60 +355,67 @@ export default class GenericAssaySelection extends React.Component<
</div>
)} */}
<Select
name="generic-assay-select"
placeholder={
this.overridePlaceHolderText
? this.overridePlaceHolderText
: `Search for ${deriveDisplayTextFromGenericAssayType(
this.props.genericAssayType,
true
)}...`
}
closeMenuOnSelect={false}
value={this.selectedGenericAssaysJS}
isMulti
value={this.selectedProfileOption}
onChange={this.handleProfileSelect}
options={this.props.molecularProfileOptions}
isClearable={false}
options={this.showingGenericAssayOptions}
filterOption={this.filterGenericAssayOption}
onInputChange={this.onGenericAssayInputChange}
onChange={this.onSelectGenericAssayEntities}
noOptionsMessage={() => 'No results'}
styles={{
multiValueLabel: (base: any) => ({
...base,
whiteSpace: 'normal',
}),
}}
components={{
MenuList: MenuList,
MenuListHeader: (
<MenuListHeader
current={
this.filteredGenericAssayOptions.length
}
total={
this.props.genericAssayEntityOptions
.length
}
/>
),
}}
isSearchable={false}
/>
</div>
<div style={{ display: 'flex', marginTop: 10 }}>
<div
style={{
display: 'flex',
marginTop: 10,
alignItems: 'center',
}}
>
<div
data-test="GenericAssayProfileSelection"
data-test="GenericAssayEntitySelection"
style={{
flex: 1,
marginRight: 15,
}}
>
<Select
value={this.selectedProfileOption}
onChange={this.handleProfileSelect}
options={this.props.molecularProfileOptions}
name="generic-assay-select"
placeholder={
this.overridePlaceHolderText
? this.overridePlaceHolderText
: `Search for ${deriveDisplayTextFromGenericAssayType(
this.props.genericAssayType,
true
)}...`
}
closeMenuOnSelect={false}
value={this.selectedGenericAssaysJS}
isMulti
isClearable={false}
isSearchable={false}
options={this.showingGenericAssayOptions}
filterOption={this.filterGenericAssayOption}
onInputChange={this.onGenericAssayInputChange}
onChange={this.onSelectGenericAssayEntities}
noOptionsMessage={() => 'No results'}
styles={{
multiValueLabel: (base: any) => ({
...base,
whiteSpace: 'normal',
}),
}}
components={{
MenuList: MenuList,
MenuListHeader: (
<MenuListHeader
current={
this.filteredGenericAssayOptions
.length
}
total={
this.props.genericAssayEntityOptions
.length
}
/>
),
}}
/>
</div>
<button
Expand Down

0 comments on commit bb350fa

Please sign in to comment.