* [PATCH pve-manager v4 1/2] ui: resource tree: use 'diskuse' instead of calculating every time
@ 2026-11-16 8:51 Dominik Csapak
2026-11-16 8:51 ` [PATCH pve-manager v4 2/2] ui: resource tree: only fire 'refresh' event when something changed Dominik Csapak
2026-11-16 11:04 ` applied: [PATCH pve-manager v4 1/2] ui: resource tree: use 'diskuse' instead of calculating every time Thomas Lamprecht
0 siblings, 2 replies; 3+ messages in thread
From: Dominik Csapak @ 2026-11-16 8:51 UTC (permalink / raw)
To: pve-devel
the resource store has a field 'diskuse' which it calculates on update.
Use that instead of calculating the value ourselves every time.
For change detection, we only need a resolution of 0.001 (since we want
to use the percentage with one decimal place) so check that the
difference of old and new is at least 0.001 (0.1%).
This works because we only overwrite the values in the treestore if
anything changed, so multiple small changes to the diskuse will not be
lost.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from v3:
* rebase on current master
* lower the change detection threshold from 0.01 (1%) to 0.001 (0.1%)
* show the usage in the tooltip with one decimal place instead of two,
so it matches the change detection resolution (thanks Jonas & Thomas)
* adapt the commit message to the new threshold and state it as
fraction and percentage
* wrap an overly long comment
* did not carry over Jonas' Tested-by, since the threshold and the
tooltip rendering changed
www/manager6/tree/ResourceTree.js | 34 ++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js
index e2acc431..3efb1cd3 100644
--- a/www/manager6/tree/ResourceTree.js
+++ b/www/manager6/tree/ResourceTree.js
@@ -57,7 +57,7 @@ Ext.define('PVE.tree.ResourceTree', {
let text = info.text;
let status = '';
if (info.type === 'storage') {
- let usage = info.disk / info.maxdisk;
+ let usage = info.diskuse;
if (usage >= 0.0 && usage <= 1.0) {
let barHeight = (usage * 100).toFixed(0);
let remainingHeight = (100 - barHeight).toFixed(0);
@@ -192,9 +192,9 @@ Ext.define('PVE.tree.ResourceTree', {
qtips.push(Ext.String.format(gettext('HA State: {0}'), info.hastate));
}
if (info.type === 'storage') {
- let usage = info.disk / info.maxdisk;
+ let usage = info.diskuse;
if (usage >= 0.0 && usage <= 1.0) {
- qtips.push(Ext.String.format(gettext('Usage: {0}%'), (usage * 100).toFixed(2)));
+ qtips.push(Ext.String.format(gettext('Usage: {0}%'), (usage * 100).toFixed(1)));
}
}
@@ -333,8 +333,6 @@ Ext.define('PVE.tree.ResourceTree', {
let stateid = 'rid';
const changedFields = [
- 'disk',
- 'maxdisk',
'vmid',
'name',
'type',
@@ -432,14 +430,30 @@ Ext.define('PVE.tree.ResourceTree', {
}
}
- // tree item has been updated
- for (const field of changedFields) {
- if (item.data[field] !== olditem.data[field]) {
+ let diskUsage = item.data.diskuse;
+ let oldDiskUsage = olditem.data.diskuse;
+
+ if (diskUsage !== undefined && oldDiskUsage !== undefined) {
+ // we have an old and new value, so check if it changed enough
+ if (Math.abs(diskUsage - oldDiskUsage) >= 0.001) {
changed = true;
- break;
}
+ } else if (diskUsage !== undefined || oldDiskUsage !== undefined) {
+ // we have either a new or an old value, but not both,
+ // always treat that as a change
+ changed = true;
+ }
+
+ if (!changed) {
+ // tree item has been updated
+ for (const field of changedFields) {
+ if (item.data[field] !== olditem.data[field]) {
+ changed = true;
+ break;
+ }
+ }
+ // FIXME: also test filterfn()?
}
- // FIXME: also test filterfn()?
}
if (changed) {
--
2.47.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH pve-manager v4 2/2] ui: resource tree: only fire 'refresh' event when something changed
2026-11-16 8:51 [PATCH pve-manager v4 1/2] ui: resource tree: use 'diskuse' instead of calculating every time Dominik Csapak
@ 2026-11-16 8:51 ` Dominik Csapak
2026-11-16 11:04 ` applied: [PATCH pve-manager v4 1/2] ui: resource tree: use 'diskuse' instead of calculating every time Thomas Lamprecht
1 sibling, 0 replies; 3+ messages in thread
From: Dominik Csapak @ 2026-11-16 8:51 UTC (permalink / raw)
To: pve-devel
to optimize the rendering to the dom, only fire the 'refresh' event of
the store at the end of the updateTree method when either:
* an element changed its relevant data
* something moved
* a new element was inserted
* an element was removed
We also need to refresh the store when the UI options are reloaded, so
the tags get the correct color.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from v3:
* rebase on current master
* use 'me.store' consistently when firing the 'refresh' event after
the UI options were loaded
* improve the comment there to say why the refresh is necessary
* fix typo in the commit message
www/manager6/tree/ResourceTree.js | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js
index 3efb1cd3..5d96bffb 100644
--- a/www/manager6/tree/ResourceTree.js
+++ b/www/manager6/tree/ResourceTree.js
@@ -377,6 +377,7 @@ Ext.define('PVE.tree.ResourceTree', {
let updateTree = function () {
store.suspendEvents();
+ let anyChanged = false;
let rootnode;
if (firstUpdate) {
rootnode = Ext.create('PVETree', {
@@ -465,6 +466,7 @@ Ext.define('PVE.tree.ResourceTree', {
}
me.setIconCls(info);
olditem.commit();
+ anyChanged = true;
}
if ((!item || moved) && olditem.isLeaf()) {
delete index[key];
@@ -482,6 +484,8 @@ Ext.define('PVE.tree.ResourceTree', {
let grandParent = parentNode.parentNode;
grandParent.removeChild(parentNode, true);
}
+
+ anyChanged = true;
}
}
@@ -501,10 +505,13 @@ Ext.define('PVE.tree.ResourceTree', {
if (child) {
index[item.data.id] = child;
}
+ anyChanged = true;
});
store.resumeEvents();
- store.fireEvent('refresh', store);
+ if (anyChanged) {
+ store.fireEvent('refresh', store);
+ }
let foundChild = findNode(rootnode, lastsel?.data.id);
@@ -663,6 +670,9 @@ Ext.define('PVE.tree.ResourceTree', {
return true;
},
});
+
+ // some nodes need rerendering here, e.g. for tag colors
+ me.store.fireEvent('refresh', me.store);
});
},
});
--
2.47.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* applied: [PATCH pve-manager v4 1/2] ui: resource tree: use 'diskuse' instead of calculating every time
2026-11-16 8:51 [PATCH pve-manager v4 1/2] ui: resource tree: use 'diskuse' instead of calculating every time Dominik Csapak
2026-11-16 8:51 ` [PATCH pve-manager v4 2/2] ui: resource tree: only fire 'refresh' event when something changed Dominik Csapak
@ 2026-11-16 11:04 ` Thomas Lamprecht
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Lamprecht @ 2026-11-16 11:04 UTC (permalink / raw)
To: pve-devel, Dominik Csapak; +Cc: Jonas Theisen
On Mon, 16 Nov 2026 09:51:00 +0100, Dominik Csapak wrote:
> the resource store has a field 'diskuse' which it calculates on update.
> Use that instead of calculating the value ourselves every time.
>
> For change detection, we only need a resolution of 0.001 (since we want
> to use the percentage with one decimal place) so check that the
> difference of old and new is at least 0.001 (0.1%).
>
> [...]
Applied, thanks to you and Jonas for review/testing!
[1/2] ui: resource tree: use 'diskuse' instead of calculating every time
https://git.proxmox.com/?p=pve-manager.git;a=commitdiff;h=e5881fbbfcb99b6996985e399697f8769534b8db
[2/2] ui: resource tree: only fire 'refresh' event when something changed
https://git.proxmox.com/?p=pve-manager.git;a=commitdiff;h=a4261f75c6574c4350b1a415ed8b23137bf36532
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-16 11:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-16 8:51 [PATCH pve-manager v4 1/2] ui: resource tree: use 'diskuse' instead of calculating every time Dominik Csapak
2026-11-16 8:51 ` [PATCH pve-manager v4 2/2] ui: resource tree: only fire 'refresh' event when something changed Dominik Csapak
2026-11-16 11:04 ` applied: [PATCH pve-manager v4 1/2] ui: resource tree: use 'diskuse' instead of calculating every time Thomas Lamprecht
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.