From 7b9abf9080a7ea6203a94918ecf3579290f64b35 Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Wed, 20 Jun 2018 10:38:23 -0700
Subject: [PATCH] Rename prop to "RenderPageControls"

---
 ui/src/alerts/containers/AlertsApp.tsx        |  4 +--
 .../dashboards/components/DashboardHeader.tsx |  8 ++---
 .../data_explorer/containers/DataExplorer.tsx |  4 +--
 ui/src/flux/components/FluxHeader.tsx         |  4 +--
 ui/src/hosts/containers/HostsPage.js          |  4 +--
 ui/src/kapacitor/components/KapacitorRule.js  |  4 +--
 .../kapacitor/components/TickscriptHeader.tsx | 33 ++++++++++---------
 .../containers/KapacitorRulesPage.tsx         |  4 +--
 ui/src/logs/components/LogViewerHeader.tsx    |  4 +--
 ui/src/shared/components/PageHeader.tsx       |  8 ++---
 ui/src/status/containers/StatusPage.js        |  4 +--
 11 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/ui/src/alerts/containers/AlertsApp.tsx b/ui/src/alerts/containers/AlertsApp.tsx
index a4ac349a3a..1a6b225483 100644
--- a/ui/src/alerts/containers/AlertsApp.tsx
+++ b/ui/src/alerts/containers/AlertsApp.tsx
@@ -97,7 +97,7 @@ class AlertsApp extends PureComponent<Props, State> {
       <div className="page alert-history-page">
         <PageHeader
           title="Alert History"
-          renderOptions={this.renderHeaderOptions}
+          renderPageControls={this.renderPageControls}
           sourceIndicator={true}
         />
         <div className="page-contents">
@@ -111,7 +111,7 @@ class AlertsApp extends PureComponent<Props, State> {
     )
   }
 
