[Fleet] Sync hash history with Kibana scoped history (#102523)

elastic · Jun 17, 2021 · b815394 · b815394
1 parent dc5972c
commit b815394
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
@@ -206,6 +206,17 @@ export const FleetAppContext: React.FC<{
   ({ children, startServices, config, history, kibanaVersion, extensions, routerHistory }) => {
     const isDarkMode = useObservable<boolean>(startServices.uiSettings.get$('theme:darkMode'));
     const [routerHistoryInstance] = useState(routerHistory || createHashHistory());
+    // Sync our hash history with Kibana scoped history
+    useEffect(() => {
+      const unlistenParentHistory = history.listen(() => {
+        const newHash = createHashHistory();
+        if (newHash.location.pathname !== routerHistoryInstance.location.pathname) {
+          routerHistoryInstance.replace(newHash.location.pathname);
+        }
+      });
+
+      return unlistenParentHistory;
+    }, [history, routerHistoryInstance]);
 
     return (
       <startServices.i18n.Context>

diff --git a/x-pack/plugins/fleet/public/applications/integrations/app.tsx b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
@@ -191,6 +191,18 @@ export const IntegrationsAppContext: React.FC<{
     const isDarkMode = useObservable<boolean>(startServices.uiSettings.get$('theme:darkMode'));
     const [routerHistoryInstance] = useState(routerHistory || createHashHistory());
 
+    // Sync our hash history with Kibana scoped history
+    useEffect(() => {
+      const unlistenParentHistory = history.listen(() => {
+        const newHash = createHashHistory();
+        if (newHash.location.pathname !== routerHistoryInstance.location.pathname) {
+          routerHistoryInstance.replace(newHash.location.pathname);
+        }
+      });
+
+      return unlistenParentHistory;
+    }, [history, routerHistoryInstance]);
+
     return (
       <startServices.i18n.Context>
         <KibanaContextProvider services={{ ...startServices }}>