Merge branch 'master' into trace-diffs

README.md

@@ -4,6 +4,10 @@
 
 Visualize distributed tracing with Jaeger.
 
+|              Trace Search              |             Trace Details              |
+| :------------------------------------: | :------------------------------------: |
+| ![Trace Search](./media/ss_search.png) | ![Trace Details](./media/ss_trace.png) |
+
 ## Contributing
 
 See [CONTRIBUTING](./CONTRIBUTING.md).
@@ -46,17 +50,17 @@ ssh -fN -L 16686:$BACKEND_HOST:$BACKEND_PORT $BACKEND_PORT
 Start the development server with hot loading:
 
 ```
-cd packages/jaeger-ui && yarn start
+yarn start
 ```
 
 #### Commands
 
-| Command                               | Description                                                         |
-| ------------------------------------- | ------------------------------------------------------------------- |
-| `cd packages/jaeger-ui && yarn start` | Starts development server with hot reloading and api proxy.         |
-| `yarn test`                           | Run all the tests                                                   |
-| `yarn lint`                           | Lint the project (eslint, prettier, flow)                           |
-| `yarn build`                          | Runs production build. Outputs files to `packages/jaeger-ui/build`. |
+| Command      | Description                                                         |
+| ------------ | ------------------------------------------------------------------- |
+| `yarn start` | Starts development server with hot reloading and api proxy.         |
+| `yarn test`  | Run all the tests                                                   |
+| `yarn lint`  | Lint the project (eslint, prettier, flow)                           |
+| `yarn build` | Runs production build. Outputs files to `packages/jaeger-ui/build`. |
 
 ## Build
 

package.json

@@ -29,7 +29,8 @@
     "precommit": "lint-staged",
     "prettier":
       "prettier --write '{.,scripts}/*.{js,json,md}' 'packages/*/{src,demo/src}/**/*.{css,js,json,md}' 'packages/*/*.{css,js,json,md}'",
-    "test": "lerna run test"
+    "test": "lerna run test",
+    "start": "cd packages/jaeger-ui && yarn start"
   },
   "prettier": {
     "printWidth": 110,

packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.js

@@ -138,7 +138,9 @@ export function collapseOne(state, { payload }) {
   const childrenHiddenIDs = spans.reduce((res, curSpan) => {
     if (nearestCollapsedAncestor && curSpan.depth <= nearestCollapsedAncestor.depth) {
       res.add(nearestCollapsedAncestor.spanID);
-      nearestCollapsedAncestor = curSpan;
+      if (curSpan.hasChildren) {
+        nearestCollapsedAncestor = curSpan;
+      }
     } else if (curSpan.hasChildren && !res.has(curSpan.spanID)) {
       nearestCollapsedAncestor = curSpan;
     }

packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.test.js

@@ -135,12 +135,14 @@ describe('TraceTimelineViewer/duck', () => {
     // --- 2
     // - 3
     // --- 4
+    // - 5
     const spans = [
       { spanID: 0, depth: 0, hasChildren: true },
       { spanID: 1, depth: 1, hasChildren: true },
       { spanID: 2, depth: 2, hasChildren: false },
       { spanID: 3, depth: 1, hasChildren: true },
       { spanID: 4, depth: 2, hasChildren: false },
+      { spanID: 5, depth: 1, hasChildren: false },
     ];
 
     const oneSpanCollapsed = new Set([1]);