Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public JsonArray getJobsByStateJson(String state) {
}
return jobState.getJobStatus().name().equals(state.toUpperCase());
})
.sorted(Comparator.comparing(JobState::getFinishTime))
.sorted(Comparator.comparing(JobState::getFinishTime, Comparator.reverseOrder()))
.map(
jobState -> {
Long jobId = jobState.getJobId();
Expand Down
30 changes: 24 additions & 6 deletions seatunnel-engine/seatunnel-engine-ui/src/views/jobs/detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
NDrawer,
NDrawerContent
} from 'naive-ui'
import { computed, defineComponent, reactive, ref, watch } from 'vue'
import {computed, defineComponent, onUnmounted, reactive, ref, watch} from 'vue'
import { getJobInfo } from '@/service/job'
import { useRoute } from 'vue-router'
import type { Job, Vertex } from '@/service/job/types'
Expand All @@ -47,19 +47,23 @@ export default defineComponent({
const job = reactive({} as Job)
const duration = ref('')
let timer: NodeJS.Timeout
let fetchTimer: NodeJS.Timeout
const fetch = async () => {
const res = await getJobInfo(jobId)
Object.assign(job, res)
clearInterval(timer)
const d = parse(res.createTime, 'yyyy-MM-dd HH:mm:ss', new Date())
duration.value = getRemainTime(Math.abs(Date.now() - d.getTime()))
setTimeout(fetch, 5000)
if (job.jobStatus !== 'RUNNING') {
if (isTerminalState(job.jobStatus)) {
clearTimeout(fetchTimer)
return
}
timer = setInterval(() => {
duration.value = getRemainTime(Math.abs(Date.now() - d.getTime()))
}, 1000)
fetchTimer = setTimeout(fetch, 5000)
if (isRunningState(job.jobStatus)) {
timer = setInterval(() => {
duration.value = getRemainTime(Math.abs(Date.now() - d.getTime()))
}, 1000)
}
}

fetch()
Expand All @@ -70,6 +74,20 @@ export default defineComponent({
}
watch(() => select.value, change)

// Clear the timer when the component is uninstalled
onUnmounted(() => {
clearInterval(timer)
clearTimeout(fetchTimer)
})

const isTerminalState = (status: string) => {
return ['FINISHED', 'FAILED', 'CANCELED','SAVEPOINT_DONE'].includes(status)
}

const isRunningState = (status: string) => {
return status === 'RUNNING'
}

const tableData = computed(() => {
return job.jobDag?.vertexInfoMap?.filter((v) => v.type !== 'transform') || []
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ export default defineComponent({
key: 'createTime',
sorter: 'default'
},
{
title: 'Finish Time',
key: 'finishTime',
sorter: 'default'
},
{
title: 'Status',
key: 'jobStatus',
Expand Down