From 208ec9344edc7f55273524ca38b8ce6c8e197184 Mon Sep 17 00:00:00 2001 From: Jenny Date: Tue, 21 Feb 2023 14:48:44 +0100 Subject: [PATCH 1/3] [Logs UI] Add default refresh interfal on streaming --- .../log_stream_query_state/src/state_machine.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/state_machine.ts b/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/state_machine.ts index bbae54bf8803e..952de530797f9 100644 --- a/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/state_machine.ts +++ b/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/state_machine.ts @@ -168,7 +168,11 @@ export const createPureLogStreamQueryStateMachine = ( }, time: { initial: 'initialized', - entry: ['notifyTimeChanged', 'updateTimeInTimeFilterService'], + entry: [ + 'notifyTimeChanged', + 'updateTimeInTimeFilterService', + 'setDefaultRefreshInterval', + ], invoke: [ { src: 'subscribeToTimeFilterServiceChanges', @@ -270,6 +274,15 @@ export const createPureLogStreamQueryStateMachine = ( ? ({ parsedQuery: event.parsedQuery } as LogStreamQueryContextWithParsedQuery) : {} ), + setDefaultRefreshInterval: actions.assign( + (_context, _event) => + ({ + refreshInterval: { + value: 5000, + pause: false, + }, + } as LogStreamQueryContextWithRefreshInterval) + ), clearValidationError: actions.assign( (_context, _event) => ({ validationError: undefined } as Omit< From fad16cc95af5b6cbdd5879c2b6e676130129183b Mon Sep 17 00:00:00 2001 From: Jenny Date: Wed, 22 Feb 2023 14:09:37 +0100 Subject: [PATCH 2/3] Update setting the default value in updateTimeContextFromTimeFilterService --- .../log_stream_query_state/src/state_machine.ts | 15 +-------------- .../src/time_filter_state_service.ts | 14 ++++++++------ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/state_machine.ts b/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/state_machine.ts index 952de530797f9..bbae54bf8803e 100644 --- a/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/state_machine.ts +++ b/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/state_machine.ts @@ -168,11 +168,7 @@ export const createPureLogStreamQueryStateMachine = ( }, time: { initial: 'initialized', - entry: [ - 'notifyTimeChanged', - 'updateTimeInTimeFilterService', - 'setDefaultRefreshInterval', - ], + entry: ['notifyTimeChanged', 'updateTimeInTimeFilterService'], invoke: [ { src: 'subscribeToTimeFilterServiceChanges', @@ -274,15 +270,6 @@ export const createPureLogStreamQueryStateMachine = ( ? ({ parsedQuery: event.parsedQuery } as LogStreamQueryContextWithParsedQuery) : {} ), - setDefaultRefreshInterval: actions.assign( - (_context, _event) => - ({ - refreshInterval: { - value: 5000, - pause: false, - }, - } as LogStreamQueryContextWithRefreshInterval) - ), clearValidationError: actions.assign( (_context, _event) => ({ validationError: undefined } as Omit< diff --git a/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/time_filter_state_service.ts b/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/time_filter_state_service.ts index aaa610ea1ef12..36fff8dd8420d 100644 --- a/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/time_filter_state_service.ts +++ b/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/time_filter_state_service.ts @@ -72,17 +72,19 @@ const getTimefilterState = (timeFilterService: TimefilterContract): TimefilterSt export const updateTimeContextFromTimeFilterService = actions.assign( (context: LogStreamQueryContext, event: LogStreamQueryEvent) => { - if ( - event.type === 'TIME_FROM_TIME_FILTER_SERVICE_CHANGED' || - event.type === 'INITIALIZED_FROM_TIME_FILTER_SERVICE' - ) { + if (event.type === 'INITIALIZED_FROM_TIME_FILTER_SERVICE') { + return { + ...getTimeFromEvent(context, event), + refreshInterval: { ...event.refreshInterval, value: 5000 }, + }; + } + if (event.type === 'TIME_FROM_TIME_FILTER_SERVICE_CHANGED') { return { ...getTimeFromEvent(context, event), refreshInterval: event.refreshInterval, }; - } else { - return {}; } + return {}; } ); From a77786d7b801e751af2f790393eaeabb31669da7 Mon Sep 17 00:00:00 2001 From: Jenny Date: Wed, 22 Feb 2023 17:18:12 +0100 Subject: [PATCH 3/3] Apply code review suggestion --- .../src/time_filter_state_service.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/time_filter_state_service.ts b/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/time_filter_state_service.ts index 36fff8dd8420d..3bc2adcb79315 100644 --- a/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/time_filter_state_service.ts +++ b/x-pack/plugins/infra/public/observability_logs/log_stream_query_state/src/time_filter_state_service.ts @@ -72,19 +72,20 @@ const getTimefilterState = (timeFilterService: TimefilterContract): TimefilterSt export const updateTimeContextFromTimeFilterService = actions.assign( (context: LogStreamQueryContext, event: LogStreamQueryEvent) => { - if (event.type === 'INITIALIZED_FROM_TIME_FILTER_SERVICE') { - return { - ...getTimeFromEvent(context, event), - refreshInterval: { ...event.refreshInterval, value: 5000 }, - }; - } - if (event.type === 'TIME_FROM_TIME_FILTER_SERVICE_CHANGED') { + if ( + event.type === 'TIME_FROM_TIME_FILTER_SERVICE_CHANGED' || + event.type === 'INITIALIZED_FROM_TIME_FILTER_SERVICE' + ) { return { ...getTimeFromEvent(context, event), - refreshInterval: event.refreshInterval, + refreshInterval: + event.type === 'TIME_FROM_TIME_FILTER_SERVICE_CHANGED' + ? event.refreshInterval + : { ...context.refreshInterval, pause: event.refreshInterval.pause }, }; + } else { + return {}; } - return {}; } );