addresses comments

dplumlee · dplumlee · commit 376da4356faa · 2020-02-18T13:23:13.000-05:00
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/alerts/selectors.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/alerts/selectors.ts
@@ -28,15 +28,23 @@ export const alertListPagination = (state: AlertListState) => {
  * Returns a boolean based on whether or not the user is on the alerts page
  */
 export const isOnAlertPage = (state: AlertListState): boolean => {
-  return state.location ? state.location.pathname.endsWith('/alerts') : false;
+  return state.location ? state.location.pathname === '/alerts' : false;
 };
 
 /**
  * Returns the query object received from parsing the URL query params
  */
 export const paginationDataFromUrl = (state: AlertListState): qs.ParsedUrlQuery => {
-  // Removes the `?` from the beginning of query string if it exists
-  return state.location ? qs.parse(state.location.search.slice(1)) : {};
+  if (state.location) {
+    // Removes the `?` from the beginning of query string if it exists
+    const query = qs.parse(state.location.search.slice(1));
+    return {
+      ...(query.page_size ? { page_size: query.page_size } : {}),
+      ...(query.page_index ? { page_index: query.page_index } : {}),
+    };
+  } else {
+    return {};
+  }
 };
 
 /**
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
@@ -71,7 +71,7 @@ export const AlertIndex = memo(() => {
   const { pageIndex, pageSize, total } = useAlertListSelector(selectors.alertListPagination);
   const urlFromNewPageSizeParam = useAlertListSelector(selectors.urlFromNewPageSizeParam);
   const urlFromNewPageIndexParam = useAlertListSelector(selectors.urlFromNewPageIndexParam);
-  const json = useAlertListSelector(selectors.alertListData);
+  const alertListData = useAlertListSelector(selectors.alertListData);
 
   const onChangeItemsPerPage = useCallback(
     newPageSize => history.push(urlFromNewPageSizeParam(newPageSize)),
@@ -91,7 +91,7 @@ export const AlertIndex = memo(() => {
         return null;
       }
 
-      const row = json[rowIndex % pageSize];
+      const row = alertListData[rowIndex % pageSize];
 
       if (columnId === 'alert_type') {
         return i18n.translate(
@@ -117,13 +117,13 @@ export const AlertIndex = memo(() => {
       }
       return null;
     };
-  }, [json, pageSize, total]);
+  }, [alertListData, pageSize, total]);
 
   const pagination = useMemo(() => {
     return {
       pageIndex,
       pageSize,
-      pageSizeOptions: [10, 50, 100],
+      pageSizeOptions: [10, 20, 50],
       onChangeItemsPerPage,
       onChangePage,
     };
