From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v6 6/6] ui: add support for optional Remote in SyncJob
Date: Tue, 21 Nov 2023 15:31:55 +0100 [thread overview]
Message-ID: <20231121143155.370916-7-h.laimer@proxmox.com> (raw)
In-Reply-To: <20231121143155.370916-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
www/Utils.js | 5 +++
www/config/SyncView.js | 1 +
www/form/RemoteTargetSelector.js | 36 +++++++++++-----
www/window/SyncJobEdit.js | 73 +++++++++++++++++++++++++++++++-
4 files changed, 104 insertions(+), 11 deletions(-)
diff --git a/www/Utils.js b/www/Utils.js
index 2eca600e..d7f11cb6 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -711,6 +711,11 @@ Ext.define('PBS.Utils', {
return Ext.String.htmlEncode(value);
},
+ render_optional_remote: function(value, metadata, record) {
+ if (!value) return `- (${gettext('Local')})`;
+ return Ext.String.htmlEncode(value);
+ },
+
tuningOptions: {
'chunk-order': {
'__default__': Proxmox.Utils.defaultText + ` (${gettext('Inode')})`,
diff --git a/www/config/SyncView.js b/www/config/SyncView.js
index bf9072cb..c6458a9e 100644
--- a/www/config/SyncView.js
+++ b/www/config/SyncView.js
@@ -208,6 +208,7 @@ Ext.define('PBS.config.SyncJobView', {
dataIndex: 'remote',
width: 120,
sortable: true,
+ renderer: PBS.Utils.render_optional_remote,
},
{
header: gettext('Remote Store'),
diff --git a/www/form/RemoteTargetSelector.js b/www/form/RemoteTargetSelector.js
index 2a94c4d7..9ea802d1 100644
--- a/www/form/RemoteTargetSelector.js
+++ b/www/form/RemoteTargetSelector.js
@@ -44,20 +44,25 @@ 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;
+ me.store.removeFilter('storeFilter');
} else {
- me.setDisabled(true);
- me.clearValue();
+ me.store.proxy.url = '/api2/json/admin/datastore';
+ me.store.addFilter({
+ filterFn: function(item) {
+ return item.get('store') !== me.datastore;
+ },
+ id: 'storeFilter',
+ });
}
+ me.store.load();
+
+ me.firstLoad = false;
},
initComponent: function() {
@@ -175,6 +180,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..282f16a3 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,76 @@ 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,
+ checked: true,
+ },
+ ],
+ listeners: {
+ change: function(_group, radio) {
+ let me = this;
+ let form = me.up('pbsSyncJobEdit');
+ let nsField = form.down('field[name=remote-ns]');
+ let rateLimitField = form.down('field[name=rate-in]');
+ let remoteField = form.down('field[name=remote]');
+ let storeField = form.down('field[name=remote-store]');
+
+ if (!storeField.value) {
+ nsField.clearValue();
+ nsField.setDisabled(true);
+ }
+
+ let isLocalSync = radio.location === 'local';
+ remoteField.allowBlank = isLocalSync;
+ remoteField.setDisabled(isLocalSync);
+ storeField.setDisabled(!isLocalSync && !remoteField.value);
+ if (isLocalSync === !!remoteField.value) {
+ storeField.clearValue();
+ remoteField.clearValue();
+ }
+
+ if (isLocalSync) {
+ storeField.setDisabled(false);
+ rateLimitField.setValue(null);
+ } else {
+ remoteField.validate();
+ }
+ },
+ },
+ },
{
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 +224,9 @@ Ext.define('PBS.window.SyncJobEdit', {
allowBlank: false,
autoSelect: false,
name: 'remote-store',
- disabled: true,
+ cbind: {
+ datastore: '{datastore}',
+ },
listeners: {
change: function(field, value) {
let me = this;
--
2.39.2
next prev parent reply other threads:[~2023-11-21 14:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 14:31 [pbs-devel] [PATCH proxmox-backup v6 0/6] local sync-jobs Hannes Laimer
2023-11-21 14:31 ` [pbs-devel] [PATCH proxmox-backup v6 1/6] accept a ref to a HttpClient Hannes Laimer
2023-11-21 14:31 ` [pbs-devel] [PATCH proxmox-backup v6 2/6] pull: refactor pulling from a datastore Hannes Laimer
2023-11-21 14:31 ` [pbs-devel] [PATCH proxmox-backup v6 3/6] pull: add support for pulling from local datastore Hannes Laimer
2023-11-21 14:31 ` [pbs-devel] [PATCH proxmox-backup v6 4/6] manager: add completion for opt. Remote in SyncJob Hannes Laimer
2023-11-21 14:31 ` [pbs-devel] [PATCH proxmox-backup v6 5/6] api: make Remote for SyncJob optional Hannes Laimer
2023-11-21 14:31 ` Hannes Laimer [this message]
2023-11-24 10:36 ` [pbs-devel] [PATCH proxmox-backup v6 6/6] ui: add support for optional Remote in SyncJob Lukas Wagner
2023-11-25 16:16 ` Thomas Lamprecht
2023-11-22 10:14 ` [pbs-devel] [PATCH proxmox-backup v6 0/6] local sync-jobs Gabriel Goller
2023-11-24 10:38 ` Lukas Wagner
2023-11-25 16:14 ` [pbs-devel] applied: " Thomas Lamprecht
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=20231121143155.370916-7-h.laimer@proxmox.com \
--to=h.laimer@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.