the resource store has a field 'diskuse' which it calculates on update. Use that instead of calculating the value ourselves everytime.
For change detection, we only need a resolution of 0.01 (since we want to use the percentage as integer) so check that the difference of old and new is bigger than 0.9% . Signed-off-by: Dominik Csapak <[email protected]> --- www/manager6/tree/ResourceTree.js | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index bb016f8c..4c4e2908 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); @@ -186,7 +186,7 @@ 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))); } @@ -310,8 +310,6 @@ Ext.define('PVE.tree.ResourceTree', { let stateid = 'rid'; const changedFields = [ - 'disk', - 'maxdisk', 'vmid', 'name', 'type', @@ -409,14 +407,25 @@ Ext.define('PVE.tree.ResourceTree', { } } - // tree item has been updated - for (const field of changedFields) { - if (item.data[field] !== olditem.data[field]) { + let diskuse = item.data.diskuse; + let oldDiskuse = olditem.data.diskuse; + + if (diskuse !== undefined || oldDiskuse !== undefined) { + if (Math.abs(diskuse - oldDiskuse) > 0.009) { changed = true; - break; } } - // FIXME: also test filterfn()? + + 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()? + } } if (changed) { -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
