[pbs-devel] [PATCH proxmox-backup 5/5] ui: add maintenance to datastore options

Dominik Csapak d.csapak at proxmox.com
Fri Oct 1 10:36:30 CEST 2021


On 9/28/21 12:05, Hannes Laimer wrote:
> ---
>   www/Makefile                     |  1 +
>   www/datastore/OptionView.js      | 10 +++++
>   www/window/MaintenanceOptions.js | 63 ++++++++++++++++++++++++++++++++
>   3 files changed, 74 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/datastore/OptionView.js b/www/datastore/OptionView.js
> index 5a5e85be..1e0c3357 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,14 @@ Ext.define('PBS.Datastore.Options', {
>   		},
>   	    },
>   	},
> +	"maintenance-type": {
> +	    required: true,
> +	    header: gettext('Maintenance mode'),
> +	    defaultValue: 'Off',
the default should probably be empty, no? Off should be handled
by the renderer anyway

> +	    renderer: (value) => Ext.String.capitalize(value) || 'Off',

i would use that, but refactor the gettexts into e.g. Utils and
write a renderer that maps it. that way we show the localized
values here too

> +	    editor: {
> +		xtype: 'pbsMaintenanceOptionEdit',
> +	    },
> +	},
>       },
>   });
> diff --git a/www/window/MaintenanceOptions.js b/www/window/MaintenanceOptions.js
> new file mode 100644
> index 00000000..8ff5ccf9
> --- /dev/null
> +++ b/www/window/MaintenanceOptions.js
> @@ -0,0 +1,63 @@
> +Ext.define('PBS.form.MaintenanceType', {
> +    extend: 'Proxmox.form.KVComboBox',
> +    alias: 'widget.pbsMaintenanceType',
> +
> +    comboItems: [
> +	['__default__', gettext('Off')],

i think having 'Off' as no maintenance mode while also having 'Offline'
will be confusing to some users. instead i'd use something
like 'no maintenance' (at least as rendered value)

> +	['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',
> +	onGetValues: function(values) {
> +	    PBS.Utils.delete_if_default(values, 'maintenance-type', '');
> +	    PBS.Utils.delete_if_default(values, 'maintenance-msg', '');
> +	    if (values.delete) {
> +		values.delete = values.delete.split(',');
> +	    }

this is unnecessary, since the 'delete_if_default' should already make
this an array if necessary

it even blocked me from submitting the form, since 'split' is not
a function of an array...

> +
> +	    return values;
> +	},
> +	items: [
> +	    {
> +		xtype: 'pbsMaintenanceType',
> +		name: 'maintenance-type',
> +		fieldLabel: gettext('Maintenance Type'),
> +		value: '__default__',
> +		deleteEmpty: true,
> +	    },
> +	    {
> +		xtype: 'textfield',
> +		emptyText: 'none',

i'd leave that out, since we don't do it with comments either

> +		name: 'maintenance-msg',
> +		fieldLabel: gettext('Description'),
> +		value: '__default__',

that should be empty?
then you also don't need the 'delete_if_default' for the message
since you set deleteEmpty

also i think we should disable that field for the 'Off' variant
since it does not make sense to have a maintenance message
for no maintenance mode...

> +		deleteEmpty: true > +	    },
> +	],
> +    },
> +    setValues: function(values) {
> +	let me = this;
> +
> +	const options = {
> +	    'maintenance-type': values['maintenance-type'] || '__default__',
> +	    'maintenance-msg': values['maintenance-msg'],
> +	};
> +
> +	me.callParent([options]);
> +    },
> +});
> 





More information about the pbs-devel mailing list