From c977d8b3acce4b2747516616386f03773f217d32 Mon Sep 17 00:00:00 2001
From: Julien Chinapen <julien.chinapen@merico.dev>
Date: Mon, 22 Aug 2022 20:01:49 -0400
Subject: [PATCH 1/2] fix: do not pre-select active entity in create-mode

---
 .../create-workflow/DataTransformations.jsx   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx b/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx
index a0cf65ae290..9990cdf82a3 100644
--- a/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx
+++ b/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx
@@ -116,18 +116,18 @@ const DataTransformations = (props) => {
   }, [entityList])
 
   useEffect(() => {
-    console.log('>>>>> PROJECT / BOARD ENTITY SELECTED!', activeEntity)
-    switch (activeEntity?.type) {
-      case 'board':
-        addBoardTransformation(activeEntity?.entity)
-        // addProjectTransformation(null)
-        break
-      case 'project':
-        addProjectTransformation(activeEntity?.entity)
-        // addBoardTransformation(null)
-        break
+    if (useDropdownSelector) {
+      console.log('>>>>> PROJECT / BOARD ENTITY SELECTED!', activeEntity)
+      switch (activeEntity?.type) {
+        case 'board':
+          addBoardTransformation(activeEntity?.entity)
+          break
+        case 'project':
+          addProjectTransformation(activeEntity?.entity)
+          break
+      }
     }
-  }, [activeEntity, addBoardTransformation, addProjectTransformation])
+  }, [activeEntity, addBoardTransformation, addProjectTransformation, useDropdownSelector])
 
   return (
     <div className='workflow-step workflow-step-add-transformation' data-step={activeStep?.id}>

From abfdca278c0c4f1a60f3ca5c7e3eeec2f8875f9e Mon Sep 17 00:00:00 2001
From: Julien Chinapen <julien.chinapen@merico.dev>
Date: Mon, 22 Aug 2022 20:12:29 -0400
Subject: [PATCH 2/2] feat: add tooltip and indicator to go back button

---
 .../create-workflow/DataTransformations.jsx           | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx b/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx
index 9990cdf82a3..197b20504e3 100644
--- a/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx
+++ b/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx
@@ -26,6 +26,9 @@ import {
   Elevation,
   Card,
   Colors,
+  Spinner,
+  Tooltip,
+  Position
 } from '@blueprintjs/core'
 import { Select } from '@blueprintjs/select'
 import { integrationsData } from '@/data/integrations'
@@ -380,6 +383,14 @@ const DataTransformations = (props) => {
                             onClick={() => onSave()}
                             // disabled={[Providers.GITLAB].includes(configuredConnection?.provider)}
                             style={{ marginLeft: '5px' }}
+                            icon={(
+                              <Tooltip
+                                position={Position.TOP}
+                                intent={Intent.PRIMARY}
+                                content={'Close Editor to Continue'}>
+                                  <Spinner size={12} />
+                              </Tooltip>
+                            )}
                           />
                         )}
                       </div>