PullRequest: 879 dlm详情字段变更、个人空间同步数据源之后刷新数据库列表

Merge branch 'fix/bp3 of [email protected]:oceanbase/oceanbase-developer-center.git into dev-4.3.4

https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/879


Reviewed-by: 晓康 <[email protected]>


* fix:dlm job parameters schema changes
* fix: reload the sync successed

Author: yezaoshu

src/component/Task/DataArchiveTask/DetailContent/index.tsx

@@ -126,8 +126,8 @@ const DataArchiveTaskContent: React.FC<IProps> = (props) => {
           })} /*源数据库*/
         >
           <Space size={2}>
-            <span>{jobParameters?.sourceDatabaseName}</span>
-            <Text type="secondary">{jobParameters?.sourceDataSourceName}</Text>
+            <span>{jobParameters?.sourceDatabase?.name}</span>
+            <Text type="secondary">{jobParameters?.sourceDatabase?.dataSource?.name}</Text>
           </Space>
         </Descriptions.Item>
         <Descriptions.Item
@@ -138,8 +138,8 @@ const DataArchiveTaskContent: React.FC<IProps> = (props) => {
           })} /*目标数据库*/
         >
           <Space size={2}>
-            <span>{jobParameters?.targetDatabaseName}</span>
-            <Text type="secondary">{jobParameters?.targetDataSourceName}</Text>
+            <span>{jobParameters?.targetDatabase?.name}</span>
+            <Text type="secondary">{jobParameters?.targetDatabase?.dataSource?.name}</Text>
           </Space>
         </Descriptions.Item>
         {hasFlow && (
@@ -155,6 +155,9 @@ const DataArchiveTaskContent: React.FC<IProps> = (props) => {
       </Descriptions>
 
       <SimpleTextItem
+        style={{
+          marginTop: 12,
+        }}
         label={formatMessage({
           id: 'odc.DataArchiveTask.DetailContent.VariableConfiguration',
           defaultMessage: '变量配置',

src/component/Task/DataClearTask/DetailContent/index.tsx

@@ -120,8 +120,8 @@ const DataClearTaskContent: React.FC<IProps> = (props) => {
             })} /*源数据库*/
           >
             <Space size={2}>
-              <span>{jobParameters?.databaseName}</span>
-              <Text type="secondary">{jobParameters?.sourceDataSourceName}</Text>
+              <span>{jobParameters?.database?.name}</span>
+              <Text type="secondary">{jobParameters?.database?.dataSource?.name}</Text>
             </Space>
           </Descriptions.Item>
         ) : (
@@ -133,8 +133,8 @@ const DataClearTaskContent: React.FC<IProps> = (props) => {
             })} /*数据库*/
           >
             <Space size={2}>
-              <span>{jobParameters?.databaseName}</span>
-              <Text type="secondary">{task?.database?.dataSource?.name}</Text>
+              <span>{jobParameters?.database?.name}</span>
+              <Text type="secondary">{jobParameters?.database?.dataSource?.name}</Text>
             </Space>
           </Descriptions.Item>
         )}
@@ -148,8 +148,8 @@ const DataClearTaskContent: React.FC<IProps> = (props) => {
             })} /*目标数据库*/
           >
             <Space size={2}>
-              <span>{jobParameters?.targetDatabaseName}</span>
-              <Text type="secondary">{jobParameters?.targetDataSourceName}</Text>
+              <span>{jobParameters?.targetDatabase?.name}</span>
+              <Text type="secondary">{jobParameters?.targetDatabase?.dataSource?.name}</Text>
             </Space>
           </Descriptions.Item>
         )}
@@ -167,6 +167,9 @@ const DataClearTaskContent: React.FC<IProps> = (props) => {
       </Descriptions>
 
       <SimpleTextItem
+        style={{
+          marginTop: 12,
+        }}
         label={formatMessage({
           id: 'odc.DataClearTask.DetailContent.VariableConfiguration',
           defaultMessage: '变量配置',

src/component/Task/component/SimpleTextItem/index.tsx

@@ -29,8 +29,9 @@ export const SimpleTextItem: React.FC<{
   direction?: 'row' | 'column';
   className?: string;
   showSplit?: boolean;
+  style?: React.CSSProperties;
 }> = (props) => {
-  const { label, content, direction = 'row', className = '', showSplit = true } = props;
+  const { label, content, direction = 'row', className = '', showSplit = true, style } = props;
   return (
     <div
       className={className}
@@ -39,6 +40,7 @@ export const SimpleTextItem: React.FC<{
         fontSize: 12,
         lineHeight: '20px',
         flexDirection: direction,
+        ...style,
       }}
     >
       <div

src/d.ts/index.ts

@@ -2641,11 +2641,9 @@ export interface IDataArchiveJobParameters {
   deleteTemporaryTable?: boolean;
   name: string;
   sourceDatabaseId: number;
-  sourceDatabaseName?: string;
-  sourceDataSourceName?: string;
+  sourceDatabase?: IDatabase;
   targetDataBaseId: number;
-  targetDatabaseName?: string;
-  targetDataSourceName?: string;
+  targetDatabase: IDatabase;
   migrationInsertAction?: MigrationInsertAction;
   shardingStrategy?: ShardingStrategy;
   deleteByUniqueKey?: boolean;
@@ -2658,7 +2656,6 @@ export interface IDataArchiveJobParameters {
     name: string;
     pattern: string;
   }[];
-  targetDatabase: IDatabase;
   timeoutMillis: number;
   syncTableStructure: SyncTableStructureEnum[];
   dirtyRowAction: DirtyRowActionEnum;
@@ -2670,7 +2667,7 @@ export interface IDataClearJobParameters {
   deleteAfterMigration: boolean;
   name: string;
   databaseId: number;
-  databaseName?: string;
+  database?: IDatabase;
   deleteByUniqueKey?: boolean;
   rateLimit?: {
     rowLimit?: number;
@@ -2684,9 +2681,7 @@ export interface IDataClearJobParameters {
   timeoutMillis: number;
   needCheckBeforeDelete: boolean;
   targetDatabaseId?: number;
-  targetDatabaseName?: string;
-  sourceDataSourceName?: string;
-  targetDataSourceName?: string;
+  targetDatabase?: IDatabase;
   shardingStrategy?: ShardingStrategy;
   dirtyRowAction: DirtyRowActionEnum;
   maxAllowedDirtyRowCount: number;

src/page/Workspace/SideBar/ResourceTree/TreeNodeMenu/dataSource.tsx

@@ -135,6 +135,7 @@ interface IProps {
   setCopyDatasourceId: any;
   setEditDatasourceId: React.Dispatch<React.SetStateAction<number>>;
   setAddDSVisiable: React.Dispatch<React.SetStateAction<boolean>>;
+  reload: () => void;
 }
 
 const DataSourceNodeMenu = (props: IProps) => {
@@ -146,6 +147,7 @@ const DataSourceNodeMenu = (props: IProps) => {
     setAddDSVisiable,
     setEditDatasourceId,
     copyDatasourceId,
+    reload,
   } = props;
   const dataSource = node.data;
 
@@ -158,6 +160,7 @@ const DataSourceNodeMenu = (props: IProps) => {
           defaultMessage: '同步成功',
         }), //同步成功
       );
+      reload();
     }
   }
 

src/page/Workspace/SideBar/ResourceTree/index.tsx

@@ -394,6 +394,7 @@ const ResourceTree: React.FC<IProps> = function ({
             setAddDSVisiable={setAddDSVisiable}
             setEditDatasourceId={setEditDatasourceId}
             copyDatasourceId={copyDatasourceId}
+            reload={reload}
           />
         );
       }