addresses comments

elastic · Feb 29, 2020 · d0880d5 · d0880d5
1 parent 9508391
commit d0880d5
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/alerts/index.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/alerts/index.tsx
@@ -21,9 +21,10 @@ import {
   EuiPageContentHeader,
   EuiPageContentHeaderSection,
   EuiPageContentBody,
+  EuiLink,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useHistory, Link } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { urlFromQueryParams } from './url_from_query_params';
 import { AlertData } from '../../../../../common/types';
@@ -141,17 +142,19 @@ export const AlertIndex = memo(() => {
 
       if (columnId === 'alert_type') {
         return (
-          <Link
+          <EuiLink
             data-testid="alertTypeCellLink"
-            to={urlFromQueryParams({ ...queryParams, selected_alert: row.id })}
+            onClick={() =>
+              history.push(urlFromQueryParams({ ...queryParams, selected_alert: row.id }))
+            }
           >
             {i18n.translate(
               'xpack.endpoint.application.endpoint.alerts.alertType.maliciousFileDescription',
               {
                 defaultMessage: 'Malicious File',
               }
             )}
-          </Link>
+          </EuiLink>
         );
       } else if (columnId === 'event_type') {
         return row.event.action;
@@ -184,7 +187,7 @@ export const AlertIndex = memo(() => {
       }
       return null;
     };
-  }, [alertListData, timestampForRows, pageSize, queryParams, total]);
+  }, [total, alertListData, pageSize, history, queryParams, timestampForRows]);
 
   const pagination = useMemo(() => {
     return {
@@ -196,6 +199,14 @@ export const AlertIndex = memo(() => {
     };
   }, [onChangeItemsPerPage, onChangePage, pageIndex, pageSize]);
 
+  const columnVisibility = useMemo(
+    () => ({
+      visibleColumns,
+      setVisibleColumns,
+    }),
+    [setVisibleColumns, visibleColumns]
+  );
+
   const selectedAlertData = useAlertListSelector(selectors.selectedAlertDetailsData);
 
   return (
@@ -236,13 +247,7 @@ export const AlertIndex = memo(() => {
                 aria-label="Alert List"
                 rowCount={total}
                 columns={columns}
-                columnVisibility={useMemo(
-                  () => ({
-                    visibleColumns,
-                    setVisibleColumns,
-                  }),
-                  [setVisibleColumns, visibleColumns]
-                )}
+                columnVisibility={columnVisibility}
                 renderCellValue={renderCellValue}
                 pagination={pagination}
                 data-test-subj="alertListGrid"