[pbs-devel] [PATCH v2 proxmox-backup] ui: sync job: fix source group filters based on sync direction

* [pbs-devel] [PATCH v2 proxmox-backup] ui: sync job: fix source group filters based on sync direction
@ 2024-11-25 11:03 Christian Ebner
  2024-11-25 14:23 ` Dominik Csapak
  2024-11-25 14:50 ` [pbs-devel] applied: " Thomas Lamprecht
  0 siblings, 2 replies; 3+ messages in thread
From: Christian Ebner @ 2024-11-25 11:03 UTC (permalink / raw)
  To: pbs-devel

Fix switching the source for group filters based on the sync jobs
sync direction.

The helper to set the local namespace for the group filers was
introduced in commit 43a92c8c ("ui: group filter: allow to set
namespace for local datastore"), but never used because lost during
subsequent iterations of reworking the patch series.

The switching is corrected by:
- correctly initializing the local store and namespace for the group
  filer of sync jobs in push direction in the controller init, if a
  datastore is set.
- fixing an incorrect check for the sync direction in the remote
  datastore selector change listener.
- conditionally switching namespace to be set for the group filter in
  the remote and local namespace selector change listeners.
- conditionally switching datastore to be set for the group filter in
  the local datastore selector change listener.

Reported-by: Lukas Wagner <l.wagner@proxmox.com>
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
changes since version 1 (thanks @Dominik for catching the issues):
- only init group filters if there is a datastore given
- also switch group filters datastore when switching local datastore
- removed unneeded setLocalDatastore, as setLocalNamespace sets
  datastore and namespace
- fixed eslint issues
- updated commit message

 www/window/SyncJobEdit.js | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/www/window/SyncJobEdit.js b/www/window/SyncJobEdit.js
index 0e648e7b3..2870f74fa 100644
--- a/www/window/SyncJobEdit.js
+++ b/www/window/SyncJobEdit.js
@@ -69,6 +69,14 @@ Ext.define('PBS.window.SyncJobEdit', {
 	    let nsSelector = view.down('pbsNamespaceSelector[name=ns]');
 	    nsSelector.setDatastore(value);
 	},
+
+	init: function() {
+	    let view = this.getView();
+	    if (view.syncDirectionPush && view.datastore !== undefined) {
+		let localNs = view.down('pbsNamespaceSelector[name=ns]').getValue();
+		view.down('pbsGroupFilter').setLocalNamespace(view.datastore, localNs);
+	    }
+	},
     },
 
     setValues: function(values) {
@@ -121,6 +129,16 @@ Ext.define('PBS.window.SyncJobEdit', {
 			    xtype: 'pbsDataStoreSelector',
 			    allowBlank: false,
 			},
+			listeners: {
+			    change: function(field, localStore) {
+				let me = this;
+				let view = me.up('pbsSyncJobEdit');
+				if (view.syncDirectionPush) {
+				    let localNs = view.down('pbsNamespaceSelector[name=ns]').getValue();
+				    view.down('pbsGroupFilter').setLocalNamespace(localStore, localNs);
+				}
+			    },
+			},
 		    },
 		    {
 			xtype: 'pbsNamespaceSelector',
@@ -134,6 +152,11 @@ Ext.define('PBS.window.SyncJobEdit', {
 				let me = this;
 				let view = me.up('pbsSyncJobEdit');
 
+				if (view.syncDirectionPush) {
+				    let localStore = view.down('field[name=store]').getValue();
+				    view.down('pbsGroupFilter').setLocalNamespace(localStore, localNs);
+				}
+
 				let remoteNs = view.down('pbsRemoteNamespaceSelector[name=remote-ns]').getValue();
 				let maxDepthField = view.down('field[name=max-depth]');
 				maxDepthField.setLimit(localNs, remoteNs);
@@ -268,7 +291,8 @@ Ext.define('PBS.window.SyncJobEdit', {
 				remoteNamespaceField.setRemote(remote);
 				remoteNamespaceField.setRemoteStore(value);
 
-				if (!me.syncDirectionPush) {
+				let view = me.up('pbsSyncJobEdit');
+				if (!view.syncDirectionPush) {
 				    me.up('tabpanel').down('pbsGroupFilter').setRemoteDatastore(remote, value);
 				} else {
 				    let localStore = me.up('pbsSyncJobEdit').down('field[name=store]').getValue();
@@ -293,7 +317,10 @@ Ext.define('PBS.window.SyncJobEdit', {
 
 				let remote = view.down('field[name=remote]').getValue();
 				let remoteStore = view.down('field[name=remote-store]').getValue();
-				me.up('tabpanel').down('pbsGroupFilter').setRemoteNamespace(remote, remoteStore, remoteNs);
+
+				if (!view.syncDirectionPush) {
+				    me.up('tabpanel').down('pbsGroupFilter').setRemoteNamespace(remote, remoteStore, remoteNs);
+				}
 
 				let localNs = view.down('pbsNamespaceSelector[name=ns]').getValue();
 				let maxDepthField = view.down('field[name=max-depth]');
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel


^ permalink raw reply	[flat|nested] 3+ messages in thread