From 4cc56eee33e531ea27d8d7041759f0db019909ec Mon Sep 17 00:00:00 2001
From: Pavel Zavora <pavel.zavora@bonitoo.io>
Date: Wed, 2 Feb 2022 15:57:21 +0100
Subject: [PATCH] feat(fluxWizard): change draft script on wizard submit

---
 .../components/TimeMachine/FluxQueryMaker.tsx | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/ui/src/shared/components/TimeMachine/FluxQueryMaker.tsx b/ui/src/shared/components/TimeMachine/FluxQueryMaker.tsx
index 396402c60..15fcec09e 100644
--- a/ui/src/shared/components/TimeMachine/FluxQueryMaker.tsx
+++ b/ui/src/shared/components/TimeMachine/FluxQueryMaker.tsx
@@ -118,7 +118,7 @@ class FluxQueryMaker extends PureComponent<Props, State> {
             <Button
               key={1}
               text={'Run Script'}
-              onClick={() => this.handleSubmitScript()}
+              onClick={this.handleSubmitScript}
               size={ComponentSize.ExtraSmall}
               color={ComponentColor.Primary}
             />,
@@ -168,7 +168,7 @@ class FluxQueryMaker extends PureComponent<Props, State> {
       <FluxQueryBuilder
         source={source}
         timeRange={timeRange}
-        onSubmit={this.handleSubmitScript}
+        onSubmit={this.handleSubmitBuilderScript}
         onShowEditor={this.handleShowEditor}
       />
     )
@@ -194,10 +194,14 @@ class FluxQueryMaker extends PureComponent<Props, State> {
     this.handleCursorPosition(cursorPosition)
   }
 
-  private handleSubmitScript = (script?: string) => {
-    const {onChangeScript, onUpdateStatus, onManualRefresh} = this.props
+  private handleSubmitScript = () => {
+    const {
+      onChangeScript,
+      onUpdateStatus,
+      onManualRefresh,
+      draftScript,
+    } = this.props
     const {draftScriptStatus} = this.state
-    const draftScript = script ? script : this.props.draftScript
 
     onChangeScript(draftScript)
     onManualRefresh()
@@ -207,6 +211,12 @@ class FluxQueryMaker extends PureComponent<Props, State> {
     }
   }
 
+  private handleSubmitBuilderScript = async (script: string) => {
+    await this.handleChangeDraftScript(script)
+    this.props.onChangeScript(script)
+    this.handleSubmitScript()
+  }
+
   private handleShowWizard = (): void => {
     this.setState({isWizardActive: true})
   }