From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-manager v6 06/21] ui: add pending grid
Date: Thu, 19 Nov 2026 10:28:19 +0100 [thread overview]
Message-ID: <20261119092930.830046-7-d.csapak@proxmox.com> (raw)
In-Reply-To: <20261119092930.830046-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-19 9:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 01/21] ui: utils: factor out 'media=cdrom' check Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 02/21] ui: parser: qemu drive: allow '-' in key name Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 03/21] ui: qemu: network edit: remove unused 'networkmode' property Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 04/21] ui: parser: qemu network: allow unknown keys Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 05/21] ui: factor out the guest key nic regex check Dominik Csapak
2026-11-19 9:28 ` Dominik Csapak [this message]
2026-11-19 9:28 ` [PATCH pve-manager v6 07/21] ui: revert button: add parentXType and reloadCallback Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 08/21] ui: button: add config remove button Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 09/21] ui: qemu: hardware: wrap in container Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 10/21] ui: qemu: introduce hardware disk grid Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 11/21] ui: qemu: introduce hardware net grid Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 12/21] ui: qemu: hardware view: separate disks into own grid Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 13/21] ui: qemu: hardware view: separate nics " Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 14/21] ui: qemu: hardware view: inline edit/remove/revert button in general grid Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 15/21] ui: qemu: hardware view: inline 'add efi' menuitem Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 16/21] ui: utils: factor out volume size renderer Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 17/21] ui: lxc: network view: convert to pending grid Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 18/21] ui: lxc: introduce resource volume grid Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 19/21] ui: lxc: resources: separate volumes into own grid Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 20/21] ui: lxc: resources: integrate network view Dominik Csapak
2026-11-19 9:28 ` [PATCH pve-manager v6 21/21] ui: qemu/lxc: volume/disk grid: add overflow handler 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=20261119092930.830046-7-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.