From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 3/3] ui: tape/BackupOverview: insert the tapes between media-set and snapshot
Date: Tue, 16 Feb 2021 12:48:12 +0100 [thread overview]
Message-ID: <20210216114812.8406-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210216114812.8406-1-d.csapak@proxmox.com>
but auto-expand them, so no additional click is necessary
this shows the user which tapes are involved for the media sets
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/tape/BackupOverview.js | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/www/tape/BackupOverview.js b/www/tape/BackupOverview.js
index a5bbfc09..4b4c02ff 100644
--- a/www/tape/BackupOverview.js
+++ b/www/tape/BackupOverview.js
@@ -129,6 +129,8 @@ Ext.define('PBS.TapeManagement.BackupOverview', {
list.result.data.sort((a, b) => a.snapshot.localeCompare(b.snapshot));
+ let tapes = {};
+
for (let entry of list.result.data) {
entry.text = entry.snapshot;
entry.leaf = true;
@@ -137,7 +139,23 @@ Ext.define('PBS.TapeManagement.BackupOverview', {
if (iconCls !== '') {
entry.iconCls = `fa ${iconCls}`;
}
- node.appendChild(entry);
+
+ let tape = entry['label-text'];
+ if (tapes[tape] === undefined) {
+ tapes[tape] = {
+ text: tape,
+ 'media-set-uuid': entry['media-set-uuid'],
+ 'seq-nr': entry['seq-nr'],
+ iconCls: 'pbs-icon-tape',
+ expanded: true,
+ children: [],
+ };
+ }
+ tapes[tape].children.push(entry);
+ }
+
+ for (const tape of Object.values(tapes)) {
+ node.appendChild(tape);
}
if (list.result.data.length === 0) {
@@ -198,7 +216,7 @@ Ext.define('PBS.TapeManagement.BackupOverview', {
text: gettext('Restore Media Set'),
handler: 'restore',
parentXType: 'treepanel',
- enableFn: (rec) => !!rec.data.uuid,
+ enableFn: (rec) => !!rec.data['media-set-uuid'],
},
],
--
2.20.1
next prev parent reply other threads:[~2021-02-16 11:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-16 11:48 [pbs-devel] [PATCH proxmox-backup 1/3] ui: tape: improve tape-erase and add it to library view Dominik Csapak
2021-02-16 11:48 ` [pbs-devel] [PATCH proxmox-backup 2/3] ui: css: remove vertical align for pbs-tape-icon Dominik Csapak
2021-02-16 11:48 ` Dominik Csapak [this message]
2021-02-16 12:06 ` [pbs-devel] applied: [PATCH proxmox-backup 1/3] ui: tape: improve tape-erase and add it to library view Dietmar Maurer
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=20210216114812.8406-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