From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 4/4] ui: SyncJobEdit: add second tab with group filters
Date: Mon, 22 Nov 2021 15:20:24 +0100 [thread overview]
Message-ID: <20211122142024.913238-5-d.csapak@proxmox.com> (raw)
In-Reply-To: <20211122142024.913238-1-d.csapak@proxmox.com>
adds a second tab and adapts the styling to our usual one (border/padding)
adds a change listener to the remote datastore selector to change the
remote + datastore on the group filters
remaining changes are mostly indentation changes
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/window/SyncJobEdit.js | 242 ++++++++++++++++++++++----------------
1 file changed, 139 insertions(+), 103 deletions(-)
diff --git a/www/window/SyncJobEdit.js b/www/window/SyncJobEdit.js
index 3437ef23..57c507cc 100644
--- a/www/window/SyncJobEdit.js
+++ b/www/window/SyncJobEdit.js
@@ -98,6 +98,8 @@ Ext.define('PBS.window.SyncJobEdit', {
subject: gettext('SyncJob'),
+ bodyPadding: 0,
+
fieldDefaults: { labelWidth: 120 },
defaultFocus: 'proxmoxtextfield[name=comment]',
@@ -118,117 +120,151 @@ Ext.define('PBS.window.SyncJobEdit', {
},
items: {
- xtype: 'inputpanel',
- onGetValues: function(values) {
- let me = this;
-
- if (!values.id && me.up('pbsSyncJobEdit').isCreate) {
- values.id = 's-' + Ext.data.identifier.Uuid.Global.generate().slice(0, 13);
- }
- if (!me.isCreate) {
- PBS.Utils.delete_if_default(values, 'rate-in');
- if (typeof values.delete === 'string') {
- values.delete = values.delete.split(',');
- }
- }
- return values;
- },
- column1: [
- {
- xtype: 'pmxDisplayEditField',
- fieldLabel: gettext('Local Datastore'),
- name: 'store',
- submitValue: true,
- cbind: {
- editable: '{editDatastore}',
- value: '{datastore}',
- },
- editConfig: {
- xtype: 'pbsDataStoreSelector',
- allowBlank: false,
- },
- },
- {
- fieldLabel: gettext('Local Owner'),
- xtype: 'pbsAuthidSelector',
- name: 'owner',
- cbind: {
- value: '{authid}',
- deleteEmpty: '{!isCreate}',
- },
- },
+ xtype: 'tabpanel',
+ bodyPadding: 10,
+ border: 0,
+ items: [
{
- fieldLabel: gettext('Remove vanished'),
- xtype: 'proxmoxcheckbox',
- name: 'remove-vanished',
- autoEl: {
- tag: 'div',
- 'data-qtip': gettext('Remove snapshots from local datastore if they vanished from source datastore?'),
+ title: 'Options',
+ xtype: 'inputpanel',
+ onGetValues: function(values) {
+ let me = this;
+
+ if (!values.id && me.up('pbsSyncJobEdit').isCreate) {
+ values.id = 's-' + Ext.data.identifier.Uuid.Global.generate().slice(0, 13);
+ }
+ if (!me.isCreate) {
+ PBS.Utils.delete_if_default(values, 'rate-in');
+ if (typeof values.delete === 'string') {
+ values.delete = values.delete.split(',');
+ }
+ }
+ return values;
},
- uncheckedValue: false,
- value: false,
- },
- ],
+ column1: [
+ {
+ xtype: 'pmxDisplayEditField',
+ fieldLabel: gettext('Local Datastore'),
+ name: 'store',
+ submitValue: true,
+ cbind: {
+ editable: '{editDatastore}',
+ value: '{datastore}',
+ },
+ editConfig: {
+ xtype: 'pbsDataStoreSelector',
+ allowBlank: false,
+ },
+ },
+ {
+ fieldLabel: gettext('Local Owner'),
+ xtype: 'pbsAuthidSelector',
+ name: 'owner',
+ cbind: {
+ value: '{authid}',
+ deleteEmpty: '{!isCreate}',
+ },
+ },
+ {
+ fieldLabel: gettext('Remove vanished'),
+ xtype: 'proxmoxcheckbox',
+ name: 'remove-vanished',
+ autoEl: {
+ tag: 'div',
+ 'data-qtip': gettext('Remove snapshots from local datastore if they vanished from source datastore?'),
+ },
+ uncheckedValue: false,
+ value: false,
+ },
+ ],
- column2: [
- {
- fieldLabel: gettext('Source Remote'),
- xtype: 'pbsRemoteSelector',
- allowBlank: false,
- name: 'remote',
- listeners: {
- change: function(f, value) {
- let me = this;
- let remoteStoreField = me.up('pbsSyncJobEdit').down('field[name=remote-store]');
- remoteStoreField.setRemote(value);
+ column2: [
+ {
+ fieldLabel: gettext('Source Remote'),
+ xtype: 'pbsRemoteSelector',
+ allowBlank: false,
+ name: 'remote',
+ listeners: {
+ change: function(f, value) {
+ let me = this;
+ let remoteStoreField = me.up('pbsSyncJobEdit').down('field[name=remote-store]');
+ remoteStoreField.setRemote(value);
+ },
+ },
},
- },
- },
- {
- fieldLabel: gettext('Source Datastore'),
- xtype: 'pbsRemoteStoreSelector',
- allowBlank: false,
- autoSelect: false,
- name: 'remote-store',
- disabled: true,
- },
- {
- fieldLabel: gettext('Sync Schedule'),
- xtype: 'pbsCalendarEvent',
- name: 'schedule',
- emptyText: gettext('none (disabled)'),
- cbind: {
- deleteEmpty: '{!isCreate}',
- value: '{scheduleValue}',
- },
- },
- {
- xtype: 'pmxBandwidthField',
- name: 'rate-in',
- fieldLabel: gettext('Rate Limit'),
- emptyText: gettext('Unlimited'),
- submitAutoScaledSizeUnit: true,
- // NOTE: handle deleteEmpty in onGetValues due to bandwidth field having a cbind too
- },
- ],
+ {
+ fieldLabel: gettext('Source Datastore'),
+ xtype: 'pbsRemoteStoreSelector',
+ allowBlank: false,
+ autoSelect: false,
+ name: 'remote-store',
+ disabled: true,
+ listeners: {
+ change: function(field, value) {
+ let me = this;
+ let remoteField = me.up('pbsSyncJobEdit').down('field[name=remote]');
+ let remote = remoteField.getValue();
+ me.up('tabpanel').down('pbsGroupFilter').setRemoteDatastore(remote, value);
+ },
+ },
+ },
+ {
+ fieldLabel: gettext('Sync Schedule'),
+ xtype: 'pbsCalendarEvent',
+ name: 'schedule',
+ emptyText: gettext('none (disabled)'),
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ value: '{scheduleValue}',
+ },
+ },
+ {
+ xtype: 'pmxBandwidthField',
+ name: 'rate-in',
+ fieldLabel: gettext('Rate Limit'),
+ emptyText: gettext('Unlimited'),
+ submitAutoScaledSizeUnit: true,
+ // NOTE: handle deleteEmpty in onGetValues due to bandwidth field having a cbind too
+ },
+ ],
- columnB: [
- {
- fieldLabel: gettext('Backup Groups'),
- xtype: 'displayfield',
- name: 'group-filter',
- renderer: v => v ? Ext.String.htmlEncode(v) : gettext('All'),
- cbind: {
- hidden: '{isCreate}',
- },
+ columnB: [
+ {
+ fieldLabel: gettext('Backup Groups'),
+ xtype: 'displayfield',
+ name: 'group-filter',
+ renderer: v => v ? Ext.String.htmlEncode(v) : gettext('All'),
+ cbind: {
+ hidden: '{isCreate}',
+ },
+ },
+ {
+ fieldLabel: gettext('Comment'),
+ xtype: 'proxmoxtextfield',
+ name: 'comment',
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ },
+ ],
},
{
- fieldLabel: gettext('Comment'),
- xtype: 'proxmoxtextfield',
- name: 'comment',
- cbind: {
- deleteEmpty: '{!isCreate}',
+ xtype: 'inputpanel',
+ onGetValues: function(values) {
+ PBS.Utils.delete_if_default(values, 'group-filter');
+ if (Ext.isArray(values['group-filter']) && values['group-filter'].length === 0) {
+ delete values['group-filter'];
+ values.delete = 'group-filter';
+ }
+ return values;
},
+ title: gettext('Group Filter'),
+ items: [
+ {
+ xtype: 'pbsGroupFilter',
+ name: 'group-filter',
+ },
+ ],
},
],
},
--
2.30.2
next prev parent reply other threads:[~2021-11-22 14:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 14:20 [pbs-devel] [PATCH proxmox-backup 0/4] ui for group-filters Dominik Csapak
2021-11-22 14:20 ` [pbs-devel] [PATCH proxmox-backup 1/4] ui: add GroupSelector Dominik Csapak
2021-11-22 14:20 ` [pbs-devel] [PATCH proxmox-backup 2/4] ui: add GroupFilter form field(container) Dominik Csapak
2021-11-22 14:20 ` [pbs-devel] [PATCH proxmox-backup 3/4] ui: tape/BackupJobEdit: add second tab with group filters Dominik Csapak
2021-11-22 14:20 ` Dominik Csapak [this message]
2021-11-24 9:04 ` [pbs-devel] [PATCH proxmox-backup 0/4] ui for group-filters Fabian Grünbichler
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=20211122142024.913238-5-d.csapak@proxmox.com \
--to=d.csapak@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