feat(web): show job trigger and module details in jobs list
quality / commitlint (push) Skipped
quality / changes (push) Successful in 11s
quality / docker-check (push) Skipped
quality / openapi (push) Successful in 1m3s
quality / web (push) Successful in 1m58s
quality / go (push) Successful in 3m21s
quality / bird2 (push) Successful in 19s
CD / quality (push) Successful in 7m6s
CD / publish (push) Successful in 9m18s
quality / commitlint (push) Skipped
quality / changes (push) Successful in 11s
quality / docker-check (push) Skipped
quality / openapi (push) Successful in 1m3s
quality / web (push) Successful in 1m58s
quality / go (push) Successful in 3m21s
quality / bird2 (push) Successful in 19s
CD / quality (push) Successful in 7m6s
CD / publish (push) Successful in 9m18s
Колонка «Вид» в журнале задач (Операции → Задачи и Расписание) стала информативнее: подзаголовок с именами обновляемых модулей для tenant_refresh (из meta.module_ids), сообщение apply_summary для deploy_apply и бейдж триггера («по расписанию», «вручную», «после правки данных»). Поиск по журналу учитывает новые поля.
Бэкенд: meta.trigger теперь записывается для module_refresh и deploy_apply при ручных запусках (POST /v1/modules/{id}/refresh, /v1/apply, /v1/speakers/{id}/apply), а deploy_apply из цепочки обновления наследует триггер родительской задачи.
This commit is contained in:
1 parent
dc803bcb34
commit
95d4305241
7 files changed
+119
-28
No files matched your search
@@ -58,6 +58,54 @@ export function jobKindRu(kind: string): string {
|
||||
return JOB_KIND_RU[kind] ?? kind
|
||||
}
|
||||
|
||||
const JOB_TRIGGER_RU: Record<string, string> = {
|
||||
scheduler: 'по расписанию',
|
||||
api: 'вручную',
|
||||
peer_patch: 'правка пиров',
|
||||
}
|
||||
|
||||
export function jobTriggerRu(trigger: unknown): string | undefined {
|
||||
if (typeof trigger !== 'string' || trigger === '') return undefined
|
||||
const known = JOB_TRIGGER_RU[trigger]
|
||||
if (known) return known
|
||||
if (/_(create|patch|delete|import_csv)$/.test(trigger)) return 'после правки данных'
|
||||
return undefined
|
||||
}
|
||||
|
||||
export function jobSubtitleRu(
|
||||
kind: string,
|
||||
meta: Record<string, unknown> | undefined,
|
||||
nameById: Map<string, string>,
|
||||
): string | undefined {
|
||||
if (!meta) return undefined
|
||||
switch (kind) {
|
||||
case 'tenant_refresh': {
|
||||
const ids = Array.isArray(meta.module_ids)
|
||||
? meta.module_ids.map(String).filter((id) => id !== '')
|
||||
: []
|
||||
if (ids.length === 0) return undefined
|
||||
const names = ids.map((id) => nameById.get(id) ?? id)
|
||||
if (names.length <= 3) return names.join(', ')
|
||||
return `${names.slice(0, 2).join(', ')} +${names.length - 2} ещё`
|
||||
}
|
||||
case 'module_refresh': {
|
||||
const id = typeof meta.module_id === 'string' ? meta.module_id : ''
|
||||
if (id === '') return undefined
|
||||
return nameById.get(id) ?? id
|
||||
}
|
||||
case 'deploy_apply': {
|
||||
const summary = meta.apply_summary
|
||||
if (summary && typeof summary === 'object') {
|
||||
const message = (summary as Record<string, unknown>).message
|
||||
if (typeof message === 'string' && message !== '') return message
|
||||
}
|
||||
return undefined
|
||||
}
|
||||
default:
|
||||
return undefined
|
||||
}
|
||||
}
|
||||
|
||||
const JOB_STATUS_RU: Record<string, string> = {
|
||||
queued: 'В очереди',
|
||||
running: 'Выполняется',
|
||||
|
||||
Reference in new issue
Block a user