PullRequest: 534 fix/dev-4.3.2-3378

Merge branch 'fix/dev-4.3.2-3378 of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.3.2 https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/534 Signed-off-by: 晓康 <xxk268858@oceanbase.com> * Fixes oceanbase/odc#3378 * Fixes oceanbase/odc#3498 * Fixes oceanbase/odc#3506 * fix: edit logical table * fix: multi database change should has same connecType * Fixes oceanbase/odc#3473 * Fixes oceanbase/odc#3509 * clear error when previewLogicalTableTopologies success * Fixes oceanbase/odc#3476 * Fixes oceanbase/odc#3444
oceanbase · Sep 23, 2024 · aea920f · aea920f
1 parent 903dc3b
commit aea920f
Show file tree

Hide file tree

Showing 17 changed files with 161 additions and 97 deletions.
diff --git a/src/common/datasource/pg/index.tsx b/src/common/datasource/pg/index.tsx
@@ -64,6 +64,7 @@ const items: Record<ConnectType.PG, IDataSourceModeConfig> = {
       sys: false,
       ssl: false,
       jdbcDoc: 'https://jdbc.postgresql.org/documentation/use/',
+      disableURLParse: true,
     },
     features: {
       task: [TaskType.DATA_ARCHIVE, TaskType.DATA_DELETE],

diff --git a/src/component/Task/DataArchiveTask/CreateModal/index.tsx b/src/component/Task/DataArchiveTask/CreateModal/index.tsx
@@ -53,6 +53,7 @@ import ArchiveRange from './ArchiveRange';
 import styles from './index.less';
 import VariableConfig, { timeUnitOptions } from './VariableConfig';
 import ShardingStrategyItem from '../../component/ShardingStrategyItem';
+import { disabledDate } from '@/util/utils';
 
 export enum IArchiveRange {
   PORTION = 'portion',
@@ -654,7 +655,11 @@ const CreateModal: React.FC<IProps> = (props) => {
                     })}
                     /*执行时间*/ required
                   >
-                    <DatePicker showTime suffixIcon={<FieldTimeOutlined />} />
+                    <DatePicker
+                      showTime
+                      suffixIcon={<FieldTimeOutlined />}
+                      disabledDate={disabledDate}
+                    />
                   </Form.Item>
                 );
               }

diff --git a/src/component/Task/DataClearTask/CreateModal/index.tsx b/src/component/Task/DataClearTask/CreateModal/index.tsx
@@ -53,6 +53,7 @@ import ArchiveRange from './ArchiveRange';
 import styles from './index.less';
 import VariableConfig from './VariableConfig';
 import ShardingStrategyItem from '../../component/ShardingStrategyItem';
