fix #719 checkpoint has error of devops (#721)

dlink-web/src/components/Studio/StudioRightTool/StudioHistory/index.tsx

@@ -63,7 +63,7 @@ const StudioHistory = (props: any) => {
           </div><br/>
           <Scrollbars style={{height: "98%"}}>
             <React.StrictMode>
-              <MonacoDiffEditor language={"sql"} theme={"vs-dark"} original={originalValue} value={currentValue}/>
+              <MonacoDiffEditor options={{readOnly: true}} language={"sql"} theme={"vs-dark"} original={originalValue} value={currentValue}/>
             </React.StrictMode>
           </Scrollbars>
         </Modal>

dlink-web/src/pages/DevOps/JobInfo/CheckPoints/index.tsx

@@ -10,7 +10,8 @@ import {
 import {parseByteStr, parseMilliSecondStr, parseSecondStr} from "@/components/Common/function";
 import ProTable, {ActionType, ProColumns} from "@ant-design/pro-table";
 import {useRef} from "react";
-import {CheckPointsDetailInfo} from "@/pages/DevOps/data";
+import {CheckPointsDetailInfo, SavePointInfo} from "@/pages/DevOps/data";
+import {queryData} from "@/components/Common/crud";
 
 const {TabPane} = Tabs;
 
@@ -21,7 +22,7 @@ const CheckPoints = (props: any) => {
   const getOverview = () => {
     return (
       <>
-        {(job?.jobHistory?.checkpoints) ?
+        {JSON.stringify(job?.jobHistory?.checkpoints).includes("errors") ?  <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/> :
           <Descriptions bordered size="small" column={1}>
             <Descriptions.Item label="CheckPoint Counts">
               <Tag color="blue" title={"Total"}>
@@ -71,9 +72,7 @@ const CheckPoints = (props: any) => {
                 }
               </Tag>
             </Descriptions.Item>
-
           </Descriptions>
-          : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
         }
       </>
     )
@@ -84,7 +83,7 @@ const CheckPoints = (props: any) => {
 
     return (
       <>
-        {(job?.jobHistory?.checkpoints) ?
+        {JSON.stringify(job?.jobHistory?.checkpoints).includes("errors") ?  <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/> :
           <Descriptions bordered size="small" column={1}>
             <Descriptions.Item label="End to End Duration">
               <Tag color="blue" title={"Max"}>
@@ -146,7 +145,6 @@ const CheckPoints = (props: any) => {
               </Tag>
             </Descriptions.Item>
           </Descriptions>
-          : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
         }
       </>
     )
@@ -282,7 +280,7 @@ const CheckPoints = (props: any) => {
 
     return (
       <>
-        {(job?.jobHistory?.checkpointsConfig) ?
+        {JSON.stringify(job?.jobHistory?.checkpointsConfig).includes("errors") ?  <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/> :
           <Descriptions bordered size="small" column={1}>
             <Descriptions.Item label="Checkpointing Mode">
               <Tag color="blue" title={"Checkpointing Mode"}>
@@ -352,13 +350,71 @@ const CheckPoints = (props: any) => {
               </Tag>
             </Descriptions.Item>
           </Descriptions>
-          : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
         }
       </>
     )
   }
 
 
+  function getSavePoint() {
+    const url = '/api/savepoints';
+
+    const columns: ProColumns<SavePointInfo>[] = [
+      {
+        title: 'ID',
+        align: 'center',
+        dataIndex: 'id',
+        hideInTable: true,
+      },
+      {
+        title: '任务ID',
+        align: 'center',
+        dataIndex: 'taskId',
+        hideInTable: true,
+      },
+      {
+        title: '名称',
+        align: 'center',
+        dataIndex: 'name',
+      },
+      {
+        title: '类型',
+        align: 'center',
+        dataIndex: 'type',
+      },
+      {
+        title: '存储位置',
+        align: 'center',
+        copyable: true,
+        dataIndex: 'path',
+      },
+      {
+        title: '触发时间',
+        align: 'center',
+        valueType: 'dateTime',
+        dataIndex: 'createTime',
+      },
+    ];
+
+
+    return (
+      <>
+        <ProTable<SavePointInfo>
+          columns={columns}
+          style={{width: '100%'}}
+          request={(params, sorter, filter) => queryData(url, {taskId: job?.instance.taskId, ...params, sorter, filter})}
+          actionRef={actionRef}
+          rowKey="id"
+          pagination={{
+            pageSize: 10,
+          }}
+          search={false}
+          size="small"
+        />
+      </>
+    )
+  }
+
   return (<>
     <Tabs defaultActiveKey="overview" size="small" tabPosition="top" style={{
       border: "1px solid #f0f0f0",
@@ -378,6 +434,10 @@ const CheckPoints = (props: any) => {
       <TabPane tab={<span>&nbsp; Configraution &nbsp;</span>} key="configraution">
         {getConfigraution()}
       </TabPane>
+
+      <TabPane tab={<span>&nbsp; SavePoint &nbsp;</span>} key="savepoint">
+      {getSavePoint()}
+    </TabPane>
     </Tabs>
   </>)
 };

dlink-web/src/pages/DevOps/JobInfo/Config/index.tsx

@@ -46,36 +46,37 @@ const Config = (props: any) => {
     </>
     <br/><br/>
     <>
-      <Descriptions bordered size="small" title={"Flink Job Configuration"}>
-        <Descriptions.Item label="Execution Mode">
-          <Tag color="blue" title={"Execution Mode"}>
-            {job?.jobHistory?.config['execution-config']['execution-mode']}
-          </Tag>
-        </Descriptions.Item>
-        <Descriptions.Item label="Restart Strategy">
-          <Tag color="blue" title={"Restart Strategy"}>
-            {job?.jobHistory?.config['execution-config']['restart-strategy']}
-          </Tag>
-        </Descriptions.Item>
+      { ! JSON.stringify(job?.jobHistory?.config).includes("errors") &&
+        <Descriptions bordered size="small" title={"Flink Job Configuration"}>
+          <Descriptions.Item label="Execution Mode">
+            <Tag color="blue" title={"Execution Mode"}>
+              {job?.jobHistory?.config['execution-config']['execution-mode']}
+            </Tag>
+          </Descriptions.Item>
+          <Descriptions.Item label="Restart Strategy">
+            <Tag color="blue" title={"Restart Strategy"}>
+              {job?.jobHistory?.config['execution-config']['restart-strategy']}
+            </Tag>
+          </Descriptions.Item>
 
-        <Descriptions.Item label="Job Parallelism">
-          <Tag color="blue" title={"Job Parallelism"}>
-            {job?.jobHistory?.config['execution-config']['job-parallelism']}
-          </Tag>
-        </Descriptions.Item>
+          <Descriptions.Item label="Job Parallelism">
+            <Tag color="blue" title={"Job Parallelism"}>
+              {job?.jobHistory?.config['execution-config']['job-parallelism']}
+            </Tag>
+          </Descriptions.Item>
 
-        <Descriptions.Item label="Object Reuse Mode">
-          <Tag color="blue" title={"Object Reuse Mode"}>
-            {job?.jobHistory?.config['execution-config']['object-reuse-mode'].toString()}
-          </Tag>
-        </Descriptions.Item>
+          <Descriptions.Item label="Object Reuse Mode">
+            <Tag color="blue" title={"Object Reuse Mode"}>
+              {job?.jobHistory?.config['execution-config']['object-reuse-mode'].toString()}
+            </Tag>
+          </Descriptions.Item>
 
-        <Descriptions.Item label="Flink User Configuration" span={3}>
-          <Text
-          code>{JSON.stringify(job?.jobHistory?.config['execution-config']['user-config'])}</Text>
-        </Descriptions.Item>
-
-      </Descriptions>
+          <Descriptions.Item label="Flink User Configuration" span={3}>
+            <Text
+              code>{JSON.stringify(job?.jobHistory?.config['execution-config']['user-config'])}</Text>
+          </Descriptions.Item>
+        </Descriptions>
+      }
     </>
   </>)
 };

dlink-web/src/pages/DevOps/data.d.ts

@@ -119,3 +119,25 @@ export type TaskVersion = {
   createTime: string,
 }
 
+
+export  type CheckPointsDetailInfo = {
+  jobID: number,
+  historyID: number,
+  id: number,
+  status: string,
+  end_to_end_duration: number,
+  external_path : string,
+  latest_ack_timestamp: number,
+  state_size: number,
+  trigger_timestamp: number,
+}
+
+
+export  type SavePointInfo = {
+  id: number,
+  taskId: number,
+  name: string,
+  type: string,
+  path: string,
+  createTime: Date,
+}