Fix issues around 'Show more'

cBioPortal · May 9, 2024 · f029412 · f029412
1 parent 399651d
commit f029412
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/shared/components/lazyMobXTable/LazyMobXTable.tsx b/src/shared/components/lazyMobXTable/LazyMobXTable.tsx
@@ -5,9 +5,9 @@ import {
     action,
     computed,
     IReactionDisposer,
+    makeObservable,
     observable,
     reaction,
-    makeObservable,
 } from 'mobx';
 import { observer, Observer } from 'mobx-react';
 import './styles.scss';
@@ -1129,6 +1129,8 @@ export default class LazyMobXTable<T> extends React.Component<
             textBeforeButtons: this.store.paginationStatusText,
             groupButtons: false,
             bsStyle: 'primary',
+            isResultLimitedAtMaxPage:
+                this.props.isResultLimited && this.isAtMaxPage(),
         };
         // override with given paginationProps if they exist
         if (this.props.paginationProps) {
@@ -1322,14 +1324,17 @@ export default class LazyMobXTable<T> extends React.Component<
         );
     }
 
+    private isAtMaxPage() {
+        return this.store.maxPage > 0 && this.store.page === this.store.maxPage;
+    }
+
     render() {
         return (
             <div className="lazy-mobx-table" data-test="LazyMobXTable">
                 <Observer>{this.getTopToolbar}</Observer>
                 <Observer>{this.getTable}</Observer>
                 {this.props.isResultLimited &&
-                    this.store.maxPage > 0 &&
-                    this.store.page === this.store.maxPage && (
+                    (this.store.showingAllRows || this.isAtMaxPage()) && (
                         <div className={'text-center alert alert-info'}>
                             <strong>
                                 You've reached the maximum viewable records.{' '}

diff --git a/src/shared/components/paginationControls/PaginationControls.tsx b/src/shared/components/paginationControls/PaginationControls.tsx
@@ -42,6 +42,7 @@ export interface IPaginationControlsProps {
     groupButtons?: boolean;
     hidePaginationIfOnePage?: boolean;
     bsStyle?: 'default' | 'primary' | 'success' | 'info' | 'warning';
+    isResultLimitedAtMaxPage?: boolean;
 }
 
 @observer
@@ -142,6 +143,7 @@ export class PaginationControls extends React.Component<
                     id="showMoreButton"
                     bsSize="sm"
                     disabled={
+                        this.props.isResultLimitedAtMaxPage ||
                         !this.props.itemsPerPageOptions ||
                         !this.props.itemsPerPage ||
                         !this.props.totalItems ||