From 4186eeb6c0beccdb453e39505cf5f7a0851ad598 Mon Sep 17 00:00:00 2001
From: Ruben Vargas <ruben.vp8510@gmail.com>
Date: Thu, 21 Feb 2019 21:48:12 -0500
Subject: [PATCH 1/3] Hide child status icon on SpanTreeOffset used in
 SpanDetailRow component

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
---
 .../TracePage/TraceTimelineViewer/SpanDetailRow.js         | 2 +-
 .../TracePage/TraceTimelineViewer/SpanDetailRow.test.js    | 2 +-
 .../TracePage/TraceTimelineViewer/SpanTreeOffset.js        | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.js
index 2c1e6583aa..d30c77f3e8 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.js
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.js
@@ -65,7 +65,7 @@ export default class SpanDetailRow extends React.PureComponent<SpanDetailRowProp
     return (
       <TimelineRow className="detail-row">
         <TimelineRow.Cell width={columnDivision}>
-          <SpanTreeOffset span={span} />
+          <SpanTreeOffset span={span} showChildrenStatus={false} />
           <span>
             <span
               className="detail-row-expanded-accent"
diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.test.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.test.js
index 6f33ef652b..2652d07b0b 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.test.js
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.test.js
@@ -63,7 +63,7 @@ describe('<SpanDetailRow>', () => {
   });
 
   it('renders the span tree offset', () => {
-    const spanTreeOffset = <SpanTreeOffset span={props.span} />;
+    const spanTreeOffset = <SpanTreeOffset span={props.span} showChildrenStatus={false} />;
     expect(wrapper.contains(spanTreeOffset)).toBe(true);
   });
 
diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js
index 133c08b4a7..217d9a0f80 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js
@@ -37,6 +37,7 @@ type SpanTreeOffsetPropsType = {
   onClick: ?() => void,
   removeHoverIndentGuideId: string => void,
   span: Span,
+  showChildrenStatus: boolean => void,
 };
 
 export class UnconnectedSpanTreeOffset extends React.PureComponent<SpanTreeOffsetPropsType> {
@@ -46,6 +47,7 @@ export class UnconnectedSpanTreeOffset extends React.PureComponent<SpanTreeOffse
   static defaultProps = {
     childrenVisible: false,
     onClick: null,
+    showChildrenStatus: true,
   };
 
   constructor(props: SpanTreeOffsetPropsType) {
@@ -105,10 +107,11 @@ export class UnconnectedSpanTreeOffset extends React.PureComponent<SpanTreeOffse
   };
 
   render() {
-    const { childrenVisible, onClick, span } = this.props;
+    const { showChildrenStatus, childrenVisible, onClick, span } = this.props;
     const { hasChildren, spanID } = span;
     const wrapperProps = hasChildren ? { onClick, role: 'switch', 'aria-checked': childrenVisible } : null;
-    const icon = hasChildren && (childrenVisible ? <IoIosArrowDown /> : <IoChevronRight />);
+    const icon =
+      showChildrenStatus && hasChildren && (childrenVisible ? <IoIosArrowDown /> : <IoChevronRight />);
     return (
       <span className={`SpanTreeOffset ${hasChildren ? 'is-parent' : ''}`} {...wrapperProps}>
         {this.ancestorIds.map(ancestorId => (

From a522f41a5dc2c35e9c3cc32c1d53749a1573a759 Mon Sep 17 00:00:00 2001
From: Joe Farro <joef@uber.com>
Date: Fri, 22 Feb 2019 14:51:22 -0500
Subject: [PATCH 2/3] Small tweak to flow type

Signed-off-by: Joe Farro <joef@uber.com>
---
 .../components/TracePage/TraceTimelineViewer/SpanTreeOffset.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js
index 217d9a0f80..87deb13990 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js
@@ -37,7 +37,7 @@ type SpanTreeOffsetPropsType = {
   onClick: ?() => void,
   removeHoverIndentGuideId: string => void,
   span: Span,
-  showChildrenStatus: boolean => void,
+  showChildrenStatus: boolean,
 };
 
 export class UnconnectedSpanTreeOffset extends React.PureComponent<SpanTreeOffsetPropsType> {

From 58093112deb3e729863db627c21d6c8388aed0c5 Mon Sep 17 00:00:00 2001
From: Ruben Vargas <ruben.vp8510@gmail.com>
Date: Fri, 22 Feb 2019 15:28:42 -0500
Subject: [PATCH 3/3] Rename showChildrenStatus attribute from SpanTreeOffset
 to showChildrenIcon

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
---
 .../TracePage/TraceTimelineViewer/SpanDetailRow.js        | 2 +-
 .../TracePage/TraceTimelineViewer/SpanDetailRow.test.js   | 2 +-
 .../TracePage/TraceTimelineViewer/SpanTreeOffset.js       | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.js
index d30c77f3e8..3ac9f115d0 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.js
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.js
@@ -65,7 +65,7 @@ export default class SpanDetailRow extends React.PureComponent<SpanDetailRowProp
     return (
       <TimelineRow className="detail-row">
         <TimelineRow.Cell width={columnDivision}>
-          <SpanTreeOffset span={span} showChildrenStatus={false} />
+          <SpanTreeOffset span={span} showChildrenIcon={false} />
           <span>
             <span
               className="detail-row-expanded-accent"
diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.test.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.test.js
index 2652d07b0b..ea6cae8c94 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.test.js
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetailRow.test.js
@@ -63,7 +63,7 @@ describe('<SpanDetailRow>', () => {
   });
 
   it('renders the span tree offset', () => {
-    const spanTreeOffset = <SpanTreeOffset span={props.span} showChildrenStatus={false} />;
+    const spanTreeOffset = <SpanTreeOffset span={props.span} showChildrenIcon={false} />;
     expect(wrapper.contains(spanTreeOffset)).toBe(true);
   });
 
diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js
index 87deb13990..9bd0971886 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js
@@ -37,7 +37,7 @@ type SpanTreeOffsetPropsType = {
   onClick: ?() => void,
   removeHoverIndentGuideId: string => void,
   span: Span,
-  showChildrenStatus: boolean,
+  showChildrenIcon: boolean,
 };
 
 export class UnconnectedSpanTreeOffset extends React.PureComponent<SpanTreeOffsetPropsType> {
@@ -47,7 +47,7 @@ export class UnconnectedSpanTreeOffset extends React.PureComponent<SpanTreeOffse
   static defaultProps = {
     childrenVisible: false,
     onClick: null,
-    showChildrenStatus: true,
+    showChildrenIcon: true,
   };
 
   constructor(props: SpanTreeOffsetPropsType) {
@@ -107,11 +107,11 @@ export class UnconnectedSpanTreeOffset extends React.PureComponent<SpanTreeOffse
   };
 
   render() {
-    const { showChildrenStatus, childrenVisible, onClick, span } = this.props;
+    const { showChildrenIcon, childrenVisible, onClick, span } = this.props;
     const { hasChildren, spanID } = span;
     const wrapperProps = hasChildren ? { onClick, role: 'switch', 'aria-checked': childrenVisible } : null;
     const icon =
-      showChildrenStatus && hasChildren && (childrenVisible ? <IoIosArrowDown /> : <IoChevronRight />);
+      showChildrenIcon && hasChildren && (childrenVisible ? <IoIosArrowDown /> : <IoChevronRight />);
     return (
       <span className={`SpanTreeOffset ${hasChildren ? 'is-parent' : ''}`} {...wrapperProps}>
         {this.ancestorIds.map(ancestorId => (