public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: Proxmox Backup Server development discussion
	<pbs-devel@lists.proxmox.com>,
	Hannes Laimer <h.laimer@proxmox.com>
Subject: Re: [pbs-devel] [PATCH v2 proxmox-backup 4/4] ui: add maintenance to datastore options
Date: Tue, 12 Oct 2021 10:51:53 +0200	[thread overview]
Message-ID: <4a372988-c86d-8cae-10e9-bb6af9050549@proxmox.com> (raw)
In-Reply-To: <20211006151457.18508-5-h.laimer@proxmox.com>

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]);
> +    },
> +});
> 





  reply	other threads:[~2021-10-12  8:52 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-06 15:14 [pbs-devel] [PATCH v2 proxmox-backup 0/4] close #3071: maintenance mode for datastores Hannes Laimer
2021-10-06 15:14 ` [pbs-devel] [PATCH v2 proxmox-backup 1/4] pbs-api-types: add maintenance-type and msg to ds config Hannes Laimer
2021-10-12  8:51   ` Dominik Csapak
2021-10-06 15:14 ` [pbs-devel] [PATCH v2 proxmox-backup 2/4] pbs-datastore: add check for maintenance to lookup_datastore Hannes Laimer
2021-10-12  8:51   ` Dominik Csapak
2021-10-06 15:14 ` [pbs-devel] [PATCH v2 proxmox-backup 3/4] api2: make maintenance type and msg updatable/deletable Hannes Laimer
2021-10-12  8:51   ` Dominik Csapak
2021-10-06 15:14 ` [pbs-devel] [PATCH v2 proxmox-backup 4/4] ui: add maintenance to datastore options Hannes Laimer
2021-10-12  8:51   ` Dominik Csapak [this message]
2021-10-06 15:23 Hannes Laimer

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=4a372988-c86d-8cae-10e9-bb6af9050549@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal