From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] fix #4977: ui: tape: restore: rework snapshot selection logic
Date: Fri, 29 Sep 2023 15:39:24 +0200 [thread overview]
Message-ID: <20230929133924.2731714-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20230929133924.2731714-1-d.csapak@proxmox.com>
previously, the snapshot grid returned one of three possible types of
values:
* a list of snapshots
* a list of datastores (if only whole datastores were selected)
* the string 'all' (when all snapshots were selected)
this led to some confusing and wrong code, especially the part:
---
if (source === 'all') {
source = values.store;
}
---
which basically set the selected *target* store as a source.
(meaning it tried restoring a datastore with the selected target name,
regardless if it existed or not)
This fell through in testing, since we most often only restored to the
same datastore anyway were the target and source name were the same.
Rework the return value to return the empty array in case all snapshots
are selected, since selecting none is not a valid anyway.
This means we always get an array back, which makes the code a bit
cleaner overall.
At the same time, we now differentiate correctly the 'all selected'
case, by setting the selected target as a default target.
So instead of previously having `target=target` as datastore parameter,
we now have `target` which is the correct behavior when we want to
restore the whole media set anyway.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/tape/window/TapeRestore.js | 44 ++++++++++++++++++----------------
1 file changed, 24 insertions(+), 20 deletions(-)
diff --git a/www/tape/window/TapeRestore.js b/www/tape/window/TapeRestore.js
index 3008f359..fbc1858e 100644
--- a/www/tape/window/TapeRestore.js
+++ b/www/tape/window/TapeRestore.js
@@ -179,9 +179,6 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', {
updateDatastores: function(grid, values) {
let me = this;
- if (values === 'all') {
- values = [];
- }
let datastores = {};
values.forEach((snapshotOrDatastore) => {
let datastore = snapshotOrDatastore;
@@ -297,14 +294,12 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', {
onGetValues: function(values) {
let me = this;
- if (values !== "all" &&
- Ext.isString(values.snapshots) &&
- values.snapshots &&
- values.snapshots.indexOf(':') !== -1
- ) {
- values.snapshots = values.snapshots.split(',');
- } else {
- delete values.snapshots;
+ // cannot use the string serialized one from onGetValues, so gather manually
+ delete values.snapshots;
+ let snapshots = me.down('pbsTapeSnapshotGrid').getValue();
+
+ if (snapshots.length > 0 && snapshots[0].indexOf(':') !== -1) {
+ values.snapshots = snapshots;
}
return values;
@@ -378,12 +373,14 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', {
let vm = controller.getViewModel();
let datastores = [];
if (values.store.toString() !== "") {
+ let target = values.store.toString();
+ delete values.store;
+
+ let source = [];
if (vm.get('singleDatastore')) {
- let source = controller.lookup('snapshotGrid').getValue();
- if (source === 'all') {
- // all values are selected
- source = values.store;
- } else if (Ext.isArray(source)) {
+ // can be '[]' (for all), a list of datastores, or a list of snapshots
+ source = controller.lookup('snapshotGrid').getValue();
+ if (source.length > 0) {
if (source[0].indexOf(':') !== -1) {
// one or multiple snapshots are selected
// extract datastore from first
@@ -392,12 +389,19 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', {
// one whole datstore is selected
source = source[0];
}
+ } else {
+ // must be [] (all snapshots) so we use it as a default target
}
- datastores.push(`${source}=${values.store}`);
} else {
- datastores.push(values.store);
+ // there is more than one datastore to be restored, so this is just
+ // the default fallback
+ }
+
+ if (Ext.isString(source)) {
+ datastores.push(`${source}=${target}`);
+ } else {
+ datastores.push(target);
}
- delete values.store;
}
let defaultNs = values.defaultNs;
@@ -741,7 +745,7 @@ Ext.define('PBS.TapeManagement.SnapshotGrid', {
let originalData = me.store.getData().getSource() || me.store.getData();
if (snapshots.length === originalData.length) {
- return "all";
+ return [];
}
let wholeStores = [];
--
2.30.2
next prev parent reply other threads:[~2023-09-29 13:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-29 13:39 [pbs-devel] [PATCH proxmox-backup 1/2] ui: tape: restore: improve variable names Dominik Csapak
2023-09-29 13:39 ` Dominik Csapak [this message]
2023-09-29 15:30 ` [pbs-devel] [PATCH proxmox-backup 2/2] fix #4977: ui: tape: restore: rework snapshot selection logic Mira Limbeck
2023-10-02 6:47 ` Dominik Csapak
2023-10-02 9:14 ` Mira Limbeck
2023-11-09 7:43 ` [pbs-devel] [PATCH proxmox-backup 1/2] ui: tape: restore: improve variable names Dominik Csapak
2023-11-10 12:03 ` [pbs-devel] applied: " Thomas Lamprecht
2023-11-10 12:04 ` 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=20230929133924.2731714-2-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