Merge branch '7.x' into backport/7.x/pr-80705

elastic · Oct 27, 2020 · cbac731 · cbac731
2 parents e3524c2 + 61ac72e
commit cbac731
Show file tree

Hide file tree

Showing 99 changed files with 3,536 additions and 2,436 deletions.
diff --git a/src/plugins/discover/public/application/angular/context_app.html b/src/plugins/discover/public/application/angular/context_app.html
@@ -10,7 +10,6 @@
 >
 </kbn-top-nav>
 
-
 <!-- Error feedback -->
 <context-error-message
   status="contextApp.state.loadingStatus.anchor.status"
@@ -21,43 +20,23 @@
   class="kuiViewContent kuiViewContentItem"
   ng-if="contextApp.state.loadingStatus.anchor.status !== contextApp.constants.LOADING_STATUS.FAILED"
 >
-  <!-- Controls -->
-  <context-action-bar
-        default-step-size="contextApp.state.queryParameters.defaultStepSize"
-        doc-count="contextApp.state.queryParameters.predecessorCount"
-        doc-count-available="contextApp.state.rows.predecessors.length"
-        is-disabled="contextApp.state.loadingStatus.anchor.status !== contextApp.constants.LOADING_STATUS.LOADED"
-        is-loading="![
-        contextApp.constants.LOADING_STATUS.LOADED,
-        contextApp.constants.LOADING_STATUS.FAILED,
-        ].includes(contextApp.state.loadingStatus.predecessors.status)"
-        on-change-count="contextApp.actions.fetchGivenPredecessorRows"
-        type="'predecessors'"
-  ></context-action-bar>
-
   <!-- Table -->
   <context-app-legacy
     filter="contextApp.actions.addFilter"
     hits="contextApp.state.rows.all"
     index-pattern="contextApp.indexPattern"
     sorting="contextApp.state.queryParameters.sort"
     columns="contextApp.state.queryParameters.columns"
-    infinite-scroll="true"
     minimum-visible-rows="contextApp.state.rows.all.length"
     status="contextApp.state.loadingStatus.anchor.status"
-  ></context-app-legacy>
-
-  <!-- Controls -->
-  <context-action-bar
     default-step-size="contextApp.state.queryParameters.defaultStepSize"
-    doc-count="contextApp.state.queryParameters.successorCount"
-    doc-count-available="contextApp.state.rows.successors.length"
-    is-disabled="contextApp.state.loadingStatus.anchor.status !== contextApp.constants.LOADING_STATUS.LOADED"
-    is-loading="![
-    contextApp.constants.LOADING_STATUS.LOADED,
-    contextApp.constants.LOADING_STATUS.FAILED,
-    ].includes(contextApp.state.loadingStatus.successors.status)"
-    on-change-count="contextApp.actions.fetchGivenSuccessorRows"
-    type="'successors'"
-  ></context-action-bar>
+    predecessor-count="contextApp.state.queryParameters.predecessorCount"
+    predecessor-available="contextApp.state.rows.predecessors.length"
+    predecessor-status="contextApp.state.loadingStatus.predecessors.status"
+    on-change-predecessor-count="contextApp.actions.fetchGivenPredecessorRows"
+    successor-count="contextApp.state.queryParameters.successorCount"
+    successor-available="contextApp.state.rows.successors.length"
+    successor-status="contextApp.state.loadingStatus.successors.status"
+    on-change-successor-count="contextApp.actions.fetchGivenSuccessorRows"
+  ></context-app-legacy>
 </main>