added buckets info to existing return objec per feedback

Author: yctercero

x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts

@@ -32,6 +32,10 @@ export interface UseMatrixHistogramArgs {
   inspect: InspectResponse;
   refetch: inputsModel.Refetch;
   totalCount: number;
+  buckets: Array<{
+    key: string;
+    doc_count: number;
+  }>;
 }
 
 const ID = 'matrixHistogramQuery';
@@ -45,14 +49,7 @@ export const useMatrixHistogram = ({
   stackByField,
   startDate,
   threshold,
-}: MatrixHistogramQueryProps): [
-  boolean,
-  UseMatrixHistogramArgs,
-  Array<{
-    key: string;
-    doc_count: number;
-  }>
-] => {
+}: MatrixHistogramQueryProps): [boolean, UseMatrixHistogramArgs] => {
   const { data, notifications } = useKibana().services;
   const refetch = useRef<inputsModel.Refetch>(noop);
   const abortCtrl = useRef(new AbortController());
@@ -82,13 +79,8 @@ export const useMatrixHistogram = ({
     },
     refetch: refetch.current,
     totalCount: -1,
+    buckets: [],
   });
-  const [matrixHistogramBuckets, setMatrixHistogramBuckets] = useState<
-    Array<{
-      key: string;
-      doc_count: number;
-    }>
-  >([]);
 
   const hostsSearch = useCallback(
     (request: MatrixHistogramRequestOptions) => {
@@ -117,8 +109,8 @@ export const useMatrixHistogram = ({
                     inspect: getInspectResponse(response, prevResponse.inspect),
                     refetch: refetch.current,
                     totalCount: response.totalCount,
+                    buckets: histogramBuckets,
                   }));
-                  setMatrixHistogramBuckets(histogramBuckets);
                 }
                 searchSubscription$.unsubscribe();
               } else if (isErrorResponse(response)) {
@@ -177,5 +169,5 @@ export const useMatrixHistogram = ({
     hostsSearch(matrixHistogramRequest);
   }, [matrixHistogramRequest, hostsSearch]);
 
-  return [loading, matrixHistogramResponse, matrixHistogramBuckets];
+  return [loading, matrixHistogramResponse];
 };

x-pack/plugins/security_solution/public/detections/components/rules/query_preview/threshold_histogram.tsx

@@ -36,7 +36,7 @@ export const PreviewThresholdQueryHistogram = ({
 }: PreviewThresholdQueryHistogramProps) => {
   const { setQuery, isInitializing } = useGlobalTime();
 
-  const [isLoading, { inspect, refetch }, buckets] = useMatrixHistogram({
+  const [isLoading, { inspect, refetch, buckets }] = useMatrixHistogram({
     errorMessage: i18n.PREVIEW_QUERY_ERROR,
     endDate: from,
     startDate: to,
@@ -54,21 +54,14 @@ export const PreviewThresholdQueryHistogram = ({
   }, [setQuery, inspect, isLoading, isInitializing, refetch]);
 
   const { data, totalCount } = useMemo(() => {
-    if (buckets != null) {
-      return {
-        data: buckets.map<{ x: string; y: number; g: string }>(({ key, doc_count: docCount }) => ({
-          x: key,
-          y: docCount,
-          g: key,
-        })),
-        totalCount: buckets.length,
-      };
-    } else {
-      return {
-        data: [],
-        totalCount: 0,
-      };
-    }
+    return {
+      data: buckets.map<{ x: string; y: number; g: string }>(({ key, doc_count: docCount }) => ({
+        x: key,
+        y: docCount,
+        g: key,
+      })),
+      totalCount: buckets.length,
+    };
   }, [buckets]);
 
   return (