From 0aa280a702813c2b814c75dc509d3573dd39ce1b Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Mon, 9 Sep 2019 15:33:50 -0400
Subject: [PATCH] fix redirect to maintain search query string

---
 .../ml_host_conditional_container.tsx          |  7 ++++++-
 .../ml_network_conditional_container.tsx       |  7 ++++++-
 .../plugins/siem/public/pages/hosts/index.tsx  | 18 ++++++++++++++----
 .../siem/public/pages/network/index.tsx        |  7 ++++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx b/x-pack/legacy/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx
index be0628452ea02c..eec33a657c6ee2 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx
@@ -84,7 +84,12 @@ export const MlHostConditionalContainer = pure<MlHostConditionalProps>(({ match
         }
       }}
     />
-    <Redirect from="/ml-hosts/" to="/ml-hosts" />
+    <Route
+      path="/ml-hosts/"
+      render={({ location: { search = '' } }) => (
+        <Redirect from="/ml-hosts/" to={`/ml-hosts${search}`} />
+      )}
+    />
   </Switch>
 ));
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx b/x-pack/legacy/plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx
index 3fcc60c6558898..4089689fe9b689 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx
@@ -84,7 +84,12 @@ export const MlNetworkConditionalContainer = pure<MlNetworkConditionalProps>(({
         }
       }}
     />
-    <Redirect from="/ml-network/" to="/ml-network" />
+    <Route
+      path="/ml-network/"
+      render={({ location: { search = '' } }) => (
+        <Redirect from="/ml-network/" to={`/ml-network${search}`} />
+      )}
+    />
   </Switch>
 ));
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx
index 36d9826c5d6a68..49d12b8e51a04c 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx
@@ -216,11 +216,21 @@ export const HostsContainer = React.memo<Props>(({ url }) => (
             </>
           )}
         />
-        <Redirect
-          from={`${url}/:detailName`}
-          to={`${url}/:detailName/${HostsTableType.authentications}`}
+        <Route
+          path={`${url}/:detailName`}
+          render={({ location: { search = '' } }) => (
+            <Redirect
+              from={`${url}/:detailName`}
+              to={`${url}/:detailName/${HostsTableType.authentications}${search}`}
+            />
+          )}
+        />
+        <Route
+          path="/hosts/"
+          render={({ location: { search = '' } }) => (
+            <Redirect from={`/hosts/"`} to={`/hosts/${HostsTableType.hosts}${search}`} />
+          )}
         />
-        <Redirect from="/hosts/" to={`/hosts/${HostsTableType.hosts}`} />
       </Switch>
     )}
   </GlobalTime>
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/index.tsx b/x-pack/legacy/plugins/siem/public/pages/network/index.tsx
index f00bc60add5fd7..d77c8ef935ad49 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/index.tsx
@@ -25,7 +25,12 @@ export const NetworkContainer = React.memo<Props>(() => (
         },
       }) => <IPDetails detailName={detailName} />}
     />
-    <Redirect from="/network/" to="/network" />
+    <Route
+      path="/network/"
+      render={({ location: { search = '' } }) => (
+        <Redirect from="/network/" to={`/network${search}`} />
+      )}
+    />
   </Switch>
 ));