From 97bd290f2c973066dbe7070b6eb3d615c6e4e2e0 Mon Sep 17 00:00:00 2001 From: Filip Barl Date: Fri, 23 Feb 2018 16:27:45 +0100 Subject: [PATCH] Add explicit tour-step-anchor classNames to Explore tour elements. --- .../scripts/charts/nodes-chart-elements.js | 2 +- client/app/scripts/charts/nodes-grid.js | 2 +- .../scripts/components/embedded-terminal.js | 2 +- client/app/scripts/components/node-details.js | 14 +++------- .../node-details-control-button.js | 2 +- .../node-details/node-details-table-row.js | 2 +- client/app/scripts/components/sidebar.js | 2 +- .../scripts/components/time-travel-wrapper.js | 28 ++++++++++--------- client/app/scripts/components/topologies.js | 11 ++------ .../scripts/components/view-mode-button.js | 2 +- .../scripts/components/view-mode-selector.js | 2 +- client/app/styles/_base.scss | 2 +- 12 files changed, 31 insertions(+), 40 deletions(-) diff --git a/client/app/scripts/charts/nodes-chart-elements.js b/client/app/scripts/charts/nodes-chart-elements.js index dfcf6c071..e62fd1ab3 100644 --- a/client/app/scripts/charts/nodes-chart-elements.js +++ b/client/app/scripts/charts/nodes-chart-elements.js @@ -251,7 +251,7 @@ class NodesChartElements extends React.Component { ]).flatten(true); return ( - + {orderedElements.map(this.renderElement)} ); diff --git a/client/app/scripts/charts/nodes-grid.js b/client/app/scripts/charts/nodes-grid.js index 2ba14e61c..6bff51b29 100644 --- a/client/app/scripts/charts/nodes-grid.js +++ b/client/app/scripts/charts/nodes-grid.js @@ -119,7 +119,7 @@ class NodesGrid extends React.Component { }; // TODO: What are 24 and 18? Use a comment or extract into constants. const tbodyHeight = height - 24 - 18; - const className = 'scroll-body'; + const className = 'tour-step-anchor scroll-body'; const tbodyStyle = { height: `${tbodyHeight}px`, }; diff --git a/client/app/scripts/components/embedded-terminal.js b/client/app/scripts/components/embedded-terminal.js index deed71308..45477725c 100644 --- a/client/app/scripts/components/embedded-terminal.js +++ b/client/app/scripts/components/embedded-terminal.js @@ -52,7 +52,7 @@ class EmeddedTerminal extends React.Component { // React unmount/remounts when key changes, this is important for cleaning up // the term.js and creating a new one for the new pipe. return ( -
+
{ ev.preventDefault(); this.props.clickCloseDetails(this.props.nodeId); } - handleShowTopologyForNode(ev) { + handleShowTopologyForNode = (ev) => { ev.preventDefault(); this.props.clickShowTopologyForNode(this.props.topologyId, this.props.nodeId); } @@ -176,7 +170,7 @@ class NodeDetails extends React.Component { }; return ( -
+
{tools}
@@ -192,7 +186,7 @@ class NodeDetails extends React.Component {
{showControls && -
+
{children} diff --git a/client/app/scripts/components/time-travel-wrapper.js b/client/app/scripts/components/time-travel-wrapper.js index f8c5e687d..6572203d0 100644 --- a/client/app/scripts/components/time-travel-wrapper.js +++ b/client/app/scripts/components/time-travel-wrapper.js @@ -71,19 +71,21 @@ class TimeTravelWrapper extends React.Component { render() { return ( - +
+ +
); } } diff --git a/client/app/scripts/components/topologies.js b/client/app/scripts/components/topologies.js index 7fa49eb13..4bc65ef89 100644 --- a/client/app/scripts/components/topologies.js +++ b/client/app/scripts/components/topologies.js @@ -20,12 +20,7 @@ function basicTopologyInfo(topology, searchMatchCount) { } class Topologies extends React.Component { - constructor(props, context) { - super(props, context); - this.onTopologyClick = this.onTopologyClick.bind(this); - } - - onTopologyClick(ev, topology) { + onTopologyClick = (ev, topology) => { ev.preventDefault(); trackAnalyticsEvent('scope.topology.selector.click', { topologyId: topology.get('id'), @@ -63,7 +58,7 @@ class Topologies extends React.Component { const topologyId = topology.get('id'); const isActive = topology === this.props.currentTopology; const searchMatchCount = this.props.searchMatchCountByTopology.get(topology.get('id')) || 0; - const className = classnames(`topologies-item-main topologies-item-${topologyId}`, { + const className = classnames(`tour-step-anchor topologies-item-main topologies-item-${topologyId}`, { // Don't show matches in the resource view as searching is not supported there yet. 'topologies-item-main-matched': !this.props.isResourceViewMode && searchMatchCount, 'topologies-item-main-active': isActive, @@ -91,7 +86,7 @@ class Topologies extends React.Component { render() { return ( -
+
{this.props.currentTopology && this.props.topologies.map(t => this.renderTopology(t))}
); diff --git a/client/app/scripts/components/view-mode-button.js b/client/app/scripts/components/view-mode-button.js index ce18bedfa..18daadc96 100644 --- a/client/app/scripts/components/view-mode-button.js +++ b/client/app/scripts/components/view-mode-button.js @@ -25,7 +25,7 @@ class ViewModeButton extends React.Component { const { label, viewMode, disabled } = this.props; const isSelected = (this.props.topologyViewMode === viewMode); - const className = classNames(`view-mode-selector-action view-${label}-action`, { + const className = classNames(`tour-step-anchor view-mode-selector-action view-${label}-action`, { 'view-mode-selector-action-selected': isSelected, }); diff --git a/client/app/scripts/components/view-mode-selector.js b/client/app/scripts/components/view-mode-selector.js index 8c5cf9173..b915bae3a 100644 --- a/client/app/scripts/components/view-mode-selector.js +++ b/client/app/scripts/components/view-mode-selector.js @@ -26,7 +26,7 @@ class ViewModeSelector extends React.Component { render() { return (
-
+