Remove stateful component wrapper

ui/src/dashboards/components/Dashboard.js

@@ -22,7 +22,6 @@ const Dashboard = ({
   templatesIncludingDashTime,
   onSummonOverlayTechnologies,
   onSelectTemplate,
-  updateTempVarValues,
   showTemplateControlBar,
 }) => {
   const cells = dashboard.cells.map(cell => {
@@ -50,11 +49,9 @@ const Dashboard = ({
         {inPresentationMode
           ? null
           : <TemplateControlBar
-              source={source}
-              dashboard={dashboard}
+              dashboard={dashboard.templates}
               onSelectTemplate={onSelectTemplate}
               onOpenTemplateManager={onOpenTemplateManager}
-              updateTempVarValues={updateTempVarValues}
               isOpen={showTemplateControlBar}
             />}
         {cells.length

ui/src/dashboards/components/TemplateControlBar.js

@@ -1,4 +1,4 @@
-import React, {PropTypes, Component} from 'react'
+import React, {PropTypes} from 'react'
 import classnames from 'classnames'
 
 import Dropdown from 'shared/components/Dropdown'
@@ -10,7 +10,7 @@ const TemplateControlBar = ({
   onSelectTemplate,
   onOpenTemplateManager,
   isOpen,
-}) =>
+}) => (
   <div className={classnames('template-control-bar', {show: isOpen})}>
     <div className="template-control--container">
       <div className="template-control--controls">
@@ -53,42 +53,10 @@ const TemplateControlBar = ({
       </button>
     </div>
   </div>
+)
 
 const {arrayOf, bool, func, shape, string} = PropTypes
 
-class ControlBarWrapper extends Component {
-  constructor(props) {
-    super(props)
-  }
-
-  render() {
-    const {
-      isOpen,
-      dashboard,
-      onSelectTemplate,
-      onOpenTemplateManager,
-    } = this.props
-
-    return (
-      <TemplateControlBar
-        isOpen={isOpen}
-        templates={dashboard.templates}
-        onSelectTemplate={onSelectTemplate}
-        onOpenTemplateManager={onOpenTemplateManager}
-      />
-    )
-  }
-}
-
-ControlBarWrapper.propTypes = {
-  isOpen: bool,
-  source: shape().isRequired,
-  dashboard: shape().isRequired,
-  onSelectTemplate: func.isRequired,
-  updateTempVarValues: func.isRequired,
-  onOpenTemplateManager: func.isRequired,
-}
-
 TemplateControlBar.propTypes = {
   templates: arrayOf(
     shape({
@@ -106,4 +74,4 @@ TemplateControlBar.propTypes = {
   isOpen: bool,
 }
 
-export default ControlBarWrapper
+export default TemplateControlBar

ui/src/dashboards/containers/DashboardPage.js

@@ -10,7 +10,8 @@ import CellEditorOverlay from 'src/dashboards/components/CellEditorOverlay'
 import DashboardHeader from 'src/dashboards/components/DashboardHeader'
 import DashboardHeaderEdit from 'src/dashboards/components/DashboardHeaderEdit'
 import Dashboard from 'src/dashboards/components/Dashboard'
-import TemplateVariableManager from 'src/dashboards/components/TemplateVariableManager'
+import TemplateVariableManager
+  from 'src/dashboards/components/TemplateVariableManager'
 
 import {errorThrown as errorThrownAction} from 'shared/actions/errors'
 
@@ -282,10 +283,8 @@ class DashboardPage extends Component {
       values: [],
     }
 
-    const templatesIncludingDashTime =
-      (dashboard &&
-        dashboard.templates.concat(dashboardTime).concat(interval)) ||
-      []
+    const templatesIncludingDashTime = (dashboard &&
+      dashboard.templates.concat(dashboardTime)) || []
 
     const {selectedCell, isEditMode, isTemplating} = this.state
 
@@ -338,13 +337,13 @@ class DashboardPage extends Component {
               showTemplateControlBar={showTemplateControlBar}
             >
               {dashboards
-                ? dashboards.map((d, i) =>
+                ? dashboards.map((d, i) => (
                     <li className="dropdown-item" key={i}>
                       <Link to={`/sources/${sourceID}/dashboards/${d.id}`}>
                         {d.name}
                       </Link>
                     </li>
-                  )
+                  ))
                 : null}
             </DashboardHeader>}
         {dashboard
@@ -363,7 +362,6 @@ class DashboardPage extends Component {
               onUpdateCell={this.handleUpdateDashboardCell}
               onOpenTemplateManager={this.handleOpenTemplateManager}
               templatesIncludingDashTime={templatesIncludingDashTime}
-              updateTempVarValues={dashboardActions.updateTempVarValues}
               onSummonOverlayTechnologies={this.handleSummonOverlayTechnologies}
               onSelectTemplate={this.handleSelectTemplate}
               showTemplateControlBar={showTemplateControlBar}