Embed components

Signed-off-by: Alberto Gutierrez <aljesusg@gmail.com>
jaegertracing · Oct 15, 2018 · 1cdb441 · 1cdb441
1 parent feeaccd
commit 1cdb441
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 44 deletions.
diff --git a/packages/jaeger-ui/src/components/App/Page.js b/packages/jaeger-ui/src/components/App/Page.js
@@ -52,13 +52,16 @@ export class PageImpl extends React.Component<Props> {
   }
 
   render() {
+    const isEmbed = this.props.search.includes('embed');
     return (
       <div>
         <Helmet title="Jaeger UI" />
         <Layout>
-          <Header className="Page--topNav">
-            <TopNav />
-          </Header>
+          {!isEmbed && (
+            <Header className="Page--topNav">
+              <TopNav />
+            </Header>
+          )}
           <Content className="Page--content">{this.props.children}</Content>
         </Layout>
       </div>

diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ResultItem.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ResultItem.js
@@ -36,6 +36,7 @@ type Props = {
   linkTo: string,
   toggleComparison: string => void,
   trace: Trace,
+  disableComparision: boolean,
 };
 
 const isErrorTag = ({ key, value }) => key === 'error' && (value === true || value === 'true');
@@ -44,7 +45,14 @@ export default class ResultItem extends React.PureComponent<Props> {
   props: Props;
 
   render() {
-    const { durationPercent, isInDiffCohort, linkTo, toggleComparison, trace } = this.props;
+    const {
+      durationPercent,
+      isInDiffCohort,
+      linkTo,
+      disableComparision,
+      toggleComparison,
+      trace,
+    } = this.props;
     const { duration, services, startTime, spans, traceName, traceID } = trace;
     const mDate = moment(startTime / 1000);
     const timeStr = mDate.format('h:mm:ss a');
@@ -61,6 +69,7 @@ export default class ResultItem extends React.PureComponent<Props> {
           toggleComparison={toggleComparison}
           traceID={traceID}
           traceName={traceName}
+          disableComparision={disableComparision}
         />
         <Link to={linkTo}>
           <Row>

diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ResultItemTitle.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ResultItemTitle.js
@@ -37,6 +37,7 @@ type Props = {
   toggleComparison: (string, boolean) => void,
   traceID: string,
   traceName: string,
+  disableComparision?: boolean,
 };
 
 export default class ResultItemTitle extends React.PureComponent<Props> {
@@ -64,6 +65,7 @@ export default class ResultItemTitle extends React.PureComponent<Props> {
       state,
       traceID,
       traceName,
+      disableComparision,
     } = this.props;
     let WrapperComponent = 'div';
     const wrapperProps: { [string]: string } = { className: 'ResultItemTitle--item ub-flex-auto' };
@@ -74,12 +76,14 @@ export default class ResultItemTitle extends React.PureComponent<Props> {
     const isErred = state === fetchedState.ERROR;
     return (
       <div className="ResultItemTitle">
-        <Checkbox
-          className="ResultItemTitle--item ub-flex-none"
-          checked={!isErred && isInDiffCohort}
-          disabled={isErred}
-          onChange={this.toggleComparison}
-        />
+        {!disableComparision && (
+          <Checkbox
+            className="ResultItemTitle--item ub-flex-none"
+            checked={!isErred && isInDiffCohort}
+            disabled={isErred}
+            onChange={this.toggleComparison}
+          />
+        )}
         <WrapperComponent {...wrapperProps}>
           <span className="ResultItemTitle--durationBar" style={{ width: `${durationPercent}%` }} />
           {duration != null && <span className="ub-right ub-relative">{formatDuration(duration)}</span>}

diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/index.js
@@ -37,6 +37,9 @@ type SearchResultsProps = {
   cohortRemoveTrace: string => void,
   diffCohort: FetchedTrace[],
   goToTrace: string => void,
+  isEmbed?: boolean,
+  hideGraph?: boolean,
+  disableComparision?: boolean,
   loading: boolean,
   maxTraceDuration: number,
   skipMessage?: boolean,
@@ -107,26 +110,28 @@ export default class SearchResults extends React.PureComponent<SearchResultsProp
         </React.Fragment>
       );
     }
-    const { goToTrace, maxTraceDuration } = this.props;
+    const { goToTrace, isEmbed, hideGraph, disableComparision, maxTraceDuration } = this.props;
     const cohortIds = new Set(diffCohort.map(datum => datum.id));
     return (
       <div>
         <div>
           <div className="SearchResults--header">
-            <div className="ub-p3">
-              <ScatterPlot
-                data={traces.map(t => ({
-                  x: t.startTime,
-                  y: t.duration,
-                  traceID: t.traceID,
-                  size: t.spans.length,
-                  name: t.traceName,
-                }))}
-                onValueClick={t => {
-                  goToTrace(t.traceID);
-                }}
-              />
-            </div>
+            {!hideGraph && (
+              <div className="ub-p3">
+                <ScatterPlot
+                  data={traces.map(t => ({
+                    x: t.startTime,
+                    y: t.duration,
+                    traceID: t.traceID,
+                    size: t.spans.length,
+                    name: t.traceName,
+                  }))}
+                  onValueClick={t => {
+                    goToTrace(t.traceID);
+                  }}
+                />
+              </div>
+            )}
             <div className="SearchResults--headerOverview">
               <SelectSort />
               <h2 className="ub-m0">
@@ -136,16 +141,17 @@ export default class SearchResults extends React.PureComponent<SearchResultsProp
           </div>
         </div>
         <div>
-          {diffSelection}
+          {!disableComparision && diffSelection}
           <ul className="ub-list-reset">
             {traces.map(trace => (
               <li className="ub-my3" key={trace.traceID}>
                 <ResultItem
                   durationPercent={getPercentageOfDuration(trace.duration, maxTraceDuration)}
                   isInDiffCohort={cohortIds.has(trace.traceID)}
-                  linkTo={prefixUrl(`/trace/${trace.traceID}`)}
+                  linkTo={prefixUrl(isEmbed ? `/trace/${trace.traceID}?embed` : `/trace/${trace.traceID}`)}
                   toggleComparison={this.toggleComparison}
                   trace={trace}
+                  disableComparision={disableComparision}
                 />
               </li>
             ))}

diff --git a/packages/jaeger-ui/src/components/SearchTracePage/index.js b/packages/jaeger-ui/src/components/SearchTracePage/index.js
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import React, { Component } from 'react';
-import { Col, Row } from 'antd';
+import { Col, Row, Button } from 'antd';
 import PropTypes from 'prop-types';
 import queryString from 'query-string';
 import { connect } from 'react-redux';
@@ -60,7 +60,15 @@ export class SearchTracePageImpl extends Component {
   }
 
   goToTrace = traceID => {
-    this.props.history.push(prefixUrl(`/trace/${traceID}`));
+    const url = this.props.isEmbed ? `/trace/${traceID}?embed` : `/trace/${traceID}`;
+    this.props.history.push(prefixUrl(url));
+  };
+
+  goFullView = () => {
+    const urlQuery = this.props.query;
+    delete urlQuery.embed;
+    const url = `/search?${queryString.stringify(urlQuery)}`;
+    window.open(prefixUrl(url), '_blank');
   };
 
   render() {
@@ -75,20 +83,26 @@ export class SearchTracePageImpl extends Component {
       maxTraceDuration,
       services,
       traceResults,
+      isEmbed,
+      hideGraph,
+      disableComparision,
     } = this.props;
     const hasTraceResults = traceResults && traceResults.length > 0;
     const showErrors = errors && !loadingTraces;
     const showLogo = isHomepage && !hasTraceResults && !loadingTraces && !errors;
     return (
       <div>
         <Row>
-          <Col span={6} className="SearchTracePage--column">
-            <div className="SearchTracePage--find">
-              <h2>Find Traces</h2>
-              {!loadingServices && services ? <SearchForm services={services} /> : <LoadingIndicator />}
-            </div>
-          </Col>
+          {!isEmbed && (
+            <Col span={6} className="SearchTracePage--column">
+              <div className="SearchTracePage--find">
+                <h2>Find Traces</h2>
+                {!loadingServices && services ? <SearchForm services={services} /> : <LoadingIndicator />}
+              </div>
+            </Col>
+          )}
           <Col span={18} className="SearchTracePage--column">
+            {isEmbed && <Button onClick={this.goFullView}>Show full view</Button>}
             {showErrors && (
               <div className="js-test-error-message">
                 <h2>There was an error querying for traces:</h2>
@@ -105,16 +119,20 @@ export class SearchTracePageImpl extends Component {
                 diffCohort={diffCohort}
                 skipMessage={isHomepage}
                 traces={traceResults}
+                isEmbed={isEmbed}
+                hideGraph={hideGraph}
+                disableComparision={disableComparision}
               />
             )}
-            {showLogo && (
-              <img
-                className="SearchTracePage--logo js-test-logo"
-                alt="presentation"
-                src={JaegerLogo}
-                width="400"
-              />
-            )}
+            {showLogo &&
+              !isEmbed && (
+                <img
+                  className="SearchTracePage--logo js-test-logo"
+                  alt="presentation"
+                  src={JaegerLogo}
+                  width="400"
+                />
+              )}
           </Col>
         </Row>
       </div>
@@ -123,7 +141,11 @@ export class SearchTracePageImpl extends Component {
 }
 
 SearchTracePageImpl.propTypes = {
+  query: PropTypes.object,
   isHomepage: PropTypes.bool,
+  isEmbed: PropTypes.bool,
+  hideGraph: PropTypes.bool,
+  disableComparision: PropTypes.bool,
   // eslint-disable-next-line react/forbid-prop-types
   traceResults: PropTypes.array,
   diffCohort: PropTypes.array,
@@ -196,6 +218,9 @@ const stateServicesXformer = getLastXformCacher(stateServices => {
 // export to test
 export function mapStateToProps(state) {
   const query = queryString.parse(state.router.location.search);
+  const isEmbed = 'embed' in query;
+  const hideGraph = 'hideGraph' in query;
+  const disableComparision = 'disableComparision' in query;
   const isHomepage = !Object.keys(query).length;
   const { traces, maxDuration, traceError, loadingTraces } = stateTraceXformer(state.trace);
   const diffCohort = stateTraceDiffXformer(state.trace, state.traceDiff);
@@ -210,7 +235,11 @@ export function mapStateToProps(state) {
   const sortBy = sortFormSelector(state, 'sortBy');
   const traceResults = sortedTracesXformer(traces, sortBy);
   return {
+    query,
     diffCohort,
+    isEmbed,
+    hideGraph,
+    disableComparision,
     isHomepage,
     loadingServices,
     loadingTraces,

diff --git a/packages/jaeger-ui/src/components/SearchTracePage/index.test.js b/packages/jaeger-ui/src/components/SearchTracePage/index.test.js
@@ -48,6 +48,8 @@ describe('<SearchTracePage>', () => {
     traceResults = [{ traceID: 'a', spans: [], processes: {} }, { traceID: 'b', spans: [], processes: {} }];
     props = {
       traceResults,
+      isEmbed: false,
+      disableComparision: false,
       isHomepage: false,
       loadingServices: false,
       loadingTraces: false,
@@ -140,6 +142,9 @@ describe('mapStateToProps()', () => {
     expect(diffCohort[0].data.traceID).toBe(trace.traceID);
 
     expect(rest).toEqual({
+      isEmbed: false,
+      hideGraph: false,
+      disableComparision: false,
       isHomepage: true,
       // the redux-form `formValueSelector` mock returns `null` for "sortBy"
       sortTracesBy: null,

diff --git a/packages/jaeger-ui/src/components/TracePage/index.js b/packages/jaeger-ui/src/components/TracePage/index.js
@@ -212,7 +212,7 @@ export class TracePageImpl extends React.PureComponent<TracePageProps, TracePage
       this.setState({ headerHeight: null });
     }
   };
-
+  
   filterSpans = (textFilter: string) => {
     const spans = this.props.trace && this.props.trace.data && this.props.trace.data.spans;
     if (!spans) return null;