From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2 2/5] ui: tape/BackupOverview: move restore buttons inline
Date: Fri, 14 May 2021 14:59:20 +0200 [thread overview]
Message-ID: <20210514125923.14955-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210514125923.14955-1-d.csapak@proxmox.com>
instead of having them in the toolbar. This makes the UI more consistent
with the datastore content view.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
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
next prev parent reply other threads:[~2021-05-14 12:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-14 12:59 [pbs-devel] [PATCH proxmox-backup v2 0/5] ui: unify and improve tape restore window Dominik Csapak
2021-05-14 12:59 ` [pbs-devel] [PATCH proxmox-backup v2 1/5] ui: tape/BackupOverview: fix wrong media-set text for singlerestore Dominik Csapak
2021-05-18 6:32 ` [pbs-devel] applied: " Thomas Lamprecht
2021-05-14 12:59 ` Dominik Csapak [this message]
2021-05-18 6:32 ` [pbs-devel] applied: [PATCH proxmox-backup v2 2/5] ui: tape/BackupOverview: move restore buttons inline Thomas Lamprecht
2021-05-14 12:59 ` [pbs-devel] [PATCH proxmox-backup v2 3/5] ui: tape/window/TapeRestore: add SnapshotGrid Component Dominik Csapak
2021-05-18 6:32 ` [pbs-devel] applied: " Thomas Lamprecht
2021-05-14 12:59 ` [pbs-devel] [PATCH proxmox-backup v2 4/5] ui: tape/window/TapeRestore: enabling selecting multiple snapshots Dominik Csapak
2021-05-18 7:00 ` Thomas Lamprecht
2021-05-18 17:00 ` Thomas Lamprecht
2021-05-20 6:54 ` Dominik Csapak
2021-05-20 6:50 ` Dominik Csapak
2021-05-14 12:59 ` [pbs-devel] [PATCH proxmox-backup v2 5/5] ui: tape/BackupOverview: also allow to filter by group for restore Dominik Csapak
2021-05-14 13:01 ` [pbs-devel] [PATCH proxmox-backup v2 0/5] ui: unify and improve tape restore window Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210514125923.14955-3-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox