Feat: modify Q dev connection (#8592)

* feat:modify q dev connection ui

* feat:modify q dev connection ui

* fix:test

* fix: scopedata

Author: warren830

backend/plugins/q_dev/api/connection.go

@@ -122,12 +122,12 @@ func validateConnection(connection *models.QDevConnection) error {
 		return errors.Default.New("Bucket is required")
 	}
 
-	// Validate Identity Store fields (now required)
-	if connection.IdentityStoreId == "" {
-		return errors.Default.New("IdentityStoreId is required")
+	// Identity Store fields are optional, but must be provided together if used
+	if connection.IdentityStoreId == "" && connection.IdentityStoreRegion != "" {
+		return errors.Default.New("IdentityStoreRegion provided but IdentityStoreId is empty")
 	}
-	if connection.IdentityStoreRegion == "" {
-		return errors.Default.New("IdentityStoreRegion is required")
+	if connection.IdentityStoreId != "" && connection.IdentityStoreRegion == "" {
+		return errors.Default.New("IdentityStoreId provided but IdentityStoreRegion is empty")
 	}
 
 	// Validate rate limit

backend/plugins/q_dev/api/connection_test.go

@@ -111,38 +111,54 @@ func TestValidateConnection_MissingBucket(t *testing.T) {
 	assert.Contains(t, err.Error(), "Bucket is required")
 }
 
-func TestValidateConnection_MissingIdentityStoreId(t *testing.T) {
+func TestValidateConnection_EmptyIdentityStoreOk(t *testing.T) {
 	connection := &models.QDevConnection{
 		QDevConn: models.QDevConn{
 			AccessKeyId:         "AKIAIOSFODNN7EXAMPLE",
 			SecretAccessKey:     "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
 			Region:              "us-east-1",
 			Bucket:              "my-q-dev-bucket",
-			IdentityStoreId:     "", // Missing
-			IdentityStoreRegion: "us-west-2",
+			IdentityStoreId:     "",
+			IdentityStoreRegion: "",
+		},
+	}
+
+	err := validateConnection(connection)
+	assert.NoError(t, err)
+}
+
+func TestValidateConnection_IdentityStoreRegionWithoutId(t *testing.T) {
+	connection := &models.QDevConnection{
+		QDevConn: models.QDevConn{
+			AccessKeyId:         "AKIAIOSFODNN7EXAMPLE",
+			SecretAccessKey:     "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
+			Region:              "us-east-1",
+			Bucket:              "my-q-dev-bucket",
+			IdentityStoreId:     "",
+			IdentityStoreRegion: "us-east-1",
 		},
 	}
 
 	err := validateConnection(connection)
 	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "IdentityStoreId is required")
+	assert.Contains(t, err.Error(), "IdentityStoreRegion")
 }
 
-func TestValidateConnection_MissingIdentityStoreRegion(t *testing.T) {
+func TestValidateConnection_IdentityStoreIdWithoutRegion(t *testing.T) {
 	connection := &models.QDevConnection{
 		QDevConn: models.QDevConn{
 			AccessKeyId:         "AKIAIOSFODNN7EXAMPLE",
 			SecretAccessKey:     "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
 			Region:              "us-east-1",
 			Bucket:              "my-q-dev-bucket",
 			IdentityStoreId:     "d-1234567890",
-			IdentityStoreRegion: "", // Missing
+			IdentityStoreRegion: "",
 		},
 	}
 
 	err := validateConnection(connection)
 	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "IdentityStoreRegion is required")
+	assert.Contains(t, err.Error(), "IdentityStoreId provided but IdentityStoreRegion is empty")
 }
 
 func TestValidateConnection_InvalidRateLimit(t *testing.T) {

config-ui/src/plugins/components/connection-form/index.tsx

@@ -77,7 +77,8 @@ export const ConnectionForm = ({ plugin, connectionId, onSuccess }: Props) => {
             })
           : API.connection.testOld(
               plugin,
-              pick(values, [
+              pick({ ...initialValues, ...values }, [
+                'name',
                 'endpoint',
                 'token',
                 'username',
@@ -86,6 +87,13 @@ export const ConnectionForm = ({ plugin, connectionId, onSuccess }: Props) => {
                 'authMethod',
                 'appId',
                 'secretKey',
+                'accessKeyId',
+                'secretAccessKey',
+                'region',
+                'bucket',
+                'identityStoreId',
+                'identityStoreRegion',
+                'rateLimitPerHour',
                 'tenantId',
                 'tenantType',
                 'dbUrl',

config-ui/src/plugins/register/q-dev/config.tsx

@@ -19,64 +19,68 @@
 import { IPluginConfig } from '@/types';
 
 import Icon from './assets/icon.svg?react';
+import { AwsCredentials, IdentityCenterConfig, S3Config } from './connection-fields';
 
 export const QDevConfig: IPluginConfig = {
   plugin: 'q_dev',
   name: 'Q Developer',
   icon: ({ color }) => <Icon fill={color} />,
   sort: 20,
   connection: {
-    docLink: '', // TODO: 添加文档链接
+    docLink: 'https://devlake.apache.org/docs/UserManual/plugins/qdev',
     initialValues: {
+      name: '',
       accessKeyId: '',
       secretAccessKey: '',
       region: 'us-east-1',
       bucket: '',
       identityStoreId: '',
-      identityStoreRegion: 'us-east-1',
+      identityStoreRegion: '',
       rateLimitPerHour: 20000,
     },
     fields: [
       'name',
-      {
-        key: 'accessKeyId',
-        label: 'AWS Access Key ID',
-        subLabel: '请输入您的AWS Access Key ID',
-      },
-      {
-        key: 'secretAccessKey',
-        label: 'AWS Secret Access Key',
-        subLabel: '请输入您的AWS Secret Access Key',
-      },
-      {
-        key: 'region',
-        label: 'AWS区域',
-        subLabel: '请输入AWS区域，例如：us-east-1',
-      },
-      {
-        key: 'bucket',
-        label: 'S3存储桶名称',
-        subLabel: '请输入存储Q Developer数据的S3存储桶名称',
-      },
-      {
-        key: 'identityStoreId',
-        label: 'IAM Identity Store ID',
-        subLabel: '请输入Identity Store ID，格式：d-xxxxxxxxxx',
-      },
-      {
-        key: 'identityStoreRegion',
-        label: 'IAM Identity Center区域',
-        subLabel: '请输入IAM Identity Center所在的AWS区域',
-      },
+      ({ type, initialValues, values, setValues, setErrors }: any) => (
+        <AwsCredentials
+          key="qdev-aws"
+          type={type}
+          initialValues={initialValues}
+          values={values}
+          setValues={setValues}
+          setErrors={setErrors}
+        />
+      ),
+      ({ initialValues, values, setValues, setErrors }: any) => (
+        <S3Config
+          key="qdev-s3"
+          initialValues={initialValues}
+          values={values}
+          setValues={setValues}
+          setErrors={setErrors}
+        />
+      ),
+      ({ initialValues, values, setValues, setErrors }: any) => (
+        <IdentityCenterConfig
+          key="qdev-identity"
+          initialValues={initialValues}
+          values={values}
+          setValues={setValues}
+          setErrors={setErrors}
+        />
+      ),
       'proxy',
       {
         key: 'rateLimitPerHour',
-        subLabel: '设置每小时的API请求限制，用于控制数据收集速度',
+        subLabel: 'Set a fixed hourly rate limit if you need to throttle collection speed (default 20,000).',
         defaultValue: 20000,
       },
     ],
   },
   dataScope: {
-    title: 'Data Sources',
+    title: 'S3 Prefixes',
+  },
+  scopeConfig: {
+    entities: ['CROSS'],
+    transformation: {},
   },
-};
+};