Flatten logposition destructuring

elastic · Jan 3, 2020 · 6a94a40 · 6a94a40
1 parent 6f7285c
commit 6a94a40
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 25 deletions.
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
@@ -28,7 +28,7 @@ export const LogColumnHeaders: React.FunctionComponent<{
   columnConfigurations: LogColumnConfiguration[];
   columnWidths: LogEntryColumnWidths;
 }> = ({ columnConfigurations, columnWidths }) => {
-  const [{ firstVisiblePosition }] = useContext(LogPositionState.Context);
+  const { firstVisiblePosition } = useContext(LogPositionState.Context);
   return (
     <LogColumnHeadersWrapper>
       {columnConfigurations.map(columnConfiguration => {

diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_highlights.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_highlights.tsx
@@ -28,7 +28,7 @@ export const useLogHighlightsState = ({
   filterQuery: string | null;
 }) => {
   const [highlightTerms, setHighlightTerms] = useState<string[]>([]);
-  const [{ visibleMidpoint }, { jumpToTargetPosition }] = useContext(LogPositionState.Context);
+  const { visibleMidpoint, jumpToTargetPosition } = useContext(LogPositionState.Context);
   const { intervalSize: summaryIntervalSize } = useContext(LogViewConfiguration.Context);
   const {
     start: summaryStart,

diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_position/log_position_state.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/log_position_state.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useState, useMemo, useEffect } from 'react';
+import { useState, useMemo, useEffect, useCallback } from 'react';
 import createContainer from 'constate';
 import { TimeKey } from '../../../../common/time';
 
@@ -59,7 +59,7 @@ const useVisibleMidpoint = (middleKey: TimeKeyOrNull, targetPosition: TimeKeyOrN
   return store.currentValue;
 };
 
-export const useLogPositionState: () => [LogPositionStateParams, LogPositionCallbacks] = () => {
+export const useLogPositionState: () => LogPositionStateParams & LogPositionCallbacks = () => {
   const [targetPosition, jumpToTargetPosition] = useState<TimeKey | null>(null);
   const [isAutoReloading, setIsAutoReloading] = useState(false);
   const [visiblePositions, reportVisiblePositions] = useState<VisiblePositions>({
@@ -92,13 +92,16 @@ export const useLogPositionState: () => [LogPositionStateParams, LogPositionCall
 
   const callbacks = {
     jumpToTargetPosition,
-    jumpToTargetPositionTime: (time: number) => jumpToTargetPosition({ tiebreaker: 0, time }),
+    jumpToTargetPositionTime: useCallback(
+      (time: number) => jumpToTargetPosition({ tiebreaker: 0, time }),
+      [jumpToTargetPosition]
+    ),
     reportVisiblePositions,
-    startLiveStreaming: () => setIsAutoReloading(true),
-    stopLiveStreaming: () => setIsAutoReloading(false),
+    startLiveStreaming: useCallback(() => setIsAutoReloading(true), [setIsAutoReloading]),
+    stopLiveStreaming: useCallback(() => setIsAutoReloading(false), [setIsAutoReloading]),
   };
 
-  return [state, callbacks];
+  return { ...state, ...callbacks };
 };
 
 export const LogPositionState = createContainer(useLogPositionState);
diff --git a/.../legacy/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx b/.../legacy/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx
@@ -20,10 +20,14 @@ interface LogPositionUrlState {
 }
 
 export const WithLogPositionUrlState = () => {
-  const [
-    { visibleMidpoint, isAutoReloading },
-    { jumpToTargetPosition, jumpToTargetPositionTime, startLiveStreaming, stopLiveStreaming },
-  ] = useContext(LogPositionState.Context);
+  const {
+    visibleMidpoint,
+    isAutoReloading,
+    jumpToTargetPosition,
+    jumpToTargetPositionTime,
+    startLiveStreaming,
+    stopLiveStreaming,
+  } = useContext(LogPositionState.Context);
   const urlState = useMemo(
     () => ({
       position: visibleMidpoint ? pickTimeKey(visibleMidpoint) : null,

diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/with_summary.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/with_summary.ts
@@ -25,7 +25,7 @@ export const WithSummary = ({
   const { intervalSize } = useContext(LogViewConfiguration.Context);
   const { sourceId } = useContext(Source.Context);
   const { filterQuery } = useContext(LogFilterState.Context);
-  const [{ visibleMidpointTime }] = useContext(LogPositionState.Context);
+  const { visibleMidpointTime } = useContext(LogPositionState.Context);
 
   const { buckets, start, end } = useLogSummary(
     sourceId,

diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
@@ -46,10 +46,15 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
 
   const { logSummaryHighlights } = useContext(LogHighlightsState.Context);
   const { applyLogFilterQuery } = useContext(LogFilterState.Context);
-  const [
-    { isAutoReloading, targetPosition, visibleMidpointTime, visibleTimeInterval },
-    { reportVisiblePositions, jumpToTargetPosition, stopLiveStreaming },
-  ] = useContext(LogPositionState.Context);
+  const {
+    isAutoReloading,
+    targetPosition,
+    visibleMidpointTime,
+    visibleTimeInterval,
+    reportVisiblePositions,
+    jumpToTargetPosition,
+    stopLiveStreaming,
+  } = useContext(LogPositionState.Context);
   return (
     <>
       <WithLogMinimapUrlState />

diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx
@@ -25,10 +25,13 @@ const LogFilterStateProvider: React.FC = ({ children }) => {
 
 const LogEntriesStateProvider: React.FC = ({ children }) => {
   const { sourceId } = useContext(Source.Context);
-  const [
-    { targetPosition, pagesBeforeStart, pagesAfterEnd, isAutoReloading },
-    { jumpToTargetPosition },
-  ] = useContext(LogPositionState.Context);
+  const {
+    targetPosition,
+    pagesBeforeStart,
+    pagesAfterEnd,
+    isAutoReloading,
+    jumpToTargetPosition,
+  } = useContext(LogPositionState.Context);
   const { filterQuery } = useContext(LogFilterState.Context);
 
   const entriesProps = {

diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_toolbar.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
@@ -54,10 +54,13 @@ export const LogsToolbar = () => {
     goToPreviousHighlight,
     goToNextHighlight,
   } = useContext(LogHighlightsState.Context);
-  const [
-    { visibleMidpointTime, isAutoReloading },
-    { jumpToTargetPositionTime, startLiveStreaming, stopLiveStreaming },
-  ] = useContext(LogPositionState.Context);
+  const {
+    visibleMidpointTime,
+    isAutoReloading,
+    jumpToTargetPositionTime,
+    startLiveStreaming,
+    stopLiveStreaming,
+  } = useContext(LogPositionState.Context);
   return (
     <Toolbar>
       <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="s">