From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id DAAE21FF173 for ; Mon, 25 Nov 2024 10:06:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 76761D2AD; Mon, 25 Nov 2024 10:06:51 +0100 (CET) Message-ID: <64fdcd0e-7608-4fe0-8c4d-4259a460c097@proxmox.com> Date: Mon, 25 Nov 2024 10:06:18 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox Backup Server development discussion , Christian Ebner References: <20241122165406.676851-1-c.ebner@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20241122165406.676851-1-c.ebner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox-backup] ui: sync job: fix source group filters based on sync direction X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" 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 > Signed-off-by: Christian Ebner > --- > 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