cBioPortal · alisman · May 6, 2021 · Apr 14, 2021
diff --git a/...enshots/reference/group_comparison_complex_venn_ab_element_chrome_1600x1000.png b/...enshots/reference/group_comparison_complex_venn_ab_element_chrome_1600x1000.png
diff --git a/...nshots/reference/group_comparison_complex_venn_abc_element_chrome_1600x1000.png b/...nshots/reference/group_comparison_complex_venn_abc_element_chrome_1600x1000.png
diff --git a/...nshots/reference/group_comparison_complex_venn_abd_element_chrome_1600x1000.png b/...nshots/reference/group_comparison_complex_venn_abd_element_chrome_1600x1000.png
diff --git a/...nshots/reference/group_comparison_complex_venn_acd_element_chrome_1600x1000.png b/...nshots/reference/group_comparison_complex_venn_acd_element_chrome_1600x1000.png
diff --git a/...enshots/reference/group_comparison_complex_venn_ad_element_chrome_1600x1000.png b/...enshots/reference/group_comparison_complex_venn_ad_element_chrome_1600x1000.png
diff --git a/...nshots/reference/group_comparison_complex_venn_bcd_element_chrome_1600x1000.png b/...nshots/reference/group_comparison_complex_venn_bcd_element_chrome_1600x1000.png
diff --git a/...joint_venn_diagram_view_with_a_group_selected_view_element_chrome_1600x1000.png b/...joint_venn_diagram_view_with_a_group_selected_view_element_chrome_1600x1000.png
diff --git a/..._comparison_page_overlap_tab_upset_groups_selected_element_chrome_1600x1000.png b/..._comparison_page_overlap_tab_upset_groups_selected_element_chrome_1600x1000.png
diff --git a/...iagram_view_with_overlap_and_session_selected_view_element_chrome_1600x1000.png b/...iagram_view_with_overlap_and_session_selected_view_element_chrome_1600x1000.png
diff --git a/...ison_tab_alteration_enrichments_tab_several_groups_element_chrome_1600x1000.png b/...ison_tab_alteration_enrichments_tab_several_groups_element_chrome_1600x1000.png
diff --git a/...ion_enrichments_tab_several_groups_only_truncating_element_chrome_1600x1000.png b/...ion_enrichments_tab_several_groups_only_truncating_element_chrome_1600x1000.png
diff --git a/...arison_tab_clinical_tab_bar_chart_chi_squared_test_element_chrome_1600x1000.png b/...arison_tab_clinical_tab_bar_chart_chi_squared_test_element_chrome_1600x1000.png
diff --git a/...ab_include_overlapping_samples_kruskal_wallis_test_element_chrome_1600x1000.png b/...ab_include_overlapping_samples_kruskal_wallis_test_element_chrome_1600x1000.png
diff --git a/...on_tab_clinical_tab_log_scale__kruskal_wallis_test_element_chrome_1600x1000.png b/...on_tab_clinical_tab_log_scale__kruskal_wallis_test_element_chrome_1600x1000.png
diff --git a/...chart_exclude_overlapping_samples_chi_squared_test_element_chrome_1600x1000.png b/...chart_exclude_overlapping_samples_chi_squared_test_element_chrome_1600x1000.png
diff --git a/...ab_clinical_tab_stacked_bar_chart_chi_squared_test_element_chrome_1600x1000.png b/...ab_clinical_tab_stacked_bar_chart_chi_squared_test_element_chrome_1600x1000.png
diff --git a/...stacked_bar_chart_horizontal_bars_chi_squared_test_element_chrome_1600x1000.png b/...stacked_bar_chart_horizontal_bars_chi_squared_test_element_chrome_1600x1000.png
diff --git a/...tab_stacked_bar_chart_swaped_axes_chi_squared_test_element_chrome_1600x1000.png b/...tab_stacked_bar_chart_swaped_axes_chi_squared_test_element_chrome_1600x1000.png
diff --git a/...n_tab_clinical_tab_swaped_axes_kruskal_wallis_test_element_chrome_1600x1000.png b/...n_tab_clinical_tab_swaped_axes_kruskal_wallis_test_element_chrome_1600x1000.png
diff --git a/...rence/results_view_comparison_tab_complex_venn_abc_element_chrome_1600x1000.png b/...rence/results_view_comparison_tab_complex_venn_abc_element_chrome_1600x1000.png
diff --git a/...rence/results_view_comparison_tab_complex_venn_abd_element_chrome_1600x1000.png b/...rence/results_view_comparison_tab_complex_venn_abd_element_chrome_1600x1000.png
diff --git a/...rence/results_view_comparison_tab_complex_venn_acd_element_chrome_1600x1000.png b/...rence/results_view_comparison_tab_complex_venn_acd_element_chrome_1600x1000.png
diff --git a/...erence/results_view_comparison_tab_complex_venn_ad_element_chrome_1600x1000.png b/...erence/results_view_comparison_tab_complex_venn_ad_element_chrome_1600x1000.png
diff --git a/...ults_view_comparison_tab_delete_group_from_session_element_chrome_1600x1000.png b/...ults_view_comparison_tab_delete_group_from_session_element_chrome_1600x1000.png
diff --git a/...comparison_tab_mrna_enrichments_tab_several_groups_element_chrome_1600x1000.png b/...comparison_tab_mrna_enrichments_tab_several_groups_element_chrome_1600x1000.png
diff --git a/...iew_comparison_tab_mrna_enrichments_tab_two_groups_element_chrome_1600x1000.png b/...iew_comparison_tab_mrna_enrichments_tab_two_groups_element_chrome_1600x1000.png
diff --git a/...joint_venn_diagram_view_with_a_group_selected_view_element_chrome_1600x1000.png b/...joint_venn_diagram_view_with_a_group_selected_view_element_chrome_1600x1000.png
diff --git a/...arison_tab_overlap_tab_upset_deselect_active_group_element_chrome_1600x1000.png b/...arison_tab_overlap_tab_upset_deselect_active_group_element_chrome_1600x1000.png
diff --git a/...w_comparison_tab_overlap_tab_upset_groups_selected_element_chrome_1600x1000.png b/...w_comparison_tab_overlap_tab_upset_groups_selected_element_chrome_1600x1000.png
diff --git a/...ts_view_comparison_tab_overlap_tab_upset_plot_view_element_chrome_1600x1000.png b/...ts_view_comparison_tab_overlap_tab_upset_plot_view_element_chrome_1600x1000.png
diff --git a/...iagram_view_with_overlap_and_session_selected_view_element_chrome_1600x1000.png b/...iagram_view_with_overlap_and_session_selected_view_element_chrome_1600x1000.png
diff --git a/...nn_diagram_view_with_overlap_deselect_active_group_element_chrome_1600x1000.png b/...nn_diagram_view_with_overlap_deselect_active_group_element_chrome_1600x1000.png
diff --git a/...son_tab_overlap_tab_venn_diagram_with_overlap_view_element_chrome_1600x1000.png b/...son_tab_overlap_tab_venn_diagram_with_overlap_view_element_chrome_1600x1000.png
diff --git a/...rison_tab_survival_tab_exclude_overlapping_samples_element_chrome_1600x1000.png b/...rison_tab_survival_tab_exclude_overlapping_samples_element_chrome_1600x1000.png
diff --git a/...rison_tab_survival_tab_include_overlapping_samples_element_chrome_1600x1000.png b/...rison_tab_survival_tab_include_overlapping_samples_element_chrome_1600x1000.png
diff --git a/src/pages/groupComparison/OverlapExclusionIndicator.tsx b/src/pages/groupComparison/OverlapExclusionIndicator.tsx
@@ -74,12 +74,17 @@ export default class OverlapExclusionIndicator extends React.Component<
                 summary = (
                     <span>
                         {groupNames}
-                        {` ${is} completely overlapping with other selected groups, so `}
-                        {this.props.overlapTabMode
-                            ? `${is} excluded from analysis in other tabs.`
-                            : `${
-                                  excludedGroups.length === 1 ? 'has' : 'have'
-                              } been excluded from this analysis.`}
+                        {` ${is} completely overlapping with other selected groups and ${is} ${
+                            this.props.store.overlapStrategy ===
+                            OverlapStrategy.EXCLUDE
+                                ? 'excluded'
+                                : 'included'
+                        } in ${
+                            this.props.overlapTabMode
+                                ? 'other tabs'
+                                : 'the analysis below'
+                        }`}
+                        .
                     </span>
                 );
             }

