Skip to content

feat: Cronjob reports add an unexecuted status #10866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Nov 5, 2025
Merged

feat: Cronjob reports add an unexecuted status #10866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion agent/app/repo/cronjob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func (u *CronjobRepo) AddFailedRecord(cronjobID uint, message string) {
var record model.JobRecords
record.StartTime = time.Now()
record.CronjobID = cronjobID
record.Status = constant.StatusFailed
record.Status = constant.StatusUnexecuted
record.Message = message
if err := global.DB.Create(&record).Error; err != nil {
global.LOG.Errorf("create record status failed, err: %v", err)
Expand Down
1 change: 1 addition & 0 deletions agent/constant/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const (
StatusInstallErr = "InstallErr"
StatusUninstalling = "Uninstalling"
StatusWaitingRestart = "WaitingRestart"
StatusUnexecuted = "Unexecuted"

OrderDesc = "descending"
OrderAsc = "ascending"
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/status/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ const getType = (status: string) => {
case 'conflict':
return 'warning';
case 'duplicate':
case 'unexecuted':
return 'info';
default:
return 'primary';
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ const message = {
new: 'New',
conflict: 'Conflict',
duplicate: 'Duplicate',
unexecuted: 'Unexecuted',
},
units: {
second: ' second | second | seconds',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/es-es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ const message = {
new: 'Nuevo',
conflict: 'Conflicto',
duplicate: 'Duplicado',
unexecuted: 'No Ejecutado',
},
units: {
second: ' segundo | segundo | segundos',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/ja.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ const message = {
new: '新規',
conflict: '競合',
duplicate: '重複',
unexecuted: '未実行',
},
units: {
second: '2番目|2番目|秒',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/ko.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ const message = {
new: '신규',
conflict: '충돌',
duplicate: '중복',
unexecuted: '실행되지 않음',
},
units: {
second: '초 | 초 | 초',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/ms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ const message = {
new: 'Baru',
conflict: 'Konflik',
duplicate: 'Pendua',
unexecuted: 'Tidak Dilaksanakan',
},
units: {
second: 'saat | saat | saat',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/pt-br.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ const message = {
new: 'Novo',
conflict: 'Conflito',
duplicate: 'Duplicado',
unexecuted: 'Não Executado',
},
units: {
second: 'segundo | segundos | segundos',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ const message = {
new: 'Новый',
conflict: 'Конфликт',
duplicate: 'Дубликат',
unexecuted: 'Не Выполнено',
},
units: {
second: ' секунда | секунда | секунд',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/tr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ const message = {
new: 'Yeni',
conflict: 'Çakışma',
duplicate: 'Yinelenen',
unexecuted: 'Yürütülmedi',
},
units: {
second: ' saniye | saniye | saniye',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/zh-Hant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ const message = {
new: '新',
conflict: '衝突',
duplicate: '重複',
unexecuted: '未執行',
},
units: {
second: '秒',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/zh.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ const message = {
new: '新',
conflict: '冲突',
duplicate: '重复',
unexecuted: '未执行',
},
units: {
second: '秒',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/views/cronjob/cronjob/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
<el-button v-if="row.lastRecordStatus === 'Success'" icon="Select" link type="success" />
<el-button v-if="row.lastRecordStatus === 'Failed'" icon="CloseBold" link type="danger" />
<el-button v-if="row.lastRecordStatus === 'Waiting'" :loading="true" link type="info" />
<el-button v-if="row.lastRecordStatus === 'Unexecuted'" icon="Minus" link type="info" />
{{ row.lastRecordTime }}
</template>
</el-table-column>
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/views/cronjob/cronjob/record/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
<el-option :label="$t('commons.table.all')" value="" />
<el-option :label="$t('commons.status.success')" value="Success" />
<el-option :label="$t('commons.status.waiting')" value="Waiting" />
<el-option :label="$t('commons.status.unexecuted')" value="Unexecuted" />
<el-option :label="$t('commons.status.failed')" value="Failed" />
</el-select>
<TableRefresh @search="search(false)" />
Expand All @@ -100,7 +101,7 @@
<el-table-column min-width="230px">
<template #default="{ row }">
<span v-if="row.id === currentRecord.id" class="select-sign"></span>
<Status class="mr-2 ml-1 float-left" :status="row.status" />
<Status class="mr-2 ml-1 float-left w-20" :status="row.status" />
<div class="mt-0.5">
<span>
{{ row.startTime }}
Expand Down Expand Up @@ -182,7 +183,10 @@
<el-button
class="mt-0.5"
type="danger"
v-if="currentRecord?.status === 'Failed'"
v-if="
currentRecord?.status === 'Failed' ||
currentRecord?.status === 'Unexecuted'
"
icon="Warning"
link
/>
Expand Down
Loading