Merge pull request jaegertracing#383 from rubenvp8510/json-load-issue

Handle no search query when a JSON file is loaded Signed-off-by: vvvprabhakar <[email protected]>
vvvprabhakar · May 22, 2019 · c123e71 · c123e71
2 parents e828f0d + 673e059
commit c123e71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.js
@@ -46,7 +46,7 @@ type SearchResultsProps = {
   hideGraph: boolean,
   loading: boolean,
   maxTraceDuration: number,
-  queryOfResults: SearchQuery,
+  queryOfResults?: SearchQuery,
   showStandaloneLink: boolean,
   skipMessage?: boolean,
   traces: TraceSummary[],
@@ -84,7 +84,7 @@ export const sortFormSelector = formValueSelector('traceResultsSort');
 export default class SearchResults extends React.PureComponent<SearchResultsProps> {
   props: SearchResultsProps;
 
-  static defaultProps = { skipMessage: false };
+  static defaultProps = { skipMessage: false, queryOfResults: undefined };
 
   toggleComparison = (traceID: string, remove: boolean) => {
     const { cohortAddTrace, cohortRemoveTrace } = this.props;
@@ -132,7 +132,7 @@ export default class SearchResults extends React.PureComponent<SearchResultsProp
       );
     }
     const cohortIds = new Set(diffCohort.map(datum => datum.id));
-    const searchUrl = getUrl(stripEmbeddedState(queryOfResults));
+    const searchUrl = queryOfResults ? getUrl(stripEmbeddedState(queryOfResults)) : getUrl();
     return (
       <div>
         <div>

diff --git a/packages/jaeger-ui/src/components/SearchTracePage/index.js b/packages/jaeger-ui/src/components/SearchTracePage/index.js
@@ -71,7 +71,7 @@ export class SearchTracePageImpl extends Component {
 
   goToTrace = traceID => {
     const { queryOfResults } = this.props;
-    const searchUrl = getUrl(stripEmbeddedState(queryOfResults));
+    const searchUrl = queryOfResults ? getUrl(stripEmbeddedState(queryOfResults)) : getUrl();
     this.props.history.push(getTraceLocation(traceID, { fromSearch: searchUrl }));
   };