Fix LazyMobXTable countHeader when only has 1 page (#4911)

* Fix LazyMobXTable countHeader when only has 1 page --------- Co-authored-by: lismana <[email protected]> Co-authored-by: alisman <[email protected]>
cBioPortal · May 24, 2024 · 20cf5ad · 20cf5ad
1 parent d1b6cd5
commit 20cf5ad
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/.../breadcrumbs_are_editable_for_mutation_count_chart_element_chrome_1600x1000.png b/.../breadcrumbs_are_editable_for_mutation_count_chart_element_chrome_1600x1000.png
diff --git a/...oadread_tcga_pub_switch_profiles_+_regression_line_element_chrome_1600x1000.png b/...oadread_tcga_pub_switch_profiles_+_regression_line_element_chrome_1600x1000.png
diff --git a/...nce/group_comparison_page_mutations_tab_two_groups_element_chrome_1600x1000.png b/...nce/group_comparison_page_mutations_tab_two_groups_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/end-to-end-test/remote/specs/core/groupComparisonLollipop.spec.js b/end-to-end-test/remote/specs/core/groupComparisonLollipop.spec.js
@@ -908,7 +908,7 @@ describe('group comparison mutations tab tests', function() {
 
             assert.equal(
                 getElementByTestHandle('LazyMobXTable_CountHeader').getText(),
-                '14 Mutations (page 1 of 1)'
+                '14 Mutations'
             );
 
             assert.equal(
@@ -921,7 +921,7 @@ describe('group comparison mutations tab tests', function() {
 
             assert.equal(
                 getElementByTestHandle('LazyMobXTable_CountHeader').getText(),
-                '1 Mutation (page 1 of 1)'
+                '1 Mutation'
             );
 
             assert.equal(
@@ -934,7 +934,7 @@ describe('group comparison mutations tab tests', function() {
 
             assert.equal(
                 getElementByTestHandle('LazyMobXTable_CountHeader').getText(),
-                '16 Mutations (page 1 of 1)'
+                '16 Mutations'
             );
 
             assert.equal(

diff --git a/end-to-end-test/remote/specs/core/screenshot.spec.js b/end-to-end-test/remote/specs/core/screenshot.spec.js
@@ -270,10 +270,10 @@ describe('patient view page screenshot test', function() {
         goToUrlAndSetLocalStorage(url);
 
         // should show 0 mutations
-        $('.//*[text()[contains(.,"0 Mutations")]]').waitForExist();
+        $('span*=0 Mutations').waitForExist();
 
         // should show 21.6% copy number altered in genomic overview
-        $('.//*[text()[contains(.,"21.6%")]]').waitForExist();
+        $('div*=21.6%').waitForExist();
 
         // take screenshot
         var res = browser.checkElement('#mainColumn', '', { hide: ['.qtip'] });

diff --git a/src/shared/components/lazyMobXTable/LazyMobXTable.tsx b/src/shared/components/lazyMobXTable/LazyMobXTable.tsx
@@ -1162,8 +1162,10 @@ export default class LazyMobXTable<T> extends React.Component<
                     fontWeight: 'bold',
                 }}
             >
-                {this.store.displayData.length} {this.store.itemsLabel} (page{' '}
-                {this.store.page + 1} of {this.store.maxPage + 1})
+                {this.store.displayData.length} {this.store.itemsLabel}
+                {this.store.maxPage + 1 > 1 &&
+                    ` (page ${this.store.page + 1} of ${this.store.maxPage +
+                        1})`}
             </h3>
         ) : (
             <span
@@ -1175,8 +1177,10 @@ export default class LazyMobXTable<T> extends React.Component<
                     fontWeight: 'bold',
                 }}
             >
-                {this.store.displayData.length} {this.store.itemsLabel} (page{' '}
-                {this.store.page + 1} of {this.store.maxPage + 1})
+                {this.store.displayData.length} {this.store.itemsLabel}
+                {this.store.maxPage + 1 > 1 &&
+                    ` (page ${this.store.page + 1} of ${this.store.maxPage +
+                        1})`}
             </span>
         );
     }