diff --git a/internal/proxy/js_compiler.go b/internal/proxy/js_compiler.go index 02ef45c6..ab9820ff 100644 --- a/internal/proxy/js_compiler.go +++ b/internal/proxy/js_compiler.go @@ -63,6 +63,52 @@ function encodePathValue(path) { .replace(/=+$/, ''); return encoded; } + +Ext.define('PBS.PlusUtils', { + singleton: true, + render_task_status: function(value, metadata, record, rowIndex, colIndex, store) { + var lastPlusError = record.data['last-plus-error'] || store.getById('last-plus-error')?.data.value + if (lastPlusError) { + return ` + "` ${lastPlusError}`" + `; + } + + if ( + !record.data['last-run-upid'] && + !store.getById('last-run-upid')?.data.value && + !record.data.upid && + !store.getById('upid')?.data.value + ) { + return '-'; + } + + if (!record.data['last-run-endtime'] && !store.getById('last-run-endtime')?.data.value) { + metadata.tdCls = 'x-grid-row-loading'; + return ''; + } + + let parsed = Proxmox.Utils.parse_task_status(value); + let text = value; + let icon = ''; + switch (parsed) { + case 'unknown': + icon = 'question faded'; + text = Proxmox.Utils.unknownText; + break; + case 'error': + icon = 'times critical'; + text = Proxmox.Utils.errorText + ': ' + value; + break; + case 'warning': + icon = 'exclamation warning'; + break; + case 'ok': + icon = 'check good'; + text = gettext("OK"); + } + + return ` + "` ${text}`" + `; + }, +}); `) err := fs.WalkDir(customJsFS, ".", func(path string, d fs.DirEntry, err error) error { diff --git a/internal/proxy/views/utils.js b/internal/proxy/views/utils.js deleted file mode 100644 index 81cd14ab..00000000 --- a/internal/proxy/views/utils.js +++ /dev/null @@ -1,45 +0,0 @@ -Ext.define('PBS.PlusUtils', { - singleton: true, - render_task_status: function(value, metadata, record, rowIndex, colIndex, store) { - var lastPlusError = record.data['last-plus-error'] || store.getById('last-plus-error')?.data.value - if (lastPlusError) { - return ` ${lastPlusError}`; - } - - if ( - !record.data['last-run-upid'] && - !store.getById('last-run-upid')?.data.value && - !record.data.upid && - !store.getById('upid')?.data.value - ) { - return '-'; - } - - if (!record.data['last-run-endtime'] && !store.getById('last-run-endtime')?.data.value) { - metadata.tdCls = 'x-grid-row-loading'; - return ''; - } - - let parsed = Proxmox.Utils.parse_task_status(value); - let text = value; - let icon = ''; - switch (parsed) { - case 'unknown': - icon = 'question faded'; - text = Proxmox.Utils.unknownText; - break; - case 'error': - icon = 'times critical'; - text = Proxmox.Utils.errorText + ': ' + value; - break; - case 'warning': - icon = 'exclamation warning'; - break; - case 'ok': - icon = 'check good'; - text = gettext("OK"); - } - - return ` ${text}`; - }, -});