From 91e043b2bf61918d5868832aab09f5d9036a0b22 Mon Sep 17 00:00:00 2001
From: Ari Aviran <ari.aviran@elastic.co>
Date: Tue, 8 Mar 2022 14:30:52 +0200
Subject: [PATCH] [Kibana React] Fix Page Template `solutionNav` propagation

---
 .../page_template/__snapshots__/page_template.test.tsx.snap  | 1 -
 .../kibana_react/public/page_template/with_solution_nav.tsx  | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap b/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap
index ae036f6a002ec..5889338c37d8c 100644
--- a/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap
+++ b/src/plugins/kibana_react/public/page_template/__snapshots__/page_template.test.tsx.snap
@@ -206,7 +206,6 @@ exports[`KibanaPageTemplate render noDataContent 1`] = `
 exports[`KibanaPageTemplate render solutionNav 1`] = `
 <div
   class="euiPage euiPage--grow euiPageTemplate kbnPageTemplate"
-  solutionnav="[object Object]"
   style="min-height:460px"
 >
   <div
diff --git a/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx b/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx
index 5ec49b7c7cf29..b8a497587fcd4 100644
--- a/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx
+++ b/src/plugins/kibana_react/public/page_template/with_solution_nav.tsx
@@ -29,7 +29,8 @@ export const withSolutionNav = (WrappedComponent: ComponentType<KibanaPageTempla
     const [isSideNavOpenOnDesktop, setisSideNavOpenOnDesktop] = useState(
       !JSON.parse(String(localStorage.getItem(SOLUTION_NAV_COLLAPSED_KEY)))
     );
-    const { solutionNav, children, isEmptyState, template } = props;
+    const { solutionNav, ...propagatedProps } = props;
+    const { children, isEmptyState, template } = propagatedProps;
     const toggleOpenOnDesktop = () => {
       setisSideNavOpenOnDesktop(!isSideNavOpenOnDesktop);
       // Have to store it as the opposite of the default we want
@@ -61,7 +62,7 @@ export const withSolutionNav = (WrappedComponent: ComponentType<KibanaPageTempla
     } as EuiPageSideBarProps; // needed because for some reason 'none' is not recognized as a valid value for paddingSize
     return (
       <WrappedComponent
-        {...props}
+        {...propagatedProps}
         pageSideBar={pageSideBar}
         pageSideBarProps={pageSideBarProps}
         template={templateToUse}