From a0ba64f862a733b301623db8ab3e40d0337d6018 Mon Sep 17 00:00:00 2001
From: tacigar <tacigar@users.noreply.github.com>
Date: Fri, 8 Feb 2019 07:19:36 +0900
Subject: [PATCH] Fix goToTrace (#323) (#324)

Signed-off-by: Takuma Igarashi <ig.lhound@gmail.com>
Signed-off-by: vvvprabhakar <vvvprabhakar@gmail.com>
---
 packages/jaeger-ui/src/components/SearchTracePage/index.js  | 6 ++++--
 .../jaeger-ui/src/components/SearchTracePage/index.test.js  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/jaeger-ui/src/components/SearchTracePage/index.js b/packages/jaeger-ui/src/components/SearchTracePage/index.js
index 16e2b28a46..f3ab70021d 100644
--- a/packages/jaeger-ui/src/components/SearchTracePage/index.js
+++ b/packages/jaeger-ui/src/components/SearchTracePage/index.js
@@ -24,7 +24,7 @@ import store from 'store';
 
 import SearchForm from './SearchForm';
 import SearchResults, { sortFormSelector } from './SearchResults';
-import { isSameQuery } from './url';
+import { isSameQuery, getUrl } from './url';
 import * as jaegerApiActions from '../../actions/jaeger-api';
 import ErrorMessage from '../common/ErrorMessage';
 import LoadingIndicator from '../common/LoadingIndicator';
@@ -33,6 +33,7 @@ import { actions as traceDiffActions } from '../TraceDiff/duck';
 import { fetchedState } from '../../constants';
 import { sortTraces } from '../../model/search';
 import getLastXformCacher from '../../utils/get-last-xform-cacher';
+import { stripEmbeddedState } from '../../utils/embedded-url';
 
 import './index.css';
 import JaegerLogo from '../../img/jaeger-logo.svg';
@@ -66,7 +67,8 @@ export class SearchTracePageImpl extends Component {
 
   goToTrace = traceID => {
     const { queryOfResults } = this.props;
-    this.props.history.push(getTraceLocation(traceID, { fromSearch: queryOfResults }));
+    const searchUrl = getUrl(stripEmbeddedState(queryOfResults));
+    this.props.history.push(getTraceLocation(traceID, { fromSearch: searchUrl }));
   };
 
   render() {
diff --git a/packages/jaeger-ui/src/components/SearchTracePage/index.test.js b/packages/jaeger-ui/src/components/SearchTracePage/index.test.js
index 07a541705b..65ca7277bd 100644
--- a/packages/jaeger-ui/src/components/SearchTracePage/index.test.js
+++ b/packages/jaeger-ui/src/components/SearchTracePage/index.test.js
@@ -92,7 +92,7 @@ describe('<SearchTracePage>', () => {
     expect(historyPush.mock.calls.length).toBe(1);
     expect(historyPush.mock.calls[0][0]).toEqual({
       pathname: `/trace/${traceID}`,
-      state: { fromSearch: queryOfResults },
+      state: { fromSearch: '/search?' },
     });
   });