-  private renderHeaderOptions = (): JSX.Element => {
+  private renderPageControls = (): JSX.Element => {
     const {timeRange} = this.state
 
     return (
diff --git a/ui/src/dashboards/components/DashboardHeader.tsx b/ui/src/dashboards/components/DashboardHeader.tsx
index 81759b6ffa..4f1c764139 100644
--- a/ui/src/dashboards/components/DashboardHeader.tsx
+++ b/ui/src/dashboards/components/DashboardHeader.tsx
@@ -52,14 +52,14 @@ class DashboardHeader extends Component<Props> {
       <PageHeader
         fullWidth={true}
         sourceIndicator={true}
-        renderTitle={this.title}
-        renderOptions={this.options}
+        renderTitle={this.renderPageTitle}
+        renderPageControls={this.renderPageControls}
         inPresentationMode={isHidden}
       />
     )
   }
 
-  private title = (): JSX.Element => {
+  private renderPageTitle = (): JSX.Element => {
     return (
       <>
         {this.dashboardSwitcher}
@@ -68,7 +68,7 @@ class DashboardHeader extends Component<Props> {
     )
   }
 
-  private options = (): JSX.Element => {
+  private renderPageControls = (): JSX.Element => {
     const {
       handleChooseAutoRefresh,
       onManualRefresh,
diff --git a/ui/src/data_explorer/containers/DataExplorer.tsx b/ui/src/data_explorer/containers/DataExplorer.tsx
index 328bb45ddc..0ffc02c859 100644
--- a/ui/src/data_explorer/containers/DataExplorer.tsx
+++ b/ui/src/data_explorer/containers/DataExplorer.tsx
@@ -119,7 +119,7 @@ export class DataExplorer extends PureComponent<Props, State> {
         <PageHeader
           title="Data Explorer"
           fullWidth={true}
-          renderOptions={this.renderHeaderOptions}
+          renderPageControls={this.renderPageControls}
           sourceIndicator={true}
         />
         <ResizeContainer
@@ -186,7 +186,7 @@ export class DataExplorer extends PureComponent<Props, State> {
     return buildRawText(this.activeQuery, timeRange)
   }
 
-  private renderHeaderOptions = (): JSX.Element => {
+  private renderPageControls = (): JSX.Element => {
     const {
       timeRange,
       autoRefresh,
diff --git a/ui/src/flux/components/FluxHeader.tsx b/ui/src/flux/components/FluxHeader.tsx
index 5ec4b569c2..b9f381efdb 100644
--- a/ui/src/flux/components/FluxHeader.tsx
+++ b/ui/src/flux/components/FluxHeader.tsx
@@ -22,12 +22,12 @@ class FluxHeader extends PureComponent<Props> {
       <PageHeader
         title="Flux Editor"
         fullWidth={true}
-        renderOptions={this.renderOptions}
+        renderPageControls={this.renderPageControls}
       />
     )
   }
 
-  private renderOptions = (): JSX.Element => {
+  private renderPageControls = (): JSX.Element => {
     return (
       <button onClick={this.overlay} className="btn btn-sm btn-default">
         Edit Connection
diff --git a/ui/src/hosts/containers/HostsPage.js b/ui/src/hosts/containers/HostsPage.js
index e0ef33d7c2..ec18e01297 100644
--- a/ui/src/hosts/containers/HostsPage.js
+++ b/ui/src/hosts/containers/HostsPage.js
@@ -116,7 +116,7 @@ export class HostsPage extends Component {
       <div className="page hosts-list-page">
         <PageHeader
           title="Host List"
-          renderOptions={this.renderHeaderOptions}
+          renderPageControls={this.renderPageControls}
           sourceIndicator={true}
         />
         <div className="page-contents">
@@ -137,7 +137,7 @@ export class HostsPage extends Component {
     )
   }
 
-  renderHeaderOptions = () => {
+  renderPageControls = () => {
     const {autoRefresh, onChooseAutoRefresh, onManualRefresh} = this.props
 
     return (
diff --git a/ui/src/kapacitor/components/KapacitorRule.js b/ui/src/kapacitor/components/KapacitorRule.js
index 4c983c5f98..e658319e87 100644
--- a/ui/src/kapacitor/components/KapacitorRule.js
+++ b/ui/src/kapacitor/components/KapacitorRule.js
@@ -167,7 +167,7 @@ class KapacitorRule extends Component {
     ruleActions.updateRuleValues(rule.id, rule.trigger, {period: text})
   }
 
-  renderHeaderOptions = () => {
+  renderPageControls = () => {
     return (
       <RuleHeaderSave
         onSave={this.handleSave}
@@ -192,7 +192,7 @@ class KapacitorRule extends Component {
       <div className="page">
         <PageHeader
           title="Alert Rule Builder"
-          renderOptions={this.renderHeaderOptions}
+          renderPageControls={this.renderPageControls}
           sourceIndicator={true}
         />
         <FancyScrollbar className="page-contents fancy-scroll--kapacitor">
diff --git a/ui/src/kapacitor/components/TickscriptHeader.tsx b/ui/src/kapacitor/components/TickscriptHeader.tsx
index e088d1827d..614f873be0 100644
--- a/ui/src/kapacitor/components/TickscriptHeader.tsx
+++ b/ui/src/kapacitor/components/TickscriptHeader.tsx
@@ -23,30 +23,31 @@ class TickscriptHeader extends PureComponent<Props> {
         title="TICKscript Editor"
         fullWidth={true}
         sourceIndicator={true}
-        renderCenter={this.logsToggle}
-        renderOptions={this.saveAndExit}
+        renderPageControls={this.renderPageControls}
       />
     )
   }
 
-  private logsToggle = (): JSX.Element => {
-    const {areLogsEnabled, areLogsVisible, onToggleLogsVisibility} = this.props
-
-    return (
-      <LogsToggle
-        areLogsEnabled={areLogsEnabled}
-        areLogsVisible={areLogsVisible}
-        onToggleLogsVisibility={onToggleLogsVisibility}
-      />
-    )
-  }
-
-  private saveAndExit = (): JSX.Element => {
-    const {task, onSave, onExit, unsavedChanges, isNewTickscript} = this.props
+  private renderPageControls = (): JSX.Element => {
+    const {
+      task,
+      onSave,
+      onExit,
+      unsavedChanges,
+      isNewTickscript,
+      areLogsEnabled,
+      areLogsVisible,
+      onToggleLogsVisibility,
+    } = this.props
 
     if (unsavedChanges) {
       return (
         <>
+          <LogsToggle
+            areLogsEnabled={areLogsEnabled}
+            areLogsVisible={areLogsVisible}
+            onToggleLogsVisibility={onToggleLogsVisibility}
+          />
           <TickscriptSave
             task={task}
             onSave={onSave}
diff --git a/ui/src/kapacitor/containers/KapacitorRulesPage.tsx b/ui/src/kapacitor/containers/KapacitorRulesPage.tsx
index 4ac316d47f..1d602440ae 100644
--- a/ui/src/kapacitor/containers/KapacitorRulesPage.tsx
+++ b/ui/src/kapacitor/containers/KapacitorRulesPage.tsx
@@ -91,7 +91,7 @@ const PageContents: SFC<PageContentsProps> = ({children}) => (
   <div className="page">
     <PageHeader
       title="Manage Tasks"
-      renderOptions={renderHeaderOptions}
+      renderPageControls={renderPageControls}
       sourceIndicator={true}
     />
     <FancyScrollbar className="page-contents fancy-scroll--kapacitor">
@@ -104,7 +104,7 @@ const PageContents: SFC<PageContentsProps> = ({children}) => (
   </div>
 )
 
-const renderHeaderOptions = (): JSX.Element => {
+const renderPageControls = (): JSX.Element => {
   return (
     <QuestionMarkTooltip
       tipID="manage-tasks--tooltip"
diff --git a/ui/src/logs/components/LogViewerHeader.tsx b/ui/src/logs/components/LogViewerHeader.tsx
index 8713c2504a..fa0706d1d6 100644
--- a/ui/src/logs/components/LogViewerHeader.tsx
+++ b/ui/src/logs/components/LogViewerHeader.tsx
@@ -33,7 +33,7 @@ class LogViewerHeader extends PureComponent<Props> {
       <PageHeader
         renderTitle={this.renderHeaderTitle}
         fullWidth={true}
-        renderOptions={this.renderHeaderOptions}
+        renderPageControls={this.renderPageControls}
       />
     )
   }
@@ -47,7 +47,7 @@ class LogViewerHeader extends PureComponent<Props> {
     )
   }
 
-  private renderHeaderOptions = (): JSX.Element => {
+  private renderPageControls = (): JSX.Element => {
     const {timeRange} = this.props
 
     return (
diff --git a/ui/src/shared/components/PageHeader.tsx b/ui/src/shared/components/PageHeader.tsx
index eff5dfd800..9b11b327d5 100644
--- a/ui/src/shared/components/PageHeader.tsx
+++ b/ui/src/shared/components/PageHeader.tsx
@@ -7,7 +7,7 @@ import SourceIndicator from 'src/shared/components/SourceIndicator'
 interface Props {
   title?: string
   renderTitle?: () => ReactElement<any>
-  renderOptions?: () => ReactElement<any>
+  renderPageControls?: () => ReactElement<any>
   fullWidth?: boolean
   sourceIndicator?: boolean
   inPresentationMode?: boolean
@@ -59,13 +59,13 @@ class PageHeader extends Component<Props> {
   }
 
   private get renderRight(): JSX.Element {
-    const {renderOptions} = this.props
+    const {renderPageControls} = this.props
 
-    if (!renderOptions) {
+    if (!renderPageControls) {
       return
     }
 
-    return renderOptions()
+    return renderPageControls()
   }
 
   private get className(): string {
diff --git a/ui/src/status/containers/StatusPage.js b/ui/src/status/containers/StatusPage.js
index ce5fecbcc3..02c528dfb8 100644
--- a/ui/src/status/containers/StatusPage.js
+++ b/ui/src/status/containers/StatusPage.js
@@ -61,7 +61,7 @@ class StatusPage extends Component {
         <PageHeader
           title="Status"
           fullWidth={true}
-          renderOptions={this.renderHeaderOptions}
+          renderPageControls={this.renderPageControls}
         />
         <FancyScrollbar className="page-contents">
           <div className="dashboard container-fluid full-width">
@@ -85,7 +85,7 @@ class StatusPage extends Component {
     )
   }
 
-  renderHeaderOptions = () => {
+  renderPageControls = () => {
     return <SourceIndicator />
   }
 }