Merge pull request #6001 from martinpovolny/report_filter_page1

Report results: Multiple fixes.
ManageIQ · Aug 13, 2019 · 72b68f4 · 72b68f4
2 parents 5a4035f + 5f57362
commit 72b68f4
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/app/javascript/components/report-data-table.jsx b/app/javascript/components/report-data-table.jsx
@@ -16,7 +16,7 @@ import {
 import { API } from '../http_api';
 
 const cellFormatter = value => (
-  <TableCell className={value.style_class}>
+  <TableCell style={{ cursor: 'default' }} className={value.style_class}>
     {value.value}
   </TableCell>
 );
@@ -222,7 +222,12 @@ const ReportDataTable = (props) => {
 
   const filterKeyPress = (keyEvent) => {
     if (keyEvent.key === 'Enter') {
-      fetchReportPage(dispatch, props.reportResultId, state.sortingColumns, state.pagination, state.filter);
+      // navigate to page 1 when searching
+      const newPagination = {
+        ...state.pagination,
+        page: 1,
+      };
+      fetchReportPage(dispatch, props.reportResultId, state.sortingColumns, newPagination, state.filter);
       keyEvent.stopPropagation();
       keyEvent.preventDefault();
     }