fix redirect to maintain search query string (#45184) (#45490)

elastic · Sep 12, 2019 · ff4149d · ff4149d
1 parent 1377074
commit ff4149d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/...acy/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx b/...acy/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx
@@ -80,7 +80,12 @@ export const MlHostConditionalContainer = React.memo<MlHostConditionalProps>(({
         }
       }}
     />
-    <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/.../plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx b/.../plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx
@@ -80,7 +80,12 @@ export const MlNetworkConditionalContainer = React.memo<MlNetworkConditionalProp
         }
       }}
     />
-    <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
@@ -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
@@ -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>
 ));