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 F1B6274F7D for ; Tue, 12 Oct 2021 10:52:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E91BD297B9 for ; Tue, 12 Oct 2021 10:51:54 +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 id 0C770297AB for ; Tue, 12 Oct 2021 10:51:54 +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 DB7DB45D29; Tue, 12 Oct 2021 10:51:53 +0200 (CEST) Message-ID: <4a372988-c86d-8cae-10e9-bb6af9050549@proxmox.com> Date: Tue, 12 Oct 2021 10:51:53 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:94.0) Gecko/20100101 Thunderbird/94.0 Content-Language: en-US To: Proxmox Backup Server development discussion , Hannes Laimer References: <20211006151457.18508-1-h.laimer@proxmox.com> <20211006151457.18508-5-h.laimer@proxmox.com> From: Dominik Csapak In-Reply-To: <20211006151457.18508-5-h.laimer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.297 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) 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 v2 proxmox-backup 4/4] ui: add maintenance to datastore options 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: Tue, 12 Oct 2021 08:52:25 -0000 comment inline: On 10/6/21 17:14, Hannes Laimer wrote: > --- > www/Makefile | 1 + > www/Utils.js | 7 +++++ > www/datastore/OptionView.js | 9 ++++++ > www/window/MaintenanceOptions.js | 51 ++++++++++++++++++++++++++++++++ > 4 files changed, 68 insertions(+) > create mode 100644 www/window/MaintenanceOptions.js > > diff --git a/www/Makefile b/www/Makefile > index 4aec6e2c..8f6b17ed 100644 > --- a/www/Makefile > +++ b/www/Makefile > @@ -63,6 +63,7 @@ JSSRC= \ > window/BackupGroupChangeOwner.js \ > window/CreateDirectory.js \ > window/DataStoreEdit.js \ > + window/MaintenanceOptions.js \ > window/NotesEdit.js \ > window/RemoteEdit.js \ > window/NotifyOptions.js \ > diff --git a/www/Utils.js b/www/Utils.js > index 36a94211..a1198c57 100644 > --- a/www/Utils.js > +++ b/www/Utils.js > @@ -640,4 +640,11 @@ Ext.define('PBS.Utils', { > return `${icon} ${value}`; > }, > > + renderMaintenance: function(type) { > + if (type === 'readonly') { > + type = 'read only'; > + } > + return Ext.String.capitalize(gettext(type)) || gettext('None'); > + }, > + > }); > diff --git a/www/datastore/OptionView.js b/www/datastore/OptionView.js > index 5a5e85be..a4e72e76 100644 > --- a/www/datastore/OptionView.js > +++ b/www/datastore/OptionView.js > @@ -1,3 +1,4 @@ > + > Ext.define('PBS.Datastore.Options', { > extend: 'Proxmox.grid.ObjectGrid', > xtype: 'pbsDatastoreOptionView', > @@ -111,5 +112,13 @@ Ext.define('PBS.Datastore.Options', { > }, > }, > }, > + "maintenance-type": { > + required: true, > + header: gettext('Maintenance mode'), > + renderer: Proxmox.Utils.renderMaintenance, > + editor: { > + xtype: 'pbsMaintenanceOptionEdit', > + }, > + }, > }, > }); > diff --git a/www/window/MaintenanceOptions.js b/www/window/MaintenanceOptions.js > new file mode 100644 > index 00000000..85fd3fc9 > --- /dev/null > +++ b/www/window/MaintenanceOptions.js > @@ -0,0 +1,51 @@ > +Ext.define('PBS.form.MaintenanceType', { > + extend: 'Proxmox.form.KVComboBox', > + alias: 'widget.pbsMaintenanceType', > + > + comboItems: [ > + ['__default__', gettext('None')], > + ['readonly', gettext('Read only')], > + ['offline', gettext('Offline')], > + ], > +}); > + > +Ext.define('PBS.window.MaintenanceOptions', { > + extend: 'Proxmox.window.Edit', > + xtype: 'pbsMaintenanceOptionEdit', > + mixins: ['Proxmox.Mixin.CBind'], > + > + subject: gettext('Maintenance mode'), > + > + width: 450, > + fieldDefaults: { > + labelWidth: 120, > + }, > + > + items: { > + xtype: 'inputpanel', > + items: [ > + { > + xtype: 'pbsMaintenanceType', > + name: 'maintenance-type', > + fieldLabel: gettext('Maintenance Type'), > + value: '__default__', > + deleteEmpty: true, > + }, > + { > + xtype: 'proxmoxtextfield', > + name: 'maintenance-msg', > + fieldLabel: gettext('Description'), > + deleteEmpty: true, > + }, i am still convinced that we should disable that field if the maintenance type is 'None'. It does not make sense to let the user set a maintenance message when he disables maintenance mode... (it will never be seen aside from this config?) if there is a strong reason why this is important, it warrants a comment in the git patch change log at least > + ], > + }, > + setValues: function(values) { > + let me = this; > + > + const options = { > + 'maintenance-type': values['maintenance-type'] || '__default__', > + 'maintenance-msg': values['maintenance-msg'], > + }; > + me.callParent([options]); > + }, > +}); >