From 694b51024ae5d981bb35ae2b651002e42160d4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20St=C3=BCrmer?= Date: Fri, 21 Feb 2025 19:49:34 +0100 Subject: [PATCH] [Logs UI] Fix log view loading states (#212124) This fixes a problem with the log view resolution when entering the log settings page under certain conditions. (cherry picked from commit aa26fe3c0b921c3696dba7023a4fced72c4a2043) --- .../logs_shared/public/hooks/use_log_view.ts | 5 +++-- .../public/observability_logs/log_view_state/src/types.ts | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/observability_solution/logs_shared/public/hooks/use_log_view.ts b/x-pack/plugins/observability_solution/logs_shared/public/hooks/use_log_view.ts index 61915b2dadea7..abe6d3d1dc7f4 100644 --- a/x-pack/plugins/observability_solution/logs_shared/public/hooks/use_log_view.ts +++ b/x-pack/plugins/observability_solution/logs_shared/public/hooks/use_log_view.ts @@ -117,8 +117,9 @@ export const useLogView = ({ const isLoading = isLoadingLogView || isResolvingLogView || isLoadingLogViewStatus || isUpdatingLogView; - const isUninitialized = useSelector(logViewStateService, (state) => - state.matches('uninitialized') + const isUninitialized = useSelector( + logViewStateService, + (state) => state.matches('uninitialized') || state.matches('initializingFromUrl') ); const hasFailedLoadingLogView = useSelector(logViewStateService, (state) => diff --git a/x-pack/plugins/observability_solution/logs_shared/public/observability_logs/log_view_state/src/types.ts b/x-pack/plugins/observability_solution/logs_shared/public/observability_logs/log_view_state/src/types.ts index 8174b41aaa1dc..345049a8b1a10 100644 --- a/x-pack/plugins/observability_solution/logs_shared/public/observability_logs/log_view_state/src/types.ts +++ b/x-pack/plugins/observability_solution/logs_shared/public/observability_logs/log_view_state/src/types.ts @@ -45,6 +45,10 @@ export type LogViewTypestate = value: 'loading'; context: LogViewContextWithReference; } + | { + value: 'initializingFromUrl'; + context: LogViewContextWithReference; + } | { value: 'resolving'; context: LogViewContextWithReference & LogViewContextWithLogView;