From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 4/6] ui: cluster task log: handle warnings like the node task log does
Date: Fri, 12 Mar 2021 13:53:27 +0100 [thread overview]
Message-ID: <20210312125329.20918-5-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210312125329.20918-1-f.ebner@proxmox.com>
Copied the relevant code from widget-toolkit.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Dependency bump for widget-toolkit is needed.
www/manager6/dc/Tasks.js | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/www/manager6/dc/Tasks.js b/www/manager6/dc/Tasks.js
index c5075dc3..ddf15642 100644
--- a/www/manager6/dc/Tasks.js
+++ b/www/manager6/dc/Tasks.js
@@ -61,9 +61,15 @@ Ext.define('PVE.dc.Tasks', {
getRowClass: function(record, index) {
var status = record.get('status');
- if (status && status != 'OK') {
- return "proxmox-invalid-row";
+ if (status) {
+ let parsed = Proxmox.Utils.parse_task_status(status);
+ if (parsed === 'error') {
+ return "proxmox-invalid-row";
+ } else if (parsed === 'warning') {
+ return "proxmox-warning-row";
+ }
}
+ return '';
},
},
sortableColumns: false,
@@ -122,11 +128,16 @@ Ext.define('PVE.dc.Tasks', {
}
return "";
}
- if (value == 'OK') {
- return 'OK';
+
+ let parsed = Proxmox.Utils.parse_task_status(value);
+ switch (parsed) {
+ case 'unknown': return Proxmox.Utils.unknownText;
+ case 'error': return Proxmox.Utils.errorText + ': ' + value;
+ case 'warning': return Proxmox.Utils.warningsText +
+ value.replace('WARNINGS', '');
+ case 'ok': // fall-through
+ default: return value;
}
- // metaData.attr = 'style="color:red;"';
- return Proxmox.Utils.errorText + ': ' + value;
},
},
],
--
2.20.1
next prev parent reply other threads:[~2021-03-12 12:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 12:53 [pve-devel] [PATCH-SERIES] improve warnings handling in UI and add to PVE Fabian Ebner
2021-03-12 12:53 ` [pve-devel] [PATCH widget-toolkit 1/6] tasks: add warningsText Fabian Ebner
2021-03-12 12:53 ` [pve-devel] [PATCH proxmox-backup 2/6] ui: tasks: use warningsText Fabian Ebner
2021-03-12 12:53 ` [pve-devel] [PATCH manager 3/6] ui: cluster task log: eslint fixes Fabian Ebner
2021-03-16 13:53 ` [pve-devel] applied: " Dominik Csapak
2021-03-12 12:53 ` Fabian Ebner [this message]
2021-03-12 12:53 ` [pve-devel] [PATCH/RFC common 5/6] allow workers to count warnings and finish tasks in a WARNINGS state Fabian Ebner
2021-03-12 12:53 ` [pve-devel] [PATCH/RFC container 6/6] restore: sanitize config: use new warn() function Fabian Ebner
2021-03-16 14:02 ` [pve-devel] [pbs-devel] [PATCH-SERIES] improve warnings handling in UI and add to PVE Dominik Csapak
2021-03-17 8:33 ` Fabian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210312125329.20918-5-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox