public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: Proxmox Backup Server development discussion
	<pbs-devel@lists.proxmox.com>,
	Christian Ebner <c.ebner@proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup] ui: sync job: fix source group filters based on sync direction
Date: Mon, 25 Nov 2024 10:06:18 +0100	[thread overview]
Message-ID: <64fdcd0e-7608-4fe0-8c4d-4259a460c097@proxmox.com> (raw)
In-Reply-To: <20241122165406.676851-1-c.ebner@proxmox.com>

two issues here:

if i use the add button on the top level 'Datastore' sync pane, there is no initial datastore 
selected, but the groups get loaded with '/api2/json/admin/datastore//groups' which returns
the index for a datastore. This populates the group dropdown with records that don't contain
the relevant infos, and will displayed as empty lines.

imho we should only trigger the initial load only when the datastore is set

also even if i select a datastore here, the groups won't get reloaded,
only if i change the local namespace or the remote (!) namespace.

the second issue is inline:

On 11/22/24 17:54, Christian Ebner wrote:
> 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.
> - 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.
> 
> Reported-by: Lukas Wagner <l.wagner@proxmox.com>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
>   www/window/SyncJobEdit.js | 23 +++++++++++++++++++++--
>   1 file changed, 21 insertions(+), 2 deletions(-)
> 
> diff --git a/www/window/SyncJobEdit.js b/www/window/SyncJobEdit.js
> index 0e648e7b3..4f46eacc4 100644
> --- a/www/window/SyncJobEdit.js
> +++ b/www/window/SyncJobEdit.js
> @@ -69,6 +69,16 @@ Ext.define('PBS.window.SyncJobEdit', {
>   	    let nsSelector = view.down('pbsNamespaceSelector[name=ns]');
>   	    nsSelector.setDatastore(value);
>   	},
> +
> +	init: function() {
> +	    let view = this.getView();
> +	    if (view.syncDirectionPush) {
> +		let localNs = view.down('pbsNamespaceSelector[name=ns]').getValue();
> +		let localStore = view.down('field[name=store]').getValue();
> +		view.down('pbsGroupFilter').setLocalDatastore(localStore);
> +		view.down('pbsGroupFilter').setLocalNamespace(localStore, localNs);
> +	    }
> +	}

eslint complains about a missing trailing comma here ;)

>       },
>   
>       setValues: function(values) {
> @@ -134,6 +144,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 +283,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 +309,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]');



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


  reply	other threads:[~2024-11-25  9:06 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-22 16:54 Christian Ebner
2024-11-25  9:06 ` Dominik Csapak [this message]
2024-11-25  9:17   ` Christian Ebner
2024-11-25  9:23     ` Christian Ebner

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=64fdcd0e-7608-4fe0-8c4d-4259a460c097@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=c.ebner@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal