From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 8F9FF1FF142 for ; Mon, 16 Feb 2026 13:23:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ADE761175E; Mon, 16 Feb 2026 13:24:25 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v2 08/12] ui: datastore summary: move store to be part of summary panel Date: Mon, 16 Feb 2026 13:14:02 +0100 Message-ID: <20260216121406.99617-15-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260216121406.99617-1-c.ebner@proxmox.com> References: <20260216121406.99617-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1771244055091 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: QVLJMZY7VQUSB23OR2FQPYH5ZVWZMMNL X-Message-ID-Hash: QVLJMZY7VQUSB23OR2FQPYH5ZVWZMMNL X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Move the store from the datastore info panel to the parent datastore summary panel and refactor the store load logic. By this, the same view model can be reused by all child items, which is required to show the s3 statistics if present for the datastore, avoiding the need to perform additional api requests. Signed-off-by: Christian Ebner --- changes since version 1: - no changes www/datastore/Summary.js | 175 +++++++++++++++++---------------------- 1 file changed, 74 insertions(+), 101 deletions(-) diff --git a/www/datastore/Summary.js b/www/datastore/Summary.js index cb412630d..4dd7dc4ce 100644 --- a/www/datastore/Summary.js +++ b/www/datastore/Summary.js @@ -48,100 +48,6 @@ Ext.define('PBS.DataStoreInfo', { extend: 'Ext.panel.Panel', alias: 'widget.pbsDataStoreInfo', - viewModel: { - data: { - countstext: '', - usage: {}, - stillbad: 0, - mountpoint: '', - }, - }, - - controller: { - xclass: 'Ext.app.ViewController', - - onLoad: function (store, data, success) { - let me = this; - if (!success) { - Proxmox.Utils.API2Request({ - url: `/config/datastore/${me.view.datastore}`, - success: function (response) { - let maintenanceString = response.result.data['maintenance-mode']; - let removable = !!response.result.data['backing-device']; - if (!maintenanceString && !removable) { - me.view.el.mask(gettext('Datastore is not available')); - return; - } - - let [_type, msg] = PBS.Utils.parseMaintenanceMode(maintenanceString); - let isUnplugged = !maintenanceString && removable; - let maskMessage = isUnplugged - ? gettext('Datastore is not mounted') - : `${gettext('Datastore is in maintenance mode')}${msg ? ': ' + msg : ''}`; - - let maskIcon = isUnplugged - ? 'fa pbs-unplugged-mask' - : 'fa pbs-maintenance-mask'; - me.view.el.mask(maskMessage, maskIcon); - }, - }); - return; - } - me.view.el.unmask(); - - let vm = me.getViewModel(); - - let counts = store.getById('counts').data.value; - let used = store.getById('used').data.value; - let total = store.getById('avail').data.value + used; - - let usage = Proxmox.Utils.render_size_usage(used, total, true); - vm.set('usagetext', usage); - vm.set('usage', used / total); - - let countstext = function (count) { - count = count || {}; - return `${count.groups || 0} ${gettext('Groups')}, ${count.snapshots || 0} ${gettext('Snapshots')}`; - }; - let gcstatus = store.getById('gc-status')?.data.value; - if (gcstatus) { - let dedup = PBS.Utils.calculate_dedup_factor(gcstatus); - vm.set('deduplication', dedup.toFixed(2)); - vm.set('stillbad', gcstatus['still-bad']); - } - - vm.set('ctcount', countstext(counts.ct)); - vm.set('vmcount', countstext(counts.vm)); - vm.set('hostcount', countstext(counts.host)); - }, - - startStore: function () { - this.store.startUpdate(); - }, - stopStore: function () { - this.store.stopUpdate(); - }, - doSingleStoreLoad: function () { - this.store.load(); - }, - - init: function (view) { - let me = this; - let datastore = encodeURIComponent(view.datastore); - me.store = Ext.create('Proxmox.data.ObjectStore', { - interval: 5 * 1000, - url: `/api2/json/admin/datastore/${datastore}/status/?verbose=true`, - }); - me.store.on('load', me.onLoad, me); - }, - }, - - listeners: { - activate: 'startStore', - beforedestroy: 'stopStore', - deactivate: 'stopStore', - }, - defaults: { xtype: 'pmxInfoWidget', }, @@ -237,6 +143,15 @@ Ext.define('PBS.DataStoreSummary', { padding: 5, }, + viewModel: { + data: { + countstext: '', + usage: {}, + stillbad: 0, + mountpoint: '', + }, + }, + tbar: [ { xtype: 'button', @@ -365,16 +280,19 @@ Ext.define('PBS.DataStoreSummary', { listeners: { activate: function () { this.rrdstore.startUpdate(); + this.infoStore.startUpdate(); }, afterrender: function () { this.statusStore.startUpdate(); }, deactivate: function () { this.rrdstore.stopUpdate(); + this.infoStore.stopUpdate(); }, destroy: function () { this.rrdstore.stopUpdate(); this.statusStore.stopUpdate(); + this.infoStore.stopUpdate(); }, resize: function (panel) { Proxmox.Utils.updateColumns(panel); @@ -394,6 +312,11 @@ Ext.define('PBS.DataStoreSummary', { interval: 1000, }); + me.infoStore = Ext.create('Proxmox.data.ObjectStore', { + interval: 5 * 1000, + url: `/api2/json/admin/datastore/${me.datastore}/status/?verbose=true`, + }); + let lastRequestFailed = false; me.mon(me.statusStore, 'load', (s, records, success) => { let mountBtn = me.lookupReferenceHolder().lookupReference('mountButton'); @@ -403,10 +326,8 @@ Ext.define('PBS.DataStoreSummary', { me.statusStore.stopUpdate(); me.rrdstore.stopUpdate(); - - let infoPanelController = me.down('pbsDataStoreInfo').getController(); - infoPanelController.stopStore(); - infoPanelController.doSingleStoreLoad(); + me.infoStore.stopUpdate(); + me.infoStore.load(); Proxmox.Utils.API2Request({ url: `/config/datastore/${me.datastore}`, @@ -431,7 +352,7 @@ Ext.define('PBS.DataStoreSummary', { } else { // only trigger on edges, else we couple our interval to the info one if (lastRequestFailed) { - me.down('pbsDataStoreInfo').fireEvent('activate'); + me.infoStore.startUpdate(); me.rrdstore.startUpdate(); } unmountBtn.setDisabled(false); @@ -486,6 +407,60 @@ Ext.define('PBS.DataStoreSummary', { }, }); + me.mon(me.infoStore, 'load', (store, records, success) => { + if (!success) { + Proxmox.Utils.API2Request({ + url: `/config/datastore/${me.datastore}`, + success: function (response) { + let maintenanceString = response.result.data['maintenance-mode']; + let removable = !!response.result.data['backing-device']; + if (!maintenanceString && !removable) { + me.down('pbsDataStoreInfo').mask(gettext('Datastore is not available')); + return; + } + + let [_type, msg] = PBS.Utils.parseMaintenanceMode(maintenanceString); + let isUnplugged = !maintenanceString && removable; + let maskMessage = isUnplugged + ? gettext('Datastore is not mounted') + : `${gettext('Datastore is in maintenance mode')}${msg ? ': ' + msg : ''}`; + + let maskIcon = isUnplugged + ? 'fa pbs-unplugged-mask' + : 'fa pbs-maintenance-mask'; + me.down('pbsDataStoreInfo').mask(maskMessage, maskIcon); + }, + }); + return; + } + me.down('pbsDataStoreInfo').unmask(); + + let vm = me.getViewModel(); + + let counts = store.getById('counts').data.value; + let used = store.getById('used').data.value; + let total = store.getById('avail').data.value + used; + + let usage = Proxmox.Utils.render_size_usage(used, total, true); + vm.set('usagetext', usage); + vm.set('usage', used / total); + + let countstext = function (count) { + count = count || {}; + return `${count.groups || 0} ${gettext('Groups')}, ${count.snapshots || 0} ${gettext('Snapshots')}`; + }; + let gcstatus = store.getById('gc-status')?.data.value; + if (gcstatus) { + let dedup = PBS.Utils.calculate_dedup_factor(gcstatus); + vm.set('deduplication', dedup.toFixed(2)); + vm.set('stillbad', gcstatus['still-bad']); + } + + vm.set('ctcount', countstext(counts.ct)); + vm.set('vmcount', countstext(counts.vm)); + vm.set('hostcount', countstext(counts.host)); + }); + me.mon( me.rrdstore, 'load', @@ -500,7 +475,5 @@ Ext.define('PBS.DataStoreSummary', { me.query('proxmoxRRDChart').forEach((chart) => { chart.setStore(me.rrdstore); }); - - me.down('pbsDataStoreInfo').relayEvents(me, ['activate', 'deactivate']); }, }); -- 2.47.3