[pbs-devel] [PATCH proxmox-backup 1/2] ui: tape: restore: improve variable names

[pbs-devel] [PATCH proxmox-backup 1/2] ui: tape: restore: improve variable names

[Dominik Csapak]

some of the variable names did not really tell the full story, so extend
them a bit. This makes the intention much clearer.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/tape/window/TapeRestore.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/www/tape/window/TapeRestore.js b/www/tape/window/TapeRestore.js
index c1d3493c..3008f359 100644
--- a/www/tape/window/TapeRestore.js
+++ b/www/tape/window/TapeRestore.js
@@ -721,7 +721,7 @@ Ext.define('PBS.TapeManagement.SnapshotGrid', {
 	let me = this;
 	let snapshots = [];
 
-	let storeCounts = {};
+	let selectedStoreCounts = {};
 
 	me.getSelection().forEach((rec) => {
 	    let id = rec.get('id');
@@ -730,10 +730,10 @@ Ext.define('PBS.TapeManagement.SnapshotGrid', {
 	    // only add if not filtered
 	    if (me.store.findExact('id', id) !== -1) {
 		snapshots.push(`${store}:${snap}`);
-		if (storeCounts[store] === undefined) {
-		    storeCounts[store] = 0;
+		if (selectedStoreCounts[store] === undefined) {
+		    selectedStoreCounts[store] = 0;
 		}
-		storeCounts[store]++;
+		selectedStoreCounts[store]++;
 	    }
 	});
 
@@ -745,17 +745,17 @@ Ext.define('PBS.TapeManagement.SnapshotGrid', {
 	}
 
 	let wholeStores = [];
-	let wholeStoresSelected = true;
-	for (const [store, count] of Object.entries(storeCounts)) {
-	    if (me.storeCounts[store] === count) {
+	let onlyWholeStoresSelected = true;
+	for (const [store, selectedCount] of Object.entries(selectedStoreCounts)) {
+	    if (me.storeCounts[store] === selectedCount) {
 		wholeStores.push(store);
 	    } else {
-		wholeStoresSelected = false;
+		onlyWholeStoresSelected = false;
 		break;
 	    }
 	}
 
-	if (wholeStoresSelected) {
+	if (onlyWholeStoresSelected) {
 	    return wholeStores;
 	}
 
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 2/2] fix #4977: ui: tape: restore: rework snapshot selection logic

[Dominik Csapak]

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

Re: [pbs-devel] [PATCH proxmox-backup 2/2] fix #4977: ui: tape: restore: rework snapshot selection logic

[Mira Limbeck]

I've tested it here and ran into an issue.
When you select a target namespace for one datastore, and none for the
other, the snapshots that are mapped to the root namespace won't be
restored, with the following warning:


2023-09-29T17:25:23+02:00: WARN: could not find target namespace for
test:vm/100/2023-01-24T10:47:49Z

Re: [pbs-devel] [PATCH proxmox-backup 2/2] fix #4977: ui: tape: restore: rework snapshot selection logic

[Dominik Csapak]

On 9/29/23 17:30, Mira Limbeck wrote:
> I've tested it here and ran into an issue.
> When you select a target namespace for one datastore, and none for the
> other, the snapshots that are mapped to the root namespace won't be
> restored, with the following warning:
> 
> 
> 2023-09-29T17:25:23+02:00: WARN: could not find target namespace for
> test:vm/100/2023-01-24T10:47:49Z
> 

thanks for the review!

while that behaviour is unexpected (and i'll see to it that i fix it in the
gui) it's not really related to this fix and it behaved like that before too.

Re: [pbs-devel] [PATCH proxmox-backup 2/2] fix #4977: ui: tape: restore: rework snapshot selection logic

[Mira Limbeck]

On 10/2/23 08:47, Dominik Csapak wrote:
> On 9/29/23 17:30, Mira Limbeck wrote:
>> I've tested it here and ran into an issue.
>> When you select a target namespace for one datastore, and none for the
>> other, the snapshots that are mapped to the root namespace won't be
>> restored, with the following warning:
>>
>>
>> 2023-09-29T17:25:23+02:00: WARN: could not find target namespace for
>> test:vm/100/2023-01-24T10:47:49Z
>>
> 
> thanks for the review!
> 
> while that behaviour is unexpected (and i'll see to it that i fix it in the
> gui) it's not really related to this fix and it behaved like that before
> too.
> 

Since the original issue was fixed by the patch and I couldn't find any
issue other than the reported one for which you sent a fix already,
consider this patch:

Tested-by: Mira Limbeck <m.limbeck@proxmox.com>

Re: [pbs-devel] [PATCH proxmox-backup 1/2] ui: tape: restore: improve variable names

[Dominik Csapak]

ping for both patches. they still apply and the issue mira found is unrelated
(so these two patches still fixes #4977)

[pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: tape: restore: improve variable names

[Thomas Lamprecht]

Am 29/09/2023 um 15:39 schrieb Dominik Csapak:
> some of the variable names did not really tell the full story, so extend
> them a bit. This makes the intention much clearer.
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  www/tape/window/TapeRestore.js | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
>

applied series with Mira's T-b, thanks!

ps. using --- as delimiter for code, as you did in the second patch, breaks
`git am` a bit, as that command then thinks the boundary between commit
message and git diff-stat was already hit and truncates the commit message.
I swapped the triple-minus with triple-backticks.

Re: [pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: tape: restore: improve variable names

[Dominik Csapak]

On 11/10/23 13:03, Thomas Lamprecht wrote:
> Am 29/09/2023 um 15:39 schrieb Dominik Csapak:
>> some of the variable names did not really tell the full story, so extend
>> them a bit. This makes the intention much clearer.
>>
>> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
>> ---
>>   www/tape/window/TapeRestore.js | 18 +++++++++---------
>>   1 file changed, 9 insertions(+), 9 deletions(-)
>>
>>
> 
> applied series with Mira's T-b, thanks!
> 
> ps. using --- as delimiter for code, as you did in the second patch, breaks
> `git am` a bit, as that command then thinks the boundary between commit
> message and git diff-stat was already hit and truncates the commit message.
> I swapped the triple-minus with triple-backticks.

oops, sorry and good to know. thanks for the fixup!