From: Matthias Heiserer <m.heiserer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [RFC manager 2/5] GUI: Utils: add comment renderer and field provider
Date: Mon, 14 Feb 2022 15:01:40 +0100 [thread overview]
Message-ID: <20220214140144.961041-4-m.heiserer@proxmox.com> (raw)
In-Reply-To: <20220214140144.961041-1-m.heiserer@proxmox.com>
These render functions are used when displaying comments in a
separate column.
The `commentField` utility simplifies creation of comments.
Signed-off-by: Matthias Heiserer <m.heiserer@proxmox.com>
---
www/manager6/Utils.js | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index aafe359a..2d03f611 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1803,6 +1803,45 @@ Ext.define('PVE.Utils', {
return undefined;
},
+
+ renderComment: function(key, metaData, rec, rowIndex, colIndex, store, pending) {
+ if (rec && rec.data && rec.data.value) {
+ let properties = PVE.Parser.parsePropertyString(rec.data.value, rec.data.key);
+ if (properties && properties.comment) {
+ return properties.comment;
+ }
+ }
+ // Try to extract a comment from the separate fields
+ // This is needed for single value fields like bios and memory
+ if (rec && rec.id) {
+ let hw_name = rec.id;
+ let comment = this.getObjectValue(`${hw_name}_comment`, undefined);
+ if (comment) {
+ return comment;
+ }
+ }
+ return PVE.Utils.noneText;
+ },
+
+ renderValueWithoutComment: function(context) {
+ return function(value, ...args) {
+ if (value && typeof value === "string") {
+ value = value.replace(/comment=[^,]*(,|$)/, "");
+ }
+ return this.renderValue(value, ...args);
+ }.bind(context);
+ },
+
+ commentField: function(name = 'comment') {
+ return {
+ xtype: 'textfield',
+ name: name,
+ fieldLabel: gettext('comment'),
+ allowBlank: true,
+ emptyText: '',
+ defaultValue: '',
+ };
+ },
},
singleton: true,
--
2.30.2
next prev parent reply other threads:[~2022-02-14 14:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 14:01 [pve-devel] [RFC manager 0/5] GUI: Hardware comments Matthias Heiserer
2022-02-14 14:01 ` [pve-devel] [RFC manager 1/5] GUI: Parser: add comment support Matthias Heiserer
2022-02-14 14:01 ` [pve-devel] [RFC qemu-server 1/2] QEMU: add comment helper Matthias Heiserer
2022-02-14 14:01 ` Matthias Heiserer [this message]
2022-02-14 14:01 ` [pve-devel] [RFC qemu-server 2/2] QEMU: add comment fields Matthias Heiserer
2022-02-14 14:01 ` [pve-devel] [RFC manager 3/5] GUI: QEMU Hardware: add comment column Matthias Heiserer
2022-02-14 14:01 ` [pve-devel] [RFC manager 4/5] GUI: QEMU Hardware: multikey support for comments Matthias Heiserer
2022-02-14 14:01 ` [pve-devel] [RFC manager 5/5] GUI: QEMU Hardware: add comment fields to rows Matthias Heiserer
2022-02-14 14:27 ` [pve-devel] [RFC manager 0/5] GUI: Hardware comments Thomas Lamprecht
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=20220214140144.961041-4-m.heiserer@proxmox.com \
--to=m.heiserer@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