Merge branch 'ISSUE_690' of https://github.com/vvvprabhakar/jaeger-ui …

…into ISSUE_690
jaegertracing · Aug 30, 2021 · 5d9eed2 · 5d9eed2
2 parents 7328d6c + 7b28b2b
commit 5d9eed2
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/packages/jaeger-ui/src/components/TracePage/index.tsx b/packages/jaeger-ui/src/components/TracePage/index.tsx
@@ -322,7 +322,15 @@ export class TracePageImpl extends React.PureComponent<TProps, TState> {
   };
 
   render() {
-    const { archiveEnabled, archiveTraceState, embedded, id, searchUrl, uiFind, trace } = this.props;
+    const {
+      archiveEnabled,
+      archiveTraceState,
+      embedded,
+      id,
+      uiFind,
+      trace,
+      location: { state: locationState },
+    } = this.props;
     const { slimView, viewType, headerHeight, viewRange } = this.state;
     if (!trace || trace.state === fetchedState.LOADING) {
       return <LoadingIndicator className="u-mt-vast" centered />;
@@ -370,7 +378,7 @@ export class TracePageImpl extends React.PureComponent<TProps, TState> {
       showShortcutsHelp: !isEmbedded,
       showStandaloneLink: isEmbedded,
       showViewOptions: !isEmbedded,
-      toSearch: searchUrl,
+      toSearch: (locationState && locationState.fromSearch) || null,
       trace: data,
       updateNextViewRangeTime: this.updateNextViewRangeTime,
       updateViewRangeTime: this.updateViewRangeTime,