[refactor/queue][taier-ui]move queueConfig from rightbar to create co…

…nfig

taier-ui/src/components/scaffolds/create.tsx

@@ -6,14 +6,15 @@ import {
 	FLINK_VERSION_TYPE,
 	PythonVersionKind,
 } from '@/constant';
-import { Button, Empty, Form, Input, Radio, Select } from 'antd';
+import { Button, Empty, Form, Input, Radio, Select, Spin } from 'antd';
 import { syncModeHelp, syncTaskHelp } from '../helpDoc/docs';
 import FolderPicker from '../folderPicker';
 import resourceManagerTree from '@/services/resourceManagerService';
 import { dataSourceService, taskRenderService } from '@/services';
 import { useEffect, useState } from 'react';
 import { IDataSourceProps } from '@/interface';
 import molecule from '@dtinsight/molecule';
+import api from '@/api';
 
 interface ICreateFormProps {
 	disabled?: boolean;
@@ -243,6 +244,43 @@ const DataSource = () => {
 	);
 };
 
+const QueueConfig = () => {
+	const [resourceList, setResourceList] = useState<string[]>([]);
+	const [fetching, setFetching] = useState(false);
+
+	useEffect(() => {
+		setFetching(true);
+		api.getResourceByTenant({})
+			.then((res) => {
+				if (res.code === 1) {
+					setResourceList(res.data.queues?.map((q: any) => q.queueName));
+				}
+			})
+			.finally(() => {
+				setFetching(false);
+			});
+	}, []);
+
+	return (
+		<Form.Item label="YARN 队列" name="queueName">
+			<Select
+				placeholder="请选择 YARN 队列"
+				getPopupContainer={(node) => node.parentNode}
+				options={resourceList.map((r) => ({ label: r, value: r }))}
+				showSearch
+				optionFilterProp="label"
+				notFoundContent={
+					fetching ? (
+						<Spin spinning={fetching} />
+					) : (
+						<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+					)
+				}
+			/>
+		</Form.Item>
+	);
+};
+
 /**
  * key 值为服务端字段名，value 为组件名
  */
@@ -255,4 +293,5 @@ export default {
 	exeArgs: ExeArgs,
 	pythonVersion: PythonVersion,
 	datasource: DataSource,
+	queue: QueueConfig,
 } as Record<string, (...args: any[]) => JSX.Element>;

taier-ui/src/components/task/create.tsx

@@ -116,7 +116,6 @@ const Create = connect(
 
 								if (formFields) {
 									formFields.taskProperties.formField?.forEach((field) => {
-										console.log('field;', field);
 										// 特殊处理
 										if (field === 'syncModel') {
 											form.setFieldsValue({

taier-ui/src/constant/index.ts

@@ -248,6 +248,7 @@ export enum TASK_TYPE_ENUM {
 	FLINK = 11,
 	PYTHON = 12,
 	SHELL = 13,
+	CLICKHOUSE = 26
 }
 
 /**
@@ -528,6 +529,7 @@ export const DATA_SOURCE_TEXT: Partial<{ [key in DATA_SOURCE_ENUM]: string }> =
 	[DATA_SOURCE_ENUM.KAFKA_HUAWEI]: 'Kafka_huawei',
 	[DATA_SOURCE_ENUM.HBASE_HUAWEI]: 'Hbase_huawei',
 	[DATA_SOURCE_ENUM.KAFKA_CONFLUENT]: 'Confluent',
+	[DATA_SOURCE_ENUM.DorisRestful]: 'Doris(http)',
 };
 
 /**

taier-ui/src/pages/dataSource/add.tsx

@@ -30,7 +30,7 @@ import Version from './version';
 import SelectSource from './selectSource';
 import InfoConfig from './InfoConfig';
 import type { IDataSourceProps } from '@/interface';
-import type { DATA_SOURCE_ENUM} from '@/constant';
+import type { DATA_SOURCE_ENUM } from '@/constant';
 import './add.scss';
 
 const { Step } = Steps;
@@ -230,9 +230,6 @@ export default function Add({ record, onSubmit }: IAddProps) {
 								message.success('连接成功');
 							}
 						})
-						.catch(() => {
-							message.error('测试连通性请求超时');
-						})
 						.finally(() => {
 							setLoading(false);
 							setSubmitBtnStatus(false);

taier-ui/src/services/rightBarService.tsx

@@ -17,7 +17,6 @@ import { singleton } from 'tsyringe';
 import { RightBarKind } from '@/interface';
 import { taskRenderService } from '.';
 import TaskConfig from '@/pages/rightBar/taskConfig';
-import QueueConfig from '@/pages/rightBar/queueConfig';
 
 interface IRightBarService {
 	/**
@@ -189,8 +188,6 @@ export default class RightBarService extends Component<IRightbarState> implement
 				return this.withForm(<FlinkResultPanel key="result" current={current} />);
 			case RightBarKind.FLINKSQL_DIMENSION:
 				return this.withForm(<FlinkDimensionPanel key="dimension" current={current} />);
-			case RightBarKind.QUEUE:
-				return <QueueConfig current={current} />;
 			default:
 				return null;
 		}