You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by kl...@apache.org on 2022/07/18 15:34:47 UTC

[incubator-devlake] branch main updated: fix: connection status from blueprint creating page (#2528)

This is an automated email from the ASF dual-hosted git repository.

klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new e55a693a fix: connection status from blueprint creating page (#2528)
e55a693a is described below

commit e55a693a00f245d39c31b87d108e480f83c6e357
Author: Klesh Wong <zh...@merico.dev>
AuthorDate: Mon Jul 18 23:34:43 2022 +0800

    fix: connection status from blueprint creating page (#2528)
    
    * fix: connection status from blueprint creating page
    
    * fix: remove `jira.since` parameter from Blueprint
---
 .../blueprints/create-workflow/DataConnections.jsx |  3 +-
 .../src/pages/blueprints/create-blueprint.jsx      | 48 ++++++++++++++--------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/config-ui/src/components/blueprints/create-workflow/DataConnections.jsx b/config-ui/src/components/blueprints/create-workflow/DataConnections.jsx
index 6fa3f261..76a25718 100644
--- a/config-ui/src/components/blueprints/create-workflow/DataConnections.jsx
+++ b/config-ui/src/components/blueprints/create-workflow/DataConnections.jsx
@@ -36,6 +36,7 @@ const DataConnections = (props) => {
     activeStep,
     name,
     blueprintConnections = [],
+    onlineStatus = [],
     connectionsList = [],
     setBlueprintName = () => {},
     setBlueprintConnections = () => {},
@@ -160,7 +161,7 @@ const DataConnections = (props) => {
                     className='connection-status'
                     style={{ textTransform: 'capitalize' }}
                   >
-                    {bC.status}
+                    {onlineStatus[bcIdx] || "Testing"}
                   </div>
                   <div
                     className='connection-actions'
diff --git a/config-ui/src/pages/blueprints/create-blueprint.jsx b/config-ui/src/pages/blueprints/create-blueprint.jsx
index 6d611037..2d3a127e 100644
--- a/config-ui/src/pages/blueprints/create-blueprint.jsx
+++ b/config-ui/src/pages/blueprints/create-blueprint.jsx
@@ -72,6 +72,9 @@ import DataSync from '@/components/blueprints/create-workflow/DataSync'
 import AdvancedJSON from '@/components/blueprints/create-workflow/AdvancedJSON'
 import AdvancedJSONValidation from '@/components/blueprints/create-workflow/AdvancedJSONValidation'
 
+import { DEVLAKE_ENDPOINT } from '@/utils/config'
+import request from '@/utils/request'
+
 // import ConnectionTabs from '@/components/blueprints/ConnectionTabs'
 
 const CreateBlueprint = (props) => {
@@ -119,6 +122,14 @@ const CreateBlueprint = (props) => {
   const [dataEntities, setDataEntities] = useState({})
   const [activeConnectionTab, setActiveConnectionTab] = useState()
 
+  const [onlineStatus, setOnlineStatus] = useState({})
+  useEffect(async () => {
+    const results = await Promise.all(blueprintConnections.map(
+      c => request.post(`${DEVLAKE_ENDPOINT}/plugins/${c.plugin}/test`, c))
+    )
+    setOnlineStatus(results.map(r => r.status === 200 ? "Online" : "Offline"))
+  }, [blueprintConnections])
+
   const [showBlueprintInspector, setShowBlueprintInspector] = useState(false)
 
   const [dataScopes, setDataScopes] = useState([])
@@ -342,7 +353,7 @@ const CreateBlueprint = (props) => {
     password,
   })
 
-  const isValidStep = useCallback((stepId) => {}, [])
+  const isValidStep = useCallback((stepId) => { }, [])
 
   const nextStep = useCallback(() => {
     setActiveStep((aS) =>
@@ -477,7 +488,7 @@ const CreateBlueprint = (props) => {
             options: {
               boardId: Number(b.id),
               // @todo: verify initial value of since date for jira provider
-              since: new Date(),
+              // since: new Date(),
             },
             transformation: { ...transformations[b.id] },
           }))
@@ -693,7 +704,7 @@ const CreateBlueprint = (props) => {
     validateBlueprint,
   ])
 
-  useEffect(() => {}, [activeConnectionTab])
+  useEffect(() => { }, [activeConnectionTab])
 
   useEffect(() => {
     setConfiguredConnection(
@@ -1001,7 +1012,7 @@ const CreateBlueprint = (props) => {
                       // manageConnection={manageConnection}
                       onAdvancedMode={handleAdvancedMode}
                       // @todo add multistage checker method
-                      isMultiStagePipeline={() => {}}
+                      isMultiStagePipeline={() => { }}
                       rawConfiguration={rawConfiguration}
                       setRawConfiguration={setRawConfiguration}
                       isSaving={isSaving}
@@ -1034,6 +1045,7 @@ const CreateBlueprint = (props) => {
                       activeStep={activeStep}
                       advancedMode={advancedMode}
                       blueprintConnections={blueprintConnections}
+                      onlineStatus={onlineStatus}
                       connectionsList={connectionsList}
                       name={name}
                       setBlueprintName={setBlueprintName}
@@ -1183,21 +1195,21 @@ const CreateBlueprint = (props) => {
         activePipeline={
           !advancedMode
             ? {
-                // ID: 0,
-                name,
-                // tasks: blueprintTasks,
-                settings: blueprintSettings,
-                cronConfig,
-                enable,
-                mode,
-              }
+              // ID: 0,
+              name,
+              // tasks: blueprintTasks,
+              settings: blueprintSettings,
+              cronConfig,
+              enable,
+              mode,
+            }
             : {
-                name,
-                plan: blueprintTasks,
-                cronConfig,
-                enable,
-                mode,
-              }
+              name,
+              plan: blueprintTasks,
+              cronConfig,
+              enable,
+              mode,
+            }
         }
         onClose={setShowBlueprintInspector}
         hasBackdrop={false}