From a9f88f5aa74c5ec4b6de10c410476ae0a1b54b8b Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Mon, 15 Apr 2019 15:24:30 -0700
Subject: [PATCH] Extract view saving logic from component to thunk

---
 ui/src/dashboards/actions/index.ts           | 19 ++++++
 ui/src/dashboards/components/VEOContents.tsx | 62 +++++---------------
 ui/src/timeMachine/selectors/index.ts        | 18 +++++-
 3 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/ui/src/dashboards/actions/index.ts b/ui/src/dashboards/actions/index.ts
index 8bf1ff8481..664d0d61f1 100644
--- a/ui/src/dashboards/actions/index.ts
+++ b/ui/src/dashboards/actions/index.ts
@@ -49,6 +49,7 @@ import {
 import {dashboardToTemplate} from 'src/shared/utils/resourceToTemplate'
 import {client} from 'src/utils/api'
 import {exportVariables} from 'src/variables/utils/exportVariables'
+import {getSaveableView} from 'src/timeMachine/selectors'
 
 // Constants
 import * as copy from 'src/shared/copy/notifications'
@@ -508,3 +509,21 @@ export const convertToTemplate = (dashboardID: string) => async (
     dispatch(notify(copy.createTemplateFailed(error)))
   }
 }
+
+export const saveVEOView = (dashboard: Dashboard) => async (
+  dispatch,
+  getState: GetState
+): Promise<void> => {
+  const view = getSaveableView(getState())
+
+  try {
+    if (view.id) {
+      await dispatch(updateView(dashboard, view))
+    } else {
+      await dispatch(createCellWithView(dashboard, view))
+    }
+  } catch (error) {
+    console.error(error)
+    dispatch(notify(copy.cellAddFailed()))
+  }
+}
diff --git a/ui/src/dashboards/components/VEOContents.tsx b/ui/src/dashboards/components/VEOContents.tsx
index 2af566470a..826f74356d 100644
--- a/ui/src/dashboards/components/VEOContents.tsx
+++ b/ui/src/dashboards/components/VEOContents.tsx
@@ -9,33 +9,26 @@ import TimeMachine from 'src/timeMachine/components/TimeMachine'
 
 // Actions
 import {setName} from 'src/timeMachine/actions'
-import * as viewActions from 'src/dashboards/actions/views'
-import * as dashboardActions from 'src/dashboards/actions'
-import {notify} from 'src/shared/actions/notifications'
+import {saveVEOView} from 'src/dashboards/actions'
 
 // Utils
 import {getActiveTimeMachine} from 'src/timeMachine/selectors'
 
 // Types
-import {AppState, DashboardQuery} from 'src/types'
-import {QueryView} from 'src/types/dashboards'
+import {AppState} from 'src/types'
 import {Dashboard} from 'src/types'
 
 // Nofication Messages
-import {cellAddFailed} from 'src/shared/copy/notifications'
 import {executeQueries} from 'src/timeMachine/actions/queries'
 
 interface StateProps {
-  draftView: QueryView
-  draftQueries: DashboardQuery[]
+  name: string
   dashboard: Dashboard
 }
 
 interface DispatchProps {
   onSetName: typeof setName
-  onCreateCellWithView: typeof dashboardActions.createCellWithView
-  onUpdateView: typeof viewActions.updateView
-  notify: typeof notify
+  onSaveView: typeof saveVEOView
   executeQueries: typeof executeQueries
 }
 
@@ -52,13 +45,13 @@ class VEOContents extends PureComponent<Props, {}> {
   }
 
   public render() {
-    const {draftView, onSetName} = this.props
+    const {name, onSetName} = this.props
 
     return (
       <>
         <VEOHeader
-          key={draftView.name}
-          name={draftView.name}
+          key={name}
+          name={name}
           onSetName={onSetName}
           onCancel={this.props.onClose}
           onSave={this.handleSave}
@@ -71,35 +64,10 @@ class VEOContents extends PureComponent<Props, {}> {
   }
 
   private handleSave = async (): Promise<void> => {
-    const {
-      draftView,
-      draftQueries,
-      dashboard,
-      onCreateCellWithView,
-      onUpdateView,
-      notify,
-      onClose,
-    } = this.props
+    const {dashboard, onSaveView, onClose} = this.props
 
-    const view: QueryView & {id?: string} = {
-      ...draftView,
-      properties: {
-        ...draftView.properties,
-        queries: draftQueries,
-      },
-    }
-
-    try {
-      if (view.id) {
-        await onUpdateView(dashboard.id, view)
-      } else {
-        await onCreateCellWithView(dashboard, view)
-      }
-      onClose()
-    } catch (error) {
-      console.error(error)
-      notify(cellAddFailed())
-    }
+    onSaveView(dashboard)
+    onClose()
   }
 }
 
@@ -107,16 +75,16 @@ const mstp = (state: AppState, {dashboardID}): StateProps => {
   const {dashboards} = state
   const dashboard = dashboards.list.find(d => d.id === dashboardID)
 
-  const {view, draftQueries} = getActiveTimeMachine(state)
+  const {
+    view: {name},
+  } = getActiveTimeMachine(state)
 
-  return {draftView: view, draftQueries, dashboard}
+  return {name, dashboard}
 }
 
 const mdtp: DispatchProps = {
   onSetName: setName,
-  onCreateCellWithView: dashboardActions.createCellWithView,
-  onUpdateView: viewActions.updateView,
-  notify,
+  onSaveView: saveVEOView,
   executeQueries,
 }
 
diff --git a/ui/src/timeMachine/selectors/index.ts b/ui/src/timeMachine/selectors/index.ts
index 6b49373e9a..8b76555f9b 100644
--- a/ui/src/timeMachine/selectors/index.ts
+++ b/ui/src/timeMachine/selectors/index.ts
@@ -8,9 +8,7 @@ import {parseResponse} from 'src/shared/parsing/flux/response'
 import {toMinardTable} from 'src/shared/utils/toMinardTable'
 
 // Types
-import {FluxTable} from 'src/types'
-import {AppState} from 'src/types'
-import {DashboardDraftQuery} from 'src/types/dashboards'
+import {FluxTable, QueryView, AppState, DashboardDraftQuery} from 'src/types'
 
 export const getActiveTimeMachine = (state: AppState) => {
   const {activeTimeMachineID, timeMachines} = state.timeMachines
@@ -118,3 +116,17 @@ export const getFillColumnsSelection = (state: AppState): string[] => {
 
   return getFillColumnsSelectionMemoized(validFillColumns, preference)
 }
+
+export const getSaveableView = (state: AppState): QueryView & {id?: string} => {
+  const {view, draftQueries} = getActiveTimeMachine(state)
+
+  const saveableView: QueryView & {id?: string} = {
+    ...view,
+    properties: {
+      ...view.properties,
+      queries: draftQueries,
+    },
+  }
+
+  return saveableView
+}