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 11CBE9829B for ; Fri, 6 Oct 2023 16:06:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CFC041B9E for ; Fri, 6 Oct 2023 16:05:36 +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, 6 Oct 2023 16:05:35 +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 4EBA742DE8 for ; Fri, 6 Oct 2023 16:05:35 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 6 Oct 2023 16:05:29 +0200 Message-Id: <20231006140529.723988-7-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231006140529.723988-1-h.laimer@proxmox.com> References: <20231006140529.723988-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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [values.id] Subject: [pbs-devel] [PATCH proxmox-backup v5 6/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, 06 Oct 2023 14:06:07 -0000 Signed-off-by: Hannes Laimer --- www/form/RemoteTargetSelector.js | 29 ++++++++----- www/window/SyncJobEdit.js | 72 +++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 11 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..d18f4a91 100644 --- a/www/window/SyncJobEdit.js +++ b/www/window/SyncJobEdit.js @@ -47,6 +47,15 @@ Ext.define('PBS.window.SyncJobEdit', { }, }, + setValues: function(values) { + let me = this; + if (values.id && !values.remote) { + values.location = 'local'; + } else { + values.location = 'remote'; + } + me.callParent([values]); + }, items: { xtype: 'tabpanel', @@ -134,16 +143,78 @@ Ext.define('PBS.window.SyncJobEdit', { ], column2: [ + { + xtype: 'radiogroup', + fieldLabel: gettext('Location'), + defaultType: 'radiofield', + items: [ + { + boxLabel: 'Local', + name: 'location', + inputValue: 'local', + submitValue: false, + }, + { + boxLabel: 'Remote', + name: 'location', + inputValue: 'remote', + submitValue: false, + }, + ], + listeners: { + change: function(_group, radio) { + let me = this; + let form = me.up('pbsSyncJobEdit'); + let remoteField = form.down('field[name=remote]'); + let storeField = form.down('field[name=remote-store]'); + let nsField = form.down('field[name=remote-ns]'); + + if (!storeField.value) { + nsField.clearValue(); + nsField.setDisabled(true); + } + + if (radio.location === 'local') { + remoteField.setDisabled(true); + remoteField.setValue(null); + remoteField.allowBlank = true; + if (remoteField.value) { + storeField.clearValue(); + } + storeField.setDisabled(false); + let rateLimitField = form.down('field[name=rate-in]'); + rateLimitField.setValue(null); + } else { + if (!remoteField.value) { + remoteField.setValue(null); + storeField.clearValue(); + storeField.setDisabled(true); + } + remoteField.setDisabled(false); + remoteField.allowBlank = false; + } + }, + }, + }, { fieldLabel: gettext('Source Remote'), xtype: 'pbsRemoteSelector', allowBlank: false, 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 +226,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