Merge pull request cBioPortal#4420 from alisman/fxPlotsE2E

Plots tab option validation did not allow for the "none" selected value
thehyve · Nov 17, 2022 · 8c20f6e · 8c20f6e
2 parents 68fd100 + bf05e30
commit 8c20f6e
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 4 deletions.
diff --git a/...emote/screenshots/reference/group_by_detailed_type_element_chrome_1600x1000.png b/...emote/screenshots/reference/group_by_detailed_type_element_chrome_1600x1000.png
diff --git a/...s/reference/handles_change_to_absolute_value_yaxis_element_chrome_1600x1000.png b/...s/reference/handles_change_to_absolute_value_yaxis_element_chrome_1600x1000.png
diff --git a/...reference/handles_change_to_sample_total_threshold_element_chrome_1600x1000.png b/...reference/handles_change_to_sample_total_threshold_element_chrome_1600x1000.png
diff --git a/...eenshots/reference/handles_change_to_sort_of_xaxis_element_chrome_1600x1000.png b/...eenshots/reference/handles_change_to_sort_of_xaxis_element_chrome_1600x1000.png
diff --git a/...with_0_mutations_msk_impact_2017_p-0000053-t01-im3_element_chrome_1600x1000.png b/...with_0_mutations_msk_impact_2017_p-0000053-t01-im3_element_chrome_1600x1000.png
diff --git a/..._tab_multiple_studies_with_data_availability_alert_element_chrome_1600x1000.png b/..._tab_multiple_studies_with_data_availability_alert_element_chrome_1600x1000.png
diff --git a/...nce/profiled_in_tracks_in_multiple_study_with_sos1_element_chrome_1600x1000.png b/...nce/profiled_in_tracks_in_multiple_study_with_sos1_element_chrome_1600x1000.png
diff --git a/end-to-end-test/remote/specs/core/quickSearch.spec.js b/end-to-end-test/remote/specs/core/quickSearch.spec.js
@@ -36,7 +36,7 @@ describe('Quick Search', () => {
     });
 
     it('should give results for genes', () => {
-        $('strong=444 more genes (click to load 20 more)').click();
+        $('strong=448 more genes (click to load 20 more)').click();
         $('strong=ADAM12').waitForExist();
         $('strong=ADAM15').click();
         $('a=ADAM15').waitForExist({ timeout: 60000 });

diff --git a/src/pages/resultsView/plots/PlotsTab.tsx b/src/pages/resultsView/plots/PlotsTab.tsx
@@ -795,14 +795,16 @@ export default class PlotsTab extends React.Component<IPlotsTabProps, {}> {
 
                 // due to legacy urls, it's possible that selections can be made which
                 // are no longer avaiable.  this handles that case
-                const selectedDataTypeDoesNotExists = !_.some(
+                const selectedDataTypeDoesNotExist = !_.some(
                     dataTypeOptions,
-                    o => o.value === this._dataType
+                    o =>
+                        this._dataType === NONE_SELECTED_OPTION_STRING_VALUE ||
+                        o.value === this._dataType
                 );
 
                 if (
                     (this._dataType === undefined && dataTypeOptions.length) ||
-                    selectedDataTypeDoesNotExists
+                    selectedDataTypeDoesNotExist
                 ) {
                     // return computed default if _dataType is undefined and if there are options to select a default value from
                     if (