Simplify actions.js

- merge fetchPredecessorRows & fetchSuccessorRows
- new function fetchSurroundingRows
- less code duplication

src/legacy/core_plugins/kibana/public/context/query/actions.js

@@ -30,7 +30,7 @@ import { FAILURE_REASONS, LOADING_STATUS } from './constants';
 
 export function QueryActionsProvider(Private, Promise) {
   const fetchAnchor = Private(fetchAnchorProvider);
-  const { fetchPredecessors, fetchSuccessors } = Private(fetchContextProvider);
+  const { fetchSurroundingDocs } = Private(fetchContextProvider);
   const {
     increasePredecessorCount,
     increaseSuccessorCount,
@@ -92,41 +92,45 @@ export function QueryActionsProvider(Private, Promise) {
       );
   };
 
-  const fetchPredecessorRows = (state) => () => {
+  const fetchSurroundingRows = (type, state) => {
     const {
-      queryParameters: { indexPatternId, filters, predecessorCount, sort, tieBreakerField },
+      queryParameters: { indexPatternId, filters,  sort, tieBreakerField },
       rows: { anchor },
     } = state;
+    const count = type === 'successors'
+      ? state.queryParameters.successorCount
+      : state.queryParameters.predecessorCount;
 
     if (!tieBreakerField) {
-      return Promise.reject(setFailedStatus(state)('predecessors', {
+      return Promise.reject(setFailedStatus(state)(type, {
         reason: FAILURE_REASONS.INVALID_TIEBREAKER
       }));
     }
 
-    setLoadingStatus(state)('predecessors');
+    setLoadingStatus(state)(type);
 
     return Promise.try(() => (
-      fetchPredecessors(
+      fetchSurroundingDocs(
+        type,
         indexPatternId,
         sort[0],
         sort[1],
         anchor.fields[sort[0]][0],
         anchor.sort[0],
         tieBreakerField,
         anchor.sort[1],
-        predecessorCount,
+        count,
         filters
       )
     ))
       .then(
-        (predecessorDocuments) => {
-          setLoadedStatus(state)('predecessors');
-          state.rows.predecessors = predecessorDocuments;
-          return predecessorDocuments;
+        (documents) => {
+          setLoadedStatus(state)(type);
+          state.rows[type] = documents;
+          return documents;
         },
         (error) => {
-          setFailedStatus(state)('predecessors', { error });
+          setFailedStatus(state)(type, { error });
           toastNotifications.addDanger({
             title: i18n.translate('kbn.context.unableToLoadDocumentDescription', {
               defaultMessage: 'Unable to load documents'
@@ -138,54 +142,10 @@ export function QueryActionsProvider(Private, Promise) {
       );
   };
 
-  const fetchSuccessorRows = (state) => () => {
-    const {
-      queryParameters: { indexPatternId, filters, sort, successorCount, tieBreakerField },
-      rows: { anchor },
-    } = state;
-
-    if (!tieBreakerField) {
-      return Promise.reject(setFailedStatus(state)('successors', {
-        reason: FAILURE_REASONS.INVALID_TIEBREAKER
-      }));
-    }
-
-    setLoadingStatus(state)('successors');
-
-    return Promise.try(() => (
-      fetchSuccessors(
-        indexPatternId,
-        sort[0],
-        sort[1],
-        anchor.fields[sort[0]][0],
-        anchor.sort[0],
-        tieBreakerField,
-        anchor.sort[1],
-        successorCount,
-        filters
-      )
-    ))
-      .then(
-        (successorDocuments) => {
-          setLoadedStatus(state)('successors');
-          state.rows.successors = successorDocuments;
-          return successorDocuments;
-        },
-        (error) => {
-          setFailedStatus(state)('successors', { error });
-          toastNotifications.addDanger({
-            title: 'Unable to load documents',
-            text: <MarkdownSimple>{error.message}</MarkdownSimple>,
-          });
-          throw error;
-        },
-      );
-  };
-
   const fetchContextRows = (state) => () => (
     Promise.all([
-      fetchPredecessorRows(state)(),
-      fetchSuccessorRows(state)(),
+      fetchSurroundingRows('predecessors', state),
+      fetchSurroundingRows('successors', state),
     ])
   );
 
@@ -206,22 +166,22 @@ export function QueryActionsProvider(Private, Promise) {
 
   const fetchGivenPredecessorRows = (state) => (count) => {
     setPredecessorCount(state)(count);
-    return fetchPredecessorRows(state)();
+    return fetchSurroundingRows('predecessors', state);
   };
 
   const fetchGivenSuccessorRows = (state) => (count) => {
     setSuccessorCount(state)(count);
-    return fetchSuccessorRows(state)();
+    return fetchSurroundingRows('successors', state);
   };
 
   const fetchMorePredecessorRows = (state) => () => {
     increasePredecessorCount(state)();
-    return fetchPredecessorRows(state)();
+    return fetchSurroundingRows('predecessors', state);
   };
 
   const fetchMoreSuccessorRows = (state) => () => {
     increaseSuccessorCount(state)();
-    return fetchSuccessorRows(state)();
+    return fetchSurroundingRows('successors', state);
   };
 
   const setAllRows = (state) => (predecessorRows, anchorRow, successorRows) => (
@@ -242,8 +202,6 @@ export function QueryActionsProvider(Private, Promise) {
     fetchGivenSuccessorRows,
     fetchMorePredecessorRows,
     fetchMoreSuccessorRows,
-    fetchPredecessorRows,
-    fetchSuccessorRows,
     setAllRows,
   };
 }