From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-manager v5 04/18] ui: add pending grid
Date: Mon, 16 Nov 2026 17:30:29 +0100 [thread overview]
Message-ID: <20261116163138.343821-5-d.csapak@proxmox.com> (raw)
In-Reply-To: <20261116163138.343821-1-d.csapak@proxmox.com>
A new grid type that gets its data from a PendingObjectGrid and displays
a parsed property string in various columns. Each column shows its own
pending changes so that this can be seen more easily.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/Makefile | 1 +
www/manager6/grid/PendingGrid.js | 166 +++++++++++++++++++++++++++++++
2 files changed, 167 insertions(+)
create mode 100644 www/manager6/grid/PendingGrid.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index e8e2bd0b..4977213e 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -101,6 +101,7 @@ JSSRC= \
grid/FirewallAliases.js \
grid/FirewallOptions.js \
grid/FirewallRules.js \
+ grid/PendingGrid.js \
grid/PoolMembers.js \
grid/Replication.js \
grid/ResourceGrid.js \
diff --git a/www/manager6/grid/PendingGrid.js b/www/manager6/grid/PendingGrid.js
new file mode 100644
index 00000000..23430a14
--- /dev/null
+++ b/www/manager6/grid/PendingGrid.js
@@ -0,0 +1,166 @@
+/* Its main use is to be a 'sub grid' for a PendingObjectGrid, for qemu/HardwareView
+ * and lxc/Resources.
+ */
+Ext.define('PVE.grid.PendingGrid', {
+ extend: 'Ext.grid.Panel',
+ alias: 'widget.pvePendingGrid',
+
+ /// the original store of the PendingObjectGrid, used for retrieving data
+ rstore: undefined,
+
+ /// the filter function to filter only relevant data from rstore
+ storeFilter: function (_rec) {
+ return true;
+ },
+
+ // don't save or reload sorters, which live in `storeState`
+ getState: function () {
+ let state = this.callParent();
+ delete state?.storeState;
+ return state;
+ },
+
+ applyState: function (state) {
+ delete state?.storeState;
+ this.callParent([state]);
+ },
+
+ /// the parser for the data, should return an object
+ recordParser: function (key, value) {
+ let parsed = PVE.Parser.parsePropertyString(value);
+ return {
+ key,
+ ...parsed,
+ };
+ },
+
+ pendingRenderer: function (originalRenderer) {
+ originalRenderer ??= Ext.htmlEncode;
+ return function (val, mD, rec, rowIdx, colIdx, store, view) {
+ // add a 'pending parameter'
+ let txt = originalRenderer(val, mD, rec, rowIdx, colIdx, store, view, false);
+ let pendingTxt;
+
+ let pending = rec.get('pending');
+ let dataIndex = view.up().getColumns()[colIdx].dataIndex;
+ if (pending) {
+ let value = pending[dataIndex];
+ pendingTxt = originalRenderer(value, mD, rec, rowIdx, colIdx, store, view, true);
+ }
+
+ if (pendingTxt && txt && pendingTxt !== txt) {
+ txt += '<br />';
+ txt += `<span style="color: darkorange">${pendingTxt}</span>`;
+ }
+ if (pending && pendingTxt && (!txt || !rec.data.raw)) {
+ txt = `<span style="color: darkorange">${pendingTxt}</span>`;
+ }
+ if (pending && !pendingTxt && txt) {
+ txt = `<div style="color: darkorange; text-decoration: line-through;">${txt}</div>`;
+ }
+ // not every property has a (visible) column, so always mark the id for a change
+ if (dataIndex === 'id' && rec.data.raw && pending && pending.raw !== rec.data.raw) {
+ txt = `<span style="color: darkorange">${txt}</span>`;
+ }
+ if (rec.data.deleted && txt) {
+ txt = `<div style="color: darkorange; text-decoration: line-through;">${txt}</div>`;
+ }
+
+ return txt;
+ };
+ },
+
+ updateData: function () {
+ let me = this;
+ let records = [];
+ let data = me.rstore.getData();
+ (data.getSource() ?? data).each(function (rec) {
+ if (!me.storeFilter(rec)) {
+ return;
+ }
+
+ let key = rec.get('key');
+ let value = rec.get('value');
+ let deleted = rec.get('delete');
+
+ // the parser might not know all properties, still show the entry in that case
+ let parsed = me.recordParser(key, value) ?? {};
+ parsed.raw = value;
+
+ let pending = rec.get('pending');
+ let parsedPending;
+ if (pending) {
+ // without a parsed value only the id and the raw value show the change
+ parsedPending = me.recordParser(key, pending) ?? { ...parsed };
+ parsedPending.id = key;
+ parsedPending.raw = pending;
+ }
+
+ records.push({
+ ...parsed,
+ id: key,
+ key,
+ pending: parsedPending,
+ deleted,
+ });
+ });
+
+ me.getStore().setData(records);
+ },
+
+ store: {},
+
+ columns: [],
+
+ initComponent: function () {
+ let me = this;
+
+ if (!me.rstore) {
+ throw 'no rstore defined';
+ }
+
+ let columns = [];
+
+ // overwrite renderer to be pending
+ //
+ // CAUTION: don't modify the original column objects, rather copy them
+ let getPendingColumn = function (column) {
+ let originalRenderer = column.renderer;
+ // might be a string (named scope)
+ if (Ext.isString(originalRenderer)) {
+ let renderString = originalRenderer.toString();
+ originalRenderer = function () {
+ return Ext.callback(renderString, me.scope, arguments, 0, me);
+ };
+ }
+
+ let renderer = me.pendingRenderer(originalRenderer);
+ return {
+ ...column,
+ renderer,
+ };
+ };
+
+ for (const column of me.columns ?? []) {
+ if (Ext.isArray(column.columns)) {
+ // handle one level of nested columns
+ let innerColumns = [];
+ for (const innerColumn of column.columns) {
+ innerColumns.push(getPendingColumn(innerColumn));
+ }
+ columns.push({
+ ...column,
+ columns: innerColumns,
+ });
+ } else {
+ columns.push(getPendingColumn(column));
+ }
+ }
+
+ me.columns = columns;
+
+ me.callParent();
+
+ me.mon(me.rstore, 'refresh', me.updateData, me);
+ },
+});
--
2.47.3
next prev parent reply other threads:[~2026-11-16 16:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 16:30 [PATCH pve-manager v5 00/18] ui: split out disks and nics into grids Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 01/18] ui: utils: factor out 'media=cdrom' check Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 02/18] ui: parser: qemu drive: allow '-' in key name Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 03/18] ui: factor out the guest key nic regex check Dominik Csapak
2026-11-16 16:30 ` Dominik Csapak [this message]
2026-11-16 16:30 ` [PATCH pve-manager v5 05/18] ui: revert button: add parentXType and reloadCallback Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 06/18] ui: button: add config remove button Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 07/18] ui: qemu: hardware: wrap in container Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 08/18] ui: qemu: introduce hardware disk grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 09/18] ui: qemu: introduce hardware net grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 10/18] ui: qemu: hardware view: separate disks into own grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 11/18] ui: qemu: hardware view: separate nics " Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 12/18] ui: qemu: hardware view: inline edit/remove/revert button in general grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 13/18] ui: qemu: hardware view: inline 'add efi' menuitem Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 14/18] ui: utils: factor out volume size renderer Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 15/18] ui: lxc: network view: convert to pending grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 16/18] ui: lxc: introduce resource volume grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 17/18] ui: lxc: resources: separate volumes into own grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 18/18] ui: lxc: resources: integrate network view Dominik Csapak
2026-11-19 10:01 ` superseded: [PATCH pve-manager v5 00/18] ui: split out disks and nics into grids Dominik Csapak
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=20261116163138.343821-5-d.csapak@proxmox.com \
--to=d.csapak@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