diff --git a/src/pages/groupComparison/OverlapUtils.spec.tsx b/src/pages/groupComparison/OverlapUtils.spec.tsx
@@ -46,7 +46,9 @@ describe('OverlapUtils', () => {
                     <>
                         (<strong>1</strong>)&nbsp;
                     </>
-                    nameA
+                    <span style={{ fontWeight: 'bold', fontStyle: 'italic' }}>
+                        nameA
+                    </span>
                 </span>
             );
             expect(
@@ -63,14 +65,22 @@ describe('OverlapUtils', () => {
                         <>
                             (<strong>1</strong>)&nbsp;
                         </>
-                        nameA
+                        <span
+                            style={{ fontWeight: 'bold', fontStyle: 'italic' }}
+                        >
+                            nameA
+                        </span>
                     </span>{' '}
                     and{' '}
                     <span>
                         <>
                             (<strong>B</strong>)&nbsp;
                         </>
-                        nameB
+                        <span
+                            style={{ fontWeight: 'bold', fontStyle: 'italic' }}
+                        >
+                            nameB
+                        </span>
                     </span>
                 </span>
             );
@@ -89,21 +99,33 @@ describe('OverlapUtils', () => {
                         <>
                             (<strong>1</strong>)&nbsp;
                         </>
-                        nameA
+                        <span
+                            style={{ fontWeight: 'bold', fontStyle: 'italic' }}
+                        >
+                            nameA
+                        </span>
                     </span>
                     ,{' '}
                     <span>
                         <>
                             (<strong>2</strong>)&nbsp;
                         </>
-                        nameB
+                        <span
+                            style={{ fontWeight: 'bold', fontStyle: 'italic' }}
+                        >
+                            nameB
+                        </span>
                     </span>
                     , and{' '}
                     <span>
                         <>
                             (<strong>3</strong>)&nbsp;
                         </>
-                        nameC
+                        <span
+                            style={{ fontWeight: 'bold', fontStyle: 'italic' }}
+                        >
+                            nameC
+                        </span>
                     </span>
                 </span>
             );
@@ -123,28 +145,44 @@ describe('OverlapUtils', () => {
                         <>
                             (<strong>1</strong>)&nbsp;
                         </>
-                        nameA
+                        <span
+                            style={{ fontWeight: 'bold', fontStyle: 'italic' }}
+                        >
+                            nameA
+                        </span>
                     </span>
                     ,{' '}
                     <span>
                         <>
                             (<strong>2</strong>)&nbsp;
                         </>
-                        nameB
+                        <span
+                            style={{ fontWeight: 'bold', fontStyle: 'italic' }}
+                        >
+                            nameB
+                        </span>
                     </span>
                     ,{' '}
                     <span>
                         <>
                             (<strong>3</strong>)&nbsp;
                         </>
-                        nameC
+                        <span
+                            style={{ fontWeight: 'bold', fontStyle: 'italic' }}
+                        >
+                            nameC
+                        </span>
                     </span>
                     , and{' '}
                     <span>
                         <>
                             (<strong>4</strong>)&nbsp;
                         </>
-                        nameD
+                        <span
+                            style={{ fontWeight: 'bold', fontStyle: 'italic' }}
+                        >
+                            nameD
+                        </span>
                     </span>
                 </span>
             );

diff --git a/src/pages/groupComparison/OverlapUtils.tsx b/src/pages/groupComparison/OverlapUtils.tsx
@@ -52,7 +52,8 @@ export function getExcludedIndexes(
 }
 
 export function renderGroupNameWithOrdinal(
-    group: Pick<ComparisonGroup, 'name' | 'ordinal'>
+    group: Pick<ComparisonGroup, 'name' | 'ordinal'>,
+    highlight?: boolean
 ) {
     return (
         <span>
@@ -61,7 +62,12 @@ export function renderGroupNameWithOrdinal(
                     (<strong>{group.ordinal}</strong>)&nbsp;
                 </>
             )}
-            {group.name}
+            {highlight && (
+                <span style={{ fontWeight: 'bold', fontStyle: 'italic' }}>
+                    {group.name}
+                </span>
+            )}
+            {!highlight && group.name}
         </span>
     );
 }
@@ -70,7 +76,7 @@ export function joinGroupNames(
     groups: Pick<ComparisonGroup, 'name' | 'ordinal'>[],
     conj: string
 ) {
-    const names = groups.map(renderGroupNameWithOrdinal);
+    const names = groups.map(group => renderGroupNameWithOrdinal(group, true));
     switch (names.length) {
         case 0:
             return <span></span>;