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 3919B7099D for ; Fri, 14 May 2021 14:59:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 24C501760C for ; Fri, 14 May 2021 14:59:27 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 F0A60175D6 for ; Fri, 14 May 2021 14:59:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C6E5D46567 for ; Fri, 14 May 2021 14:59:24 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 14 May 2021 14:59:20 +0200 Message-Id: <20210514125923.14955-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210514125923.14955-1-d.csapak@proxmox.com> References: <20210514125923.14955-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [data.store, rec.data, node.data] Subject: [pbs-devel] [PATCH proxmox-backup v2 2/5] ui: tape/BackupOverview: move restore buttons inline 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: Fri, 14 May 2021 12:59:57 -0000 instead of having them in the toolbar. This makes the UI more consistent with the datastore content view. Signed-off-by: Dominik Csapak --- www/tape/BackupOverview.js | 86 +++++++++++++------------------------- 1 file changed, 28 insertions(+), 58 deletions(-) diff --git a/www/tape/BackupOverview.js b/www/tape/BackupOverview.js index 91ff1aac..0e105274 100644 --- a/www/tape/BackupOverview.js +++ b/www/tape/BackupOverview.js @@ -16,58 +16,30 @@ Ext.define('PBS.TapeManagement.BackupOverview', { }).show(); }, - restoreSingle: function(button, record) { + restore: function(view, rI, cI, item, e, rec) { let me = this; - let view = me.getView(); - let selection = view.getSelection(); - if (!selection || selection.length < 1) { - return; - } - let node = selection[0]; - if (node.data.restoreid === undefined) { - return; - } - let restoreid = node.data.restoreid; - let mediaset = node.data['media-set']; + let node = rec; + let mediaset = node.data.is_media_set ? node.data.text : node.data['media-set']; let uuid = node.data['media-set-uuid']; - let datastores = [node.data.store]; - - Ext.create('PBS.TapeManagement.TapeRestoreWindow', { - mediaset, - uuid, - list: [ - restoreid, - ], - datastores, - listeners: { - destroy: function() { - me.reload(); - }, - }, - }).show(); - }, - restore: function(button, record) { - let me = this; - let view = me.getView(); - let selection = view.getSelection(); - if (!selection || selection.length < 1) { - return; - } - - let node = selection[0]; - let mediaset = node.data.text; - let uuid = node.data['media-set-uuid']; - let datastores = node.data.datastores; - while (!datastores && node.get('depth') > 2) { - node = node.parentNode; + let list; + let datastores; + if (node.data.restoreid !== undefined) { + list = [node.data.restoreid]; + datastores = [node.data.store]; + } else { datastores = node.data.datastores; + while (!datastores && node.get('depth') > 2) { + node = node.parentNode; + datastores = node.data.datastores; + } } Ext.create('PBS.TapeManagement.TapeRestoreWindow', { mediaset, uuid, datastores, + list, listeners: { destroy: function() { me.reload(); @@ -99,6 +71,7 @@ Ext.define('PBS.TapeManagement.BackupOverview', { if (data[pool][media_set] === undefined) { data[pool][media_set] = entry; data[pool][media_set].text = media_set; + data[pool][media_set].restore =true; data[pool][media_set].tapes = 1; data[pool][media_set]['seq-nr'] = undefined; data[pool][media_set].is_media_set = true; @@ -180,6 +153,7 @@ Ext.define('PBS.TapeManagement.BackupOverview', { for (let entry of list.result.data) { entry.text = entry.snapshot; + entry.restore = true; entry.leaf = true; entry.children = []; entry['media-set'] = media_set; @@ -289,22 +263,6 @@ Ext.define('PBS.TapeManagement.BackupOverview', { text: gettext('New Backup'), handler: 'backup', }, - { - xtype: 'proxmoxButton', - disabled: true, - text: gettext('Restore Media Set'), - handler: 'restore', - parentXType: 'treepanel', - enableFn: (rec) => !!rec.data['media-set-uuid'], - }, - { - xtype: 'proxmoxButton', - disabled: true, - text: gettext('Restore Snapshot'), - handler: 'restoreSingle', - parentXType: 'treepanel', - enableFn: (rec) => !!rec.data.restoreid, - }, ], columns: [ @@ -315,6 +273,18 @@ Ext.define('PBS.TapeManagement.BackupOverview', { sortable: false, flex: 3, }, + { + header: gettext('Actions'), + xtype: 'actioncolumn', + items: [ + { + handler: 'restore', + tooltip: gettext('Restore'), + getClass: (v, m, rec) => rec.data.restore ? 'fa fa-fw fa-undo' : 'pmx-hidden', + isDisabled: (v, r, c, i, rec) => !rec.data.restore, + }, + ], + }, { text: gettext('Tapes'), dataIndex: 'tapes', -- 2.20.1