[Discover] Improve a little

elastic · Jul 30, 2024 · de39fc4 · de39fc4
1 parent f123193
commit de39fc4
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/packages/kbn-unified-data-table/src/components/data_table_document_selection.tsx b/packages/kbn-unified-data-table/src/components/data_table_document_selection.tsx
@@ -177,13 +177,16 @@ export function DataTableDocumentToolbarBtn({
     getCountOfSelectedDocs,
   } = selectedDocsState;
 
-  const areAllDocsOnCurrentPageSelected = () => {
+  const shouldSuggestToSelectAll = useMemo(() => {
+    if (isFilterActive || !(selectedDocIds.length < rows.length && rows.length > 1)) {
+      return false;
+    }
     const docIdsFromCurrentPage = getDocIdsForCurrentPage(rows, pageIndex, pageSize);
     if (!docIdsFromCurrentPage?.length) {
       return false;
     }
-    return getCountOfSelectedDocs(docIdsFromCurrentPage) === pageSize;
-  };
+    return getCountOfSelectedDocs(docIdsFromCurrentPage) === docIdsFromCurrentPage.length;
+  }, [getCountOfSelectedDocs, rows, pageIndex, pageSize, selectedDocIds.length, isFilterActive]);
 
   const getMenuItems = useCallback(() => {
     return [
@@ -358,10 +361,7 @@ export function DataTableDocumentToolbarBtn({
       <EuiFlexItem className="unifiedDataTableToolbarControlButton" grow={false}>
         {selectedRowsMenuButton}
       </EuiFlexItem>
-      {!isFilterActive &&
-      selectedDocIds.length < rows.length &&
-      rows.length > 1 &&
-      areAllDocsOnCurrentPageSelected() ? (
+      {shouldSuggestToSelectAll ? (
         <EuiFlexItem className="unifiedDataTableToolbarControlButton" grow={false}>
           <EuiDataGridToolbarControl
             data-test-subj="dscGridSelectAllDocs"