From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9496D68E7B for ; Mon, 22 Feb 2021 14:25:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 87E3A9EC5 for ; Mon, 22 Feb 2021 14:25:40 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EB4719E8B for ; Mon, 22 Feb 2021 14:25:38 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A9ECF447F3 for ; Mon, 22 Feb 2021 14:25:38 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 22 Feb 2021 14:25:36 +0100 Message-Id: <20210222132537.7407-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210222132537.7407-1-d.csapak@proxmox.com> References: <20210222132537.7407-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.210 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 3/4] ui: tape/ChangerStatus: convert grid stores to DiffStores X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2021 13:25:40 -0000 to not deselect items when the store is updated this makes the ui a bit better to use Signed-off-by: Dominik Csapak --- www/tape/ChangerStatus.js | 43 +++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js index aae13e43..11b159ce 100644 --- a/www/tape/ChangerStatus.js +++ b/www/tape/ChangerStatus.js @@ -1,3 +1,16 @@ +Ext.define('pbs-slot-model', { + extend: 'Ext.data.Model', + fields: ['entry-id', 'label-text', 'is-labeled', ' model', 'name', 'vendor', 'serial', 'state', + { + name: 'is-blocked', + calculate: function(data) { + return data.state !== undefined; + }, + }, + ], + idProperty: 'entry-id', +}); + Ext.define('PBS.TapeManagement.ChangerStatus', { extend: 'Ext.panel.Panel', alias: 'widget.pbsChangerStatus', @@ -500,10 +513,18 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { data[type].push(entry); } + // the stores are diffstores and are only refreshed + // on a 'load' event, which does not trigger on 'setData' + // so we have to fire them ourselves - me.lookup('slots').getStore().setData(data.slot); - me.lookup('import_export').getStore().setData(data['import-export']); - me.lookup('drives').getStore().setData(data.drive); + me.lookup('slots').getStore().rstore.setData(data.slot); + me.lookup('slots').getStore().rstore.fireEvent('load', me, [], true); + + me.lookup('import_export').getStore().rstore.setData(data['import-export']); + me.lookup('import_export').getStore().rstore.fireEvent('load', me, [], true); + + me.lookup('drives').getStore().rstore.setData(data.drive); + me.lookup('drives').getStore().rstore.fireEvent('load', me, [], true); if (!use_cache) { Proxmox.Utils.setErrorMask(view); @@ -638,6 +659,11 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { padding: 5, flex: 1, store: { + type: 'diff', + rstore: { + type: 'store', + model: 'pbs-slot-model', + }, data: [], }, columns: [ @@ -697,7 +723,11 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { reference: 'drives', title: gettext('Drives'), store: { - fields: ['entry-id', 'label-text', 'model', 'name', 'vendor', 'serial'], + type: 'diff', + rstore: { + type: 'store', + model: 'pbs-slot-model', + }, data: [], }, columns: [ @@ -803,6 +833,11 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { xtype: 'grid', reference: 'import_export', store: { + type: 'diff', + rstore: { + type: 'store', + model: 'pbs-slot-model', + }, data: [], }, title: gettext('Import-Export Slots'), -- 2.20.1