PullRequest: 642 fix: sql计划接口调整，去掉之前兼容性代码

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

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


Signed-off-by: 晓康 <[email protected]>


* fix: sql计划接口调整，去掉之前兼容性代码
* fix: 更改类型定义

Author: liyi711

src/component/Task/DetailModal.tsx

@@ -52,9 +52,6 @@ import {
   TaskStatus,
   TaskType,
 } from '@/d.ts';
-import { ProjectRole } from '@/d.ts/project';
-import userStore from '@/store/login';
-import { isNumber } from 'lodash';
 import React, { useEffect, useRef, useState } from 'react';
 import { getItems as getDDLAlterItems } from './AlterDdlTask';
 import { ApplyDatabasePermissionTaskContent } from './ApplyDatabasePermission';
@@ -66,7 +63,7 @@ import ApprovalModal from './component/ApprovalModal';
 import { DataArchiveTaskContent } from './DataArchiveTask';
 import { DataClearTaskContent } from './DataClearTask';
 import { getItems as getDataMockerItems } from './DataMockerTask';
-import { isCycleTask, isLogicalDbChangeTask, isSupportChangeDetail } from './helper';
+import { isCycleTask, isLogicalDbChangeTask } from './helper';
 import { TaskDetailType } from './interface';
 import { LogicDatabaseAsyncTaskContent } from './LogicDatabaseAsyncTask';
 import { MutipleAsyncTaskContent } from './MutipleAsyncTask';
@@ -112,7 +109,7 @@ const DetailModal: React.FC<IProps> = React.memo((props) => {
     | CycleTaskDetail<IDataArchiveJobParameters | IDataClearJobParameters>
   >(null);
   const [subTasks, setSubTasks] = useState<IResponseData<ICycleSubTaskRecord>>(null);
-  const [opRecord, setOpRecord] = useState<TaskRecord<any>[] | Operation[]>(null);
+  const [opRecord, setOpRecord] = useState<Operation[]>(null);
   const [detailType, setDetailType] = useState<TaskDetailType>(TaskDetailType.INFO);
   const [log, setLog] = useState<ILog>(null);
   const [result, setResult] = useState<ITaskResult>(null);
@@ -248,17 +245,7 @@ const DetailModal: React.FC<IProps> = React.memo((props) => {
   };
 
   const getOperationRecord = async function () {
-    let data;
-    if (isSupportChangeDetail(task.type)) {
-      data = await getOperationList(task?.id);
-    } else {
-      data = await getTaskList({
-        createdByCurrentUser: false,
-        approveByCurrentUser: false,
-        parentInstanceId: task?.id,
-        taskType: TaskType.ALTER_SCHEDULE,
-      });
-    }
+    const data = await getOperationList(task?.id);
     setLoading(false);
     setOpRecord(data?.contents);
   };

src/component/Task/component/CommonDetailModal/TaskOperationRecord.tsx

@@ -17,15 +17,14 @@
 import { getTaskDetail } from '@/common/network/task';
 import Action from '@/component/Action';
 import DisplayTable from '@/component/DisplayTable';
-import StatusLabel, { status } from '@/component/Task/component/Status';
+import { status } from '@/component/Task/component/Status';
 import { TaskOperationType, TaskRecord, TaskRecordParameters, Operation, TaskType } from '@/d.ts';
 import { formatMessage } from '@/util/intl';
 import { getFormatDateTime } from '@/util/utils';
 import { FilterOutlined } from '@ant-design/icons';
 import React, { useEffect, useState } from 'react';
 import FlowModal from './FlowModal';
 import ChangeDetail from './ChangeDetail';
-import { isSupportChangeDetail } from '@/component/Task/helper';
 import StatusItem from './status';
 import styles from './index.less';
 
@@ -74,10 +73,7 @@ const getConnectionColumns = (params: {
       ellipsis: true,
       width: 140,
       render: (id, record) => {
-        if (isSupportChangeDetail(params.taskType)) {
-          return <span>{operationTypeMap?.[record.type]}</span>;
-        }
-        return <span>{operationTypeMap?.[record.parameters?.operationType]}</span>;
+        return <span>{operationTypeMap?.[record.type]}</span>;
       },
     },
 
@@ -106,10 +102,7 @@ const getConnectionColumns = (params: {
         return value === record.status;
       },
       render: (status, record) => {
-        if (isSupportChangeDetail(params.taskType)) {
-          return <StatusItem status={status} />;
-        }
-        return <StatusLabel status={status} progress={Math.floor(record.progressPercentage)} />;
+        return <StatusItem status={status} />;
       },
     },
 
@@ -134,18 +127,16 @@ const getConnectionColumns = (params: {
                 defaultMessage: '审批记录',
               })}
             </Action.Link>
-            {isSupportChangeDetail(params.taskType) && (
-              <Action.Link
-                onClick={async () => {
-                  params?.onOpenChangeDetail(record, true);
-                }}
-              >
-                {formatMessage({
-                  id: 'src.component.Task.component.CommonDetailModal.5C706BA6',
-                  defaultMessage: '变更详情',
-                })}
-              </Action.Link>
-            )}
+            <Action.Link
+              onClick={async () => {
+                params?.onOpenChangeDetail(record, true);
+              }}
+            >
+              {formatMessage({
+                id: 'src.component.Task.component.CommonDetailModal.5C706BA6',
+                defaultMessage: '变更详情',
+              })}
+            </Action.Link>
           </>
         );
       },
@@ -154,7 +145,7 @@ const getConnectionColumns = (params: {
 };
 
 interface IProps {
-  opRecord: Operation[] | TaskRecord<any>[];
+  opRecord: Operation[];
   onReload: () => void;
   taskType: TaskType;
 }
@@ -172,11 +163,7 @@ const TaskOperationRecord: React.FC<IProps> = (props) => {
     task: Operation | TaskRecord<TaskRecordParameters>,
     visible: boolean = false,
   ) => {
-    if (isSupportChangeDetail(taskType)) {
-      setDetailId((task as Operation)?.flowInstanceId);
-    } else {
-      setDetailId(task?.id);
-    }
+    setDetailId((task as Operation)?.flowInstanceId);
     setDetailVisible(visible);
   };
 

src/component/Task/helper.tsx

@@ -18,7 +18,7 @@ import { SubTaskType, TaskExecStrategy, TaskPageType, TaskType } from '@/d.ts';
 import { DatabasePermissionType } from '@/d.ts/database';
 import login from '@/store/login';
 import settingStore from '@/store/setting';
-import { haveOCP, isClient } from '@/util/env';
+import { isClient } from '@/util/env';
 import { formatMessage } from '@/util/intl';
 import { flatten } from 'lodash';
 export { TaskTypeMap } from '@/component/Task/component/TaskTable';
@@ -74,10 +74,6 @@ export const isCycleTaskPage = (type: TaskPageType) => {
   ].includes(type);
 };
 
-export const isSupportChangeDetail = (type: TaskType) => {
-  return [TaskType.DATA_ARCHIVE, TaskType.DATA_DELETE].includes(type);
-};
-
 interface ITaskGroupLabel {
   groupName: string;
   icon?: React.ReactNode;

src/component/Task/interface.ts

@@ -33,7 +33,7 @@ export interface ITaskDetailModalProps {
   detailId: number;
   task: TaskDetail<TaskRecordParameters>;
   subTasks: IResponseData<TaskRecord<IAsyncTaskParams>>;
-  opRecord: TaskRecord<any>[] | Operation[];
+  opRecord: Operation[];
   hasFlow: boolean;
   result: ITaskResult;
   log: ILog;