Move page template out of context hierarchy

x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx

@@ -14,7 +14,8 @@ import {
 } from '../../../observability_logs/log_stream_page/state';
 import { InvalidStateCallout } from '../../../observability_logs/xstate_helpers';
 import { ConnectedLogViewErrorPage } from '../shared/page_log_view_error';
-import { StreamPageLogsForState } from './page_logs';
+import { LogStreamPageTemplate } from './components/stream_page_template';
+import { StreamPageLogsContentForState } from './page_logs_content';
 import { StreamPageMissingIndicesContent } from './page_missing_indices_content';
 import { LogStreamPageContentProviders } from './page_providers';
 
@@ -37,9 +38,11 @@ export const StreamPageContentForState: React.FC<{ logStreamPageState: LogStream
     return <StreamPageMissingIndicesContent />;
   } else if (logStreamPageState.matches({ hasLogViewIndices: 'initialized' })) {
     return (
-      <LogStreamPageContentProviders logStreamPageState={logStreamPageState}>
-        <StreamPageLogsForState logStreamPageState={logStreamPageState} />
-      </LogStreamPageContentProviders>
+      <LogStreamPageTemplate hasData={true} isDataLoading={false}>
+        <LogStreamPageContentProviders logStreamPageState={logStreamPageState}>
+          <StreamPageLogsContentForState logStreamPageState={logStreamPageState} />
+        </LogStreamPageContentProviders>
+      </LogStreamPageTemplate>
     );
   } else {
     return <InvalidStateCallout state={logStreamPageState} />;

x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx

@@ -31,7 +31,9 @@ import { useViewLogInProviderContext } from '../../../containers/logs/view_log_i
 import { WithLogTextviewUrlState } from '../../../containers/logs/with_log_textview';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
 import { useLogViewContext } from '../../../hooks/use_log_view';
+import { LogStreamPageActorRef } from '../../../observability_logs/log_stream_page/state';
 import { type ParsedQuery } from '../../../observability_logs/log_stream_query_state';
+import { MatchedStateFromActor } from '../../../observability_logs/xstate_helpers';
 import { datemathToEpochMillis, isValidDatemath } from '../../../utils/datemath';
 import { LogsToolbar } from './page_toolbar';
 import { PageViewLogInContext } from './page_view_log_in_context';
@@ -281,6 +283,21 @@ export const StreamPageLogsContent = React.memo<{
   );
 });
 
+type InitializedLogStreamPageState = MatchedStateFromActor<
+  LogStreamPageActorRef,
+  { hasLogViewIndices: 'initialized' }
+>;
+
+export const StreamPageLogsContentForState = React.memo<{
+  logStreamPageState: InitializedLogStreamPageState;
+}>(({ logStreamPageState }) => {
+  const {
+    context: { parsedQuery },
+  } = logStreamPageState;
+
+  return <StreamPageLogsContent filterQuery={parsedQuery} />;
+});
+
 const LogPageMinimapColumn = euiStyled.div`
   flex: 1 0 0%;
   overflow: hidden;

x-pack/plugins/infra/public/pages/logs/stream/page_providers.tsx

@@ -66,7 +66,7 @@ const LogEntriesStateProvider: React.FC<{
   );
 };
 
-export const LogHighlightsState: React.FC<{
+const LogHighlightsState: React.FC<{
   logStreamPageState: InitializedLogStreamPageState;
 }> = ({ children, logStreamPageState }) => {
   const { logViewId, logView } = useLogViewContext();
@@ -97,7 +97,9 @@ export const LogStreamPageContentProviders: React.FC<{
         <LogPositionStateProvider>
           <ViewLogInContext>
             <LogEntriesStateProvider logStreamPageState={logStreamPageState}>
-              {children}
+              <LogHighlightsState logStreamPageState={logStreamPageState}>
+                {children}
+              </LogHighlightsState>
             </LogEntriesStateProvider>
           </ViewLogInContext>
         </LogPositionStateProvider>