From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A51EAF574 for ; Fri, 29 Sep 2023 14:49:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8D96D88F for ; Fri, 29 Sep 2023 14:49:15 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 29 Sep 2023 14:49:14 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6C98C48D1C for ; Fri, 29 Sep 2023 14:49:14 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 29 Sep 2023 14:48:57 +0200 Message-Id: <20230929124901.179405-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230929124901.179405-1-h.laimer@proxmox.com> References: <20230929124901.179405-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.012 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: [pbs-devel] [PATCH proxmox-backup v4 2/6] ui: add support for optional Remote in SyncJob 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: , X-List-Received-Date: Fri, 29 Sep 2023 12:49:15 -0000 Signed-off-by: Hannes Laimer --- www/form/RemoteTargetSelector.js | 29 +++++++++++++++++++---------- www/window/SyncJobEdit.js | 15 ++++++++++++--- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/www/form/RemoteTargetSelector.js b/www/form/RemoteTargetSelector.js index 2a94c4d7..e7b822d7 100644 --- a/www/form/RemoteTargetSelector.js +++ b/www/form/RemoteTargetSelector.js @@ -44,20 +44,18 @@ Ext.define('PBS.form.RemoteStoreSelector', { me.store.removeAll(); + me.setDisabled(false); + if (!me.firstLoad) { + me.clearValue(); + } if (me.remote) { - me.setDisabled(false); - if (!me.firstLoad) { - me.clearValue(); - } - me.store.proxy.url = `/api2/json/config/remote/${encodeURIComponent(me.remote)}/scan`; - me.store.load(); - - me.firstLoad = false; } else { - me.setDisabled(true); - me.clearValue(); + me.store.proxy.url = '/api2/json/admin/datastore'; } + me.store.load(); + + me.firstLoad = false; }, initComponent: function() { @@ -175,6 +173,17 @@ Ext.define('PBS.form.RemoteNamespaceSelector', { me.store.proxy.url = `/api2/json/config/remote/${encodedRemote}/scan/${encodedStore}/namespaces`; me.store.load(); + me.firstLoad = false; + } else if (me.remoteStore) { + me.setDisabled(false); + if (!me.firstLoad) { + me.clearValue(); + } + let encodedStore = encodeURIComponent(me.remoteStore); + + me.store.proxy.url = `/api2/json/admin/datastore/${encodedStore}/namespace`; + me.store.load(); + me.firstLoad = false; } else if (previousStore) { me.setDisabled(true); diff --git a/www/window/SyncJobEdit.js b/www/window/SyncJobEdit.js index 48a0c7a9..1d3b021f 100644 --- a/www/window/SyncJobEdit.js +++ b/www/window/SyncJobEdit.js @@ -135,15 +135,25 @@ Ext.define('PBS.window.SyncJobEdit', { column2: [ { - fieldLabel: gettext('Source Remote'), + fieldLabel: gettext('Source PBS'), xtype: 'pbsRemoteSelector', - allowBlank: false, + allowBlank: true, + emptyText: gettext('Local'), name: 'remote', + cbind: { + deleteEmpty: '{!isCreate}', + }, + skipEmptyText: true, listeners: { change: function(f, value) { let me = this; let remoteStoreField = me.up('pbsSyncJobEdit').down('field[name=remote-store]'); remoteStoreField.setRemote(value); + let rateLimitField = me.up('pbsSyncJobEdit').down('field[name=rate-in]'); + rateLimitField.setDisabled(!value); + if (!value) { + rateLimitField.setValue(null); + } let remoteNamespaceField = me.up('pbsSyncJobEdit').down('field[name=remote-ns]'); remoteNamespaceField.setRemote(value); }, @@ -155,7 +165,6 @@ Ext.define('PBS.window.SyncJobEdit', { allowBlank: false, autoSelect: false, name: 'remote-store', - disabled: true, listeners: { change: function(field, value) { let me = this; -- 2.39.2