+import { disabledDate } from '@/util/utils';
 
 export enum IArchiveRange {
   PORTION = 'portion',
@@ -612,7 +613,11 @@ const CreateModal: React.FC<IProps> = (props) => {
               if (triggerStrategy === TaskExecStrategy.START_AT) {
                 return (
                   <Form.Item name="startAt">
-                    <DatePicker showTime suffixIcon={<FieldTimeOutlined />} />
+                    <DatePicker
+                      showTime
+                      suffixIcon={<FieldTimeOutlined />}
+                      disabledDate={disabledDate}
+                    />
                   </Form.Item>
                 );
               }

diff --git a/src/component/Task/DetailModal.tsx b/src/component/Task/DetailModal.tsx
@@ -174,9 +174,13 @@ const DetailModal: React.FC<IProps> = React.memo((props) => {
     }
   };
 
-  const getLog = async function () {
+  const getLog = async function (args?: ITableLoadOptions) {
     if (isLogicalDbChangeTask(task?.type)) {
-      const flowId = subTasks?.contents?.[0]?.id;
+      let flowId = subTasks?.contents?.[0]?.id;
+      if (!flowId) {
+        const data = await loadDataArchiveSubTask(args);
+        flowId = data?.contents?.[0]?.id;
+      }
       if (flowId) {
         const res = await getCycleTaskLog(task?.id, flowId, logType);
         setLog({
@@ -220,7 +224,7 @@ const DetailModal: React.FC<IProps> = React.memo((props) => {
     const data = await getDataArchiveSubTask(task?.id, { page: current, size: pageSize });
     setLoading(false);
     setSubTasks(data);
-    // debugger;
+    return data;
   };
 
   const getResult = async function () {
@@ -286,8 +290,7 @@ const DetailModal: React.FC<IProps> = React.memo((props) => {
     switch (detailType) {
       case TaskDetailType.LOG: {
         if (isLogicalDbChangeTask(task?.type)) {
-          await getExecuteRecord(args);
-          getLog();
+          getLog(args);
         } else {
           getLog();
         }

diff --git a/src/component/Task/LogicDatabaseAsyncTask/CreateModal/index.tsx b/src/component/Task/LogicDatabaseAsyncTask/CreateModal/index.tsx
@@ -24,7 +24,7 @@ import type { TaskStore } from '@/store/task';
 import utils, { IEditor } from '@/util/editor';
 import { formatMessage } from '@/util/intl';
 import { FieldTimeOutlined } from '@ant-design/icons';
-
+import { disabledDate } from '@/util/utils';
 import { ICycleTaskTriggerConfig, TaskOperationType } from '@/d.ts';
 import {
   Alert,
@@ -93,6 +93,7 @@ const CreateModal: React.FC<IProps> = (props) => {
   useEffect(() => {
     if (logicDatabaseInfo?.ddl) {
       form?.setFieldValue('sqlContent', logicDatabaseInfo?.ddl);
+      form?.setFieldValue('databaseId', logicDatabaseInfo?.databaseId);
     }
   }, [logicDatabaseInfo?.ddl]);
 
@@ -243,19 +244,13 @@ const CreateModal: React.FC<IProps> = (props) => {
           name="basic"
           initialValues={{
             triggerStrategy: TaskExecStrategy.START_NOW,
-            databaseId: logicDatabaseInfo?.databaseId,
           }}
           layout="vertical"
           requiredMark="optional"
           form={form}
           onFieldsChange={handleFieldsChange}
         >
-          <DatabaseSelect
-            isLogicalDatabase
-            label={'逻辑库'}
-            type={TaskType.ALTER_SCHEDULE}
-            projectId={logicDatabaseInfo?.projectId}
-          />
+          <DatabaseSelect isLogicalDatabase label={'逻辑库'} type={TaskType.ALTER_SCHEDULE} />
           <Form.Item label="SQL 内容" required>
             <div
               style={{
@@ -395,7 +390,11 @@ const CreateModal: React.FC<IProps> = (props) => {
                       })}
                       /*执行时间*/ required
                     >
-                      <DatePicker showTime suffixIcon={<FieldTimeOutlined />} />
+                      <DatePicker
+                        showTime
+                        suffixIcon={<FieldTimeOutlined />}
+                        disabledDate={disabledDate}
+                      />
                     </Form.Item>
                   );
                 }

diff --git a/src/component/Task/MutipleAsyncTask/CreateModal/DatabaseQueue.tsx b/src/component/Task/MutipleAsyncTask/CreateModal/DatabaseQueue.tsx
@@ -39,6 +39,7 @@ export const DatabaseQueueSelect: React.FC<{
   const form = Form.useFormInstance();
   const statusMap = datasourceStatus.statusMap;
   const projectId = Form.useWatch('projectId', form);
+  const orderedDatabaseIds = Form.useWatch(['parameters', 'orderedDatabaseIds'], form);
   const [databaseIdMap, setDatabaseIdMap] = useState<Map<number, boolean>>(new Map());
   const [_databaseOptions, setDatabaseOptions] = useState<DatabaseOption[]>([]);
   const {
@@ -87,6 +88,7 @@ export const DatabaseQueueSelect: React.FC<{
                 DatabasePermissionType.CHANGE,
               ),
               expired: checkDbExpiredByDataSourceStatus(statusInfo?.status),
+              connectType: item?.connectType,
             };
           }),
       );
@@ -98,13 +100,27 @@ export const DatabaseQueueSelect: React.FC<{
   };
 
   const databaseOptions = useMemo(() => {
-    return _databaseOptions?.map((item) => {
-      return {
-        ...item,
-        expired: checkDbExpiredByDataSourceStatus(statusMap.get(item?.dataSource?.id)?.status),
-      };
-    });
-  }, [statusMap, _databaseOptions]);
+    const selectedDbId = orderedDatabaseIds?.flat()?.filter(Boolean)?.[0];
+    const selectedDbInfo = _databaseOptions?.find((_db) => _db.value === selectedDbId);
+    if (selectedDbId) {
+      // 这里加同数据源类型的限制
+      return _databaseOptions
+        ?.filter((_db) => _db?.connectType === selectedDbInfo?.connectType)
+        ?.map((item) => {
+          return {
+            ...item,
+            expired: checkDbExpiredByDataSourceStatus(statusMap.get(item?.dataSource?.id)?.status),
+          };
+        });
+    } else {
+      return _databaseOptions?.map((item) => {
+        return {
+          ...item,
+          expired: checkDbExpiredByDataSourceStatus(statusMap.get(item?.dataSource?.id)?.status),
+        };
+      });
+    }
+  }, [statusMap, _databaseOptions, orderedDatabaseIds]);
 
   useEffect(() => {
     if (multipleDatabaseChangeOpen && projectId) {

diff --git a/src/component/Task/MutipleAsyncTask/CreateModal/InnerSelecter.tsx b/src/component/Task/MutipleAsyncTask/CreateModal/InnerSelecter.tsx
@@ -1,7 +1,7 @@
 import { getDataSourceStyleByConnectType } from '@/common/datasource';
 import ConnectionPopover from '@/component/ConnectionPopover';
 import RiskLevelLabel from '@/component/RiskLevelLabel';
-import { IConnection } from '@/d.ts';
+import { ConnectType, IConnection } from '@/d.ts';
 import { IEnvironment } from '@/d.ts/environment';
 import { ReactComponent as DragSvg } from '@/svgr/drag.svg';
 import { formatMessage } from '@/util/intl';
@@ -22,6 +22,7 @@ export type DatabaseOption = {
   existed: boolean;
   unauthorized: boolean;
   expired: boolean;
+  connectType: ConnectType;
 };
 const InnerSelect: React.FC<{
   rootName: (number | string)[];

diff --git a/src/component/Task/MutipleAsyncTask/components/Template/EditTemplate.tsx b/src/component/Task/MutipleAsyncTask/components/Template/EditTemplate.tsx
@@ -80,6 +80,7 @@ const EditTemplate: React.FC<{
                 DatabasePermissionType.CHANGE,
               ),
               expired: checkDbExpiredByDataSourceStatus(statusInfo?.status),
+              connectType: item?.connectType,
             };
           }),
       );

diff --git a/src/component/Task/component/CommonDetailModal/TaskExecuteModal.tsx b/src/component/Task/component/CommonDetailModal/TaskExecuteModal.tsx
@@ -90,8 +90,11 @@ const getColumns = () => {
       dataIndex: 'traceId',
       ellipsis: true,
       render: (value: string, row: any) => {
-        if (!value) return '-';
-        return value;
+        return (
+          <Tooltip placement="topLeft" title={value || '-'}>
+            {value || '-'}
+          </Tooltip>
+        );
       },
       width: 200,
     },

diff --git a/src/component/Task/component/TaskTable/index.tsx b/src/component/Task/component/TaskTable/index.tsx
@@ -203,6 +203,8 @@ const TaskTable: React.FC<IProps> = inject(
       return !start || !end ? null : [moment(start), moment(end)];
     });
     const [loading, setLoading] = useState(false);
+    const [hoverInNewTaskMenuBtn, setHoverInNewTaskMenuBtn] = useState(false);
+    const [hoverInNewTaskMenu, setHoverInNewTaskMenu] = useState(false);
     const [listParams, setListParams] = useState(null);
     const loadParams = useRef(null);
     const { activePageKey } = pageStore;
@@ -486,7 +488,12 @@ const TaskTable: React.FC<IProps> = inject(
           .filter(Boolean),
       );
       return (
-        <Space align="start" size={20}>
+        <Space
+          align="start"
+          size={20}
+          onMouseMove={() => setHoverInNewTaskMenuBtn(true)}
+          onMouseLeave={() => setHoverInNewTaskMenuBtn(false)}
+        >
           {items?.map((i) => {
             return (
               <Space direction="vertical">
@@ -499,6 +506,7 @@ const TaskTable: React.FC<IProps> = inject(
                       <div
                         className={styles.menuItem}
                         onClick={() => {
+                          setHoverInNewTaskMenuBtn(false);
                           props.onMenuClick(i?.key as TaskPageType);
                         }}
                       >
@@ -525,8 +533,20 @@ const TaskTable: React.FC<IProps> = inject(
               ? {
                   type: IOperationOptionType.custom,
                   render: () => (
-                    <Popover content={newTaskMenu} placement="bottomLeft">
-                      <Button type="primary">
+                    <Popover
+                      content={newTaskMenu}
+                      placement="bottomLeft"
+                      open={hoverInNewTaskMenuBtn || hoverInNewTaskMenu}
+                    >
+                      <Button
+                        type="primary"
+                        onMouseMove={() => setHoverInNewTaskMenu(true)}
+                        onMouseLeave={() => {
+                          setTimeout(() => {
+                            setHoverInNewTaskMenu(false);
+                          }, 500);
+                        }}
+                      >
                         {
                           formatMessage({
                             id: 'odc.component.TaskTable.NewWorkOrder',

diff --git a/src/page/Project/Database/components/AddDataBaseButton/index.tsx b/src/page/Project/Database/components/AddDataBaseButton/index.tsx
@@ -48,6 +48,7 @@ interface IProps {
   onSuccess: () => void;
   clearSelectedRowKeys: () => void;
   onOpenLogicialDatabase: () => void;
+  disabledMultiDBChanges?: boolean;
 }
 const AddDataBaseButton: React.FC<IProps> = ({
   projectId,
@@ -56,6 +57,7 @@ const AddDataBaseButton: React.FC<IProps> = ({
   onSuccess,
   clearSelectedRowKeys,
   onOpenLogicialDatabase,
+  disabledMultiDBChanges,
 }) => {
   const [open, setOpen] = useState<boolean>(false);
   const { project } = useContext(ProjectContext);
@@ -148,20 +150,27 @@ const AddDataBaseButton: React.FC<IProps> = ({
             添加数据库
           </Dropdown.Button>
         </TooltipAction>
-        <Button
-          onClick={() => {
-            modalStore?.changeMultiDatabaseChangeModal(true, {
-              projectId,
-              orderedDatabaseIds,
-            });
-            clearSelectedRowKeys?.();
-          }}
+        <Tooltip
+          title={
+            disabledMultiDBChanges ? '仅支持选择相同类型的数据源的数据库发起多库变更任务' : null
+          }
         >
-          {formatMessage({
-            id: 'src.page.Project.Database.AddDataBaseButton.693C4817',
-            defaultMessage: '多库变更',
-          })}
-        </Button>
+          <Button
+            disabled={disabledMultiDBChanges}
+            onClick={() => {
+              modalStore?.changeMultiDatabaseChangeModal(true, {
+                projectId,
+                orderedDatabaseIds,
+              });
+              clearSelectedRowKeys?.();
+            }}
+          >
+            {formatMessage({
+              id: 'src.page.Project.Database.AddDataBaseButton.693C4817',
+              defaultMessage: '多库变更',
+            })}
+          </Button>
+        </Tooltip>
         <ApplyDatabasePermissionButton
           label={
             formatMessage({

diff --git a/src/page/Project/Database/components/LogicDatabase/ManageLogicDatabase.tsx b/src/page/Project/Database/components/LogicDatabase/ManageLogicDatabase.tsx
@@ -258,7 +258,7 @@ const ManageLogicDatabase: React.FC<{
   const handleExtractLogicalTables = async () => {
     const successful = await extractLogicalTables(database?.id);
     if (successful) {
-      message.info('逻辑表正在提取中，请耐心等待。提取后需确认是否更新逻辑表。');
+      message.info('逻辑表正在提取中，请耐心等待。');
     }
   };
   const queryLogicalDatabaseById = async () => {