From be9774a76b4b6dcdb8cc2147a93d7c8676438292 Mon Sep 17 00:00:00 2001
From: Richard Zang <Zangr@users.noreply.github.com>
Date: Mon, 17 Jun 2019 10:36:27 -0700
Subject: [PATCH] Refine new metrics UI controls  (#1427)

* remove title

* smoothness tooltip

* lint

* style changes requested by joy

* address tooltip text
---
 .../server/js/src/components/MetricView.css   |  20 +++-
 .../js/src/components/MetricsPlotControls.js  | 108 ++++++++++--------
 2 files changed, 82 insertions(+), 46 deletions(-)

diff --git a/mlflow/server/js/src/components/MetricView.css b/mlflow/server/js/src/components/MetricView.css
index 2ceff8103f17f..05c714727a33c 100644
--- a/mlflow/server/js/src/components/MetricView.css
+++ b/mlflow/server/js/src/components/MetricView.css
@@ -34,13 +34,31 @@ div.MetricView .recharts-tooltip-item-value, .recharts-tooltip-item-separator {
 
 .metrics-plot-container .plot-controls .metrics-select {
   width: 300px;
+  display: block;
 }
 
 .metrics-plot-container .plot-controls .metrics-select input[type=text] {
   padding: 0;
 }
 
-.metrics-plot-container .plot-controls h3 {
+.metrics-plot-container .plot-controls {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  min-height: 500px;
+}
+
+.metrics-plot-container .plot-controls .inline-control {
+  margin-top: 25px;
+  display: flex;
+  align-items: center;
+}
+
+.metrics-plot-container .plot-controls .inline-control .control-label {
+  margin-right: 10px;
+}
+
+.metrics-plot-container .plot-controls .block-control {
   margin-top: 25px;
 }
 
diff --git a/mlflow/server/js/src/components/MetricsPlotControls.js b/mlflow/server/js/src/components/MetricsPlotControls.js
index a71c4dd705c52..cc16fb007f67b 100644
--- a/mlflow/server/js/src/components/MetricsPlotControls.js
+++ b/mlflow/server/js/src/components/MetricsPlotControls.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import _ from 'lodash';
-import { Radio, Switch, TreeSelect } from 'antd';
+import { Radio, Switch, TreeSelect, Icon, Tooltip } from 'antd';
 import PropTypes from 'prop-types';
 import { CHART_TYPE_LINE } from './MetricsPlotPanel';
 import { LineSmoothSlider } from './LineSmoothSlider';
@@ -39,56 +39,74 @@ export class MetricsPlotControls extends React.Component {
 
   render() {
     const { chartType } = this.props;
+    const lineSmoothnessTooltipText =
+      'Make the line between points "smoother" based on generalized Catmull-Rom splines. ' +
+      'Smoothing can be useful for displaying the ' +
+      'overall trend when the logging frequency is high.';
     return (
       <div className='plot-controls'>
-        <h2>Plot Settings</h2>
         {chartType === CHART_TYPE_LINE ? (
           <div>
-            <h3>Points:</h3>
-            <Switch
-              className='show-point-toggle'
-              checkedChildren='On'
-              unCheckedChildren='Off'
-              onChange={this.props.handleShowPointChange}
-            />
-            <h3>Line Smoothness</h3>
-            <LineSmoothSlider
-              className='smoothness-toggle'
-              min={0}
-              max={1.3}
-              handleLineSmoothChange={_.debounce(this.props.handleLineSmoothChange, 500)}
-            />
-            <h3>X-axis:</h3>
-            <RadioGroup onChange={this.props.handleXAxisChange} value={this.props.selectedXAxis}>
-              <Radio className='x-axis-radio' value={X_AXIS_STEP}>
-                Step
-              </Radio>
-              <Radio className='x-axis-radio' value={X_AXIS_WALL}>
-                Time (Wall)
-              </Radio>
-              <Radio className='x-axis-radio' value={X_AXIS_RELATIVE}>
-                Time (Relative)
-              </Radio>
-            </RadioGroup>
+            <div className='inline-control'>
+              <div className='control-label'>Points:</div>
+              <Switch
+                className='show-point-toggle'
+                checkedChildren='On'
+                unCheckedChildren='Off'
+                onChange={this.props.handleShowPointChange}
+              />
+            </div>
+            <div className='block-control'>
+              <div className='control-label'>
+                Line Smoothness {' '}
+                <Tooltip title={lineSmoothnessTooltipText}>
+                  <Icon type='question-circle' />
+                </Tooltip>
+              </div>
+              <LineSmoothSlider
+                className='smoothness-toggle'
+                min={0}
+                max={1.3}
+                handleLineSmoothChange={_.debounce(this.props.handleLineSmoothChange, 500)}
+              />
+            </div>
+            <div className='block-control'>
+              <div className='control-label'>X-axis:</div>
+              <RadioGroup onChange={this.props.handleXAxisChange} value={this.props.selectedXAxis}>
+                <Radio className='x-axis-radio' value={X_AXIS_STEP}>
+                  Step
+                </Radio>
+                <Radio className='x-axis-radio' value={X_AXIS_WALL}>
+                  Time (Wall)
+                </Radio>
+                <Radio className='x-axis-radio' value={X_AXIS_RELATIVE}>
+                  Time (Relative)
+                </Radio>
+              </RadioGroup>
+            </div>
           </div>
         ) : null}
-        <h3>Y-axis:</h3>
-        <TreeSelect
-          className='metrics-select'
-          searchPlaceholder='Please select metric'
-          value={this.props.selectedMetricKeys}
-          showCheckedStrategy={TreeSelect.SHOW_PARENT}
-          treeCheckable
-          treeData={this.getAllMetricKeys()}
-          onChange={this.props.handleMetricsSelectChange}
-          filterTreeNode={this.handleMetricsSelectFilterChange}
-        />
-        <h3>Log Scale:</h3>
-        <Switch
-          checkedChildren='On'
-          unCheckedChildren='Off'
-          onChange={this.props.handleYAxisLogScaleChange}
-        />
+        <div className='block-control'>
+          <div className='control-label'>Y-axis:</div>
+          <TreeSelect
+            className='metrics-select'
+            searchPlaceholder='Please select metric'
+            value={this.props.selectedMetricKeys}
+            showCheckedStrategy={TreeSelect.SHOW_PARENT}
+            treeCheckable
+            treeData={this.getAllMetricKeys()}
+            onChange={this.props.handleMetricsSelectChange}
+            filterTreeNode={this.handleMetricsSelectFilterChange}
+          />
+        </div>
+        <div className='inline-control'>
+          <div className='control-label'>Y-axis Log Scale:</div>
+          <Switch
+            checkedChildren='On'
+            unCheckedChildren='Off'
+            onChange={this.props.handleYAxisLogScaleChange}
+          />
+        </div>
       </div>
     );
   }