fix skip

patrykkopycinski · patrykkopycinski · commit 987899a725dc · 2020-08-31T16:27:57.000+02:00
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
@@ -47,6 +47,7 @@ interface UseAllHost {
   docValueFields?: DocValueFields[];
   filterQuery?: ESTermQuery | string;
   endDate: string;
+  skip?: boolean;
   startDate: string;
   type: hostsModel.HostsType;
 }
@@ -55,6 +56,7 @@ export const useAllHost = ({
   docValueFields,
   filterQuery,
   endDate,
+  skip = false,
   startDate,
   type,
 }: UseAllHost): [boolean, HostsArgs] => {
@@ -189,7 +191,7 @@ export const useAllHost = ({
           field: sortField,
         },
       };
-      if (!deepEqual(prevRequest, myRequest)) {
+      if (!skip && !deepEqual(prevRequest, myRequest)) {
         return myRequest;
       }
       return prevRequest;
@@ -202,6 +204,7 @@ export const useAllHost = ({
     endDate,
     filterQuery,
     limit,
+    skip,
     startDate,
     sortField,
   ]);
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/overview/_index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/overview/_index.tsx
@@ -9,10 +9,9 @@
 import deepEqual from 'fast-deep-equal';
 import { noop } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { useSelector, shallowEqual } from 'react-redux';
 
 import { DEFAULT_INDEX_KEY } from '../../../../../common/constants';
-import { inputsModel, inputsSelectors, State } from '../../../../common/store';
+import { inputsModel } from '../../../../common/store';
 import { useKibana } from '../../../../common/lib/kibana';
 import {
   HostItem,
@@ -46,13 +45,10 @@ interface UseHostOverview {
 export const useHostOverview = ({
   endDate,
   hostName,
-  skip,
+  skip = false,
   startDate,
   id = ID,
 }: UseHostOverview): [boolean, HostOverviewArgs] => {
-  const getQuery = inputsSelectors.globalQueryByIdSelector();
-  // @ts-expect-error
-  const { isInspected } = useSelector((state: State) => getQuery(state, id), shallowEqual);
   const { data, notifications, uiSettings } = useKibana().services;
   const refetch = useRef<inputsModel.Refetch>(noop);
   const abortCtrl = useRef(new AbortController());
@@ -62,13 +58,11 @@ export const useHostOverview = ({
     defaultIndex,
     hostName,
     factoryQueryType: HostsQueries.hostOverview,
-    skip,
     timerange: {
       interval: '12h',
       from: startDate,
       to: endDate,
     },
-    // isInspected,
   });
 
   const [hostOverviewResponse, setHostOverviewResponse] = useState<HostOverviewArgs>({
@@ -85,10 +79,6 @@ export const useHostOverview = ({
 
   const hostOverviewSearch = useCallback(
     (request: HostOverviewRequestOptions) => {
-      if (request.skip) {
-        return;
-      }
-
       let didCancel = false;
       const asyncSearch = async () => {
         abortCtrl.current = new AbortController();
@@ -148,14 +138,13 @@ export const useHostOverview = ({
         ...prevRequest,
         defaultIndex,
         hostName,
-        skip,
         timerange: {
           interval: '12h',
           from: startDate,
           to: endDate,
         },
       };
-      if (!deepEqual(prevRequest, myRequest)) {
+      if (!skip && !deepEqual(prevRequest, myRequest)) {
         return myRequest;
       }
       return prevRequest;
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/navigation/hosts_query_tab_body.tsx b/x-pack/plugins/security_solution/public/hosts/pages/navigation/hosts_query_tab_body.tsx
@@ -27,7 +27,8 @@ export const HostsQueryTabBody = ({
   const [
     loading,
     { hosts, totalCount, pageInfo, loadPage, id, inspect, isInspected, refetch },
-  ] = useAllHost({ docValueFields, endDate, filterQuery, startDate, type });
+  ] = useAllHost({ docValueFields, endDate, filterQuery, skip, startDate, type });
+
   return (
     <HostsTableManage
       deleteQuery={deleteQuery}
