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 D1924630F4 for ; Mon, 24 Jan 2022 13:32:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8CA0621B74 for ; Mon, 24 Jan 2022 13:32:17 +0100 (CET) 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 5E8E321B02 for ; Mon, 24 Jan 2022 13:32:15 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 34D2A4614F for ; Mon, 24 Jan 2022 13:32:15 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Mon, 24 Jan 2022 13:31:57 +0100 Message-Id: <20220124123159.27086-7-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124123159.27086-1-h.laimer@proxmox.com> References: <20220124123159.27086-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.044 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [maintenanceactivetasks.read, activetasks.read] Subject: [pbs-devel] [PATCH proxmox-backup v5 6/8] ui: add option to change the maintenance type 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: Mon, 24 Jan 2022 12:32:47 -0000 Signed-off-by: Hannes Laimer --- www/Makefile | 1 + www/Utils.js | 23 ++++++++++ www/datastore/OptionView.js | 30 +++++++++++++ www/window/MaintenanceOptions.js | 72 ++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+) create mode 100644 www/window/MaintenanceOptions.js diff --git a/www/Makefile b/www/Makefile index 455fbeec..0952fb82 100644 --- a/www/Makefile +++ b/www/Makefile @@ -61,6 +61,7 @@ JSSRC= \ window/BackupGroupChangeOwner.js \ window/CreateDirectory.js \ window/DataStoreEdit.js \ + window/MaintenanceOptions.js \ window/NotesEdit.js \ window/RemoteEdit.js \ window/TrafficControlEdit.js \ diff --git a/www/Utils.js b/www/Utils.js index 36a94211..db23645a 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -640,4 +640,27 @@ Ext.define('PBS.Utils', { return `${icon} ${value}`; }, + renderMaintenance: function(type, activeTasks) { + if (!type) return gettext('None'); + let at = 0; + for (let x of ['read-only-', 'offline-']) { + if (type.startsWith(x)) { + at = x.length; + } + } + + const conflictingTasks = activeTasks.write + (type.startsWith('offline') ? activeTasks.read : 0); + const checkmarkIcon = ''; + const spinnerIcon = ''; + const conflictingTasksMessage = `${conflictingTasks} conflicting tasks still active`; + const extra = conflictingTasks > 0 ? `| ${spinnerIcon} ${conflictingTasksMessage}` : checkmarkIcon; + + const mode = type.substring(0, at-1); + let msg = type.substring(at); + if (msg.length > 0) { + msg = `"${msg}"`; + } + return Ext.String.capitalize(`${gettext(mode)} ${msg} ${extra}`) || gettext('None'); + }, + }); diff --git a/www/datastore/OptionView.js b/www/datastore/OptionView.js index 5a5e85be..50ccce47 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', @@ -6,6 +7,10 @@ Ext.define('PBS.Datastore.Options', { cbindData: function(initial) { let me = this; + me.maintenanceActiveTasks = { + read: 0, + write: 0, + }; me.datastore = encodeURIComponent(me.datastore); me.url = `/api2/json/config/datastore/${me.datastore}`; me.editorConfig = { @@ -18,6 +23,24 @@ Ext.define('PBS.Datastore.Options', { controller: { xclass: 'Ext.app.ViewController', + init: function(view) { + let me = this; + me.callParent(); + view.rows['maintenance-type'].renderer = + (value) => PBS.Utils.renderMaintenance(value, view.maintenanceActiveTasks); + + me.activeOperationsRstore = Ext.create('Proxmox.data.ObjectStore', { + url: `/api2/json/admin/datastore/${view.datastore}/active-operations`, + interval: 3000, + }); + me.activeOperationsRstore.startUpdate(); + + view.mon(me.activeOperationsRstore, 'load', (store, data, success) => { + me.view.maintenanceActiveTasks.read = data[0].data.value; + me.view.maintenanceActiveTasks.write = data[1].data.value; + }); + }, + edit: function() { this.getView().run_editor(); }, @@ -111,5 +134,12 @@ Ext.define('PBS.Datastore.Options', { }, }, }, + "maintenance-type": { + required: true, + header: gettext('Maintenance mode'), + editor: { + xtype: 'pbsMaintenanceOptionEdit', + }, + }, }, }); diff --git a/www/window/MaintenanceOptions.js b/www/window/MaintenanceOptions.js new file mode 100644 index 00000000..374b69f6 --- /dev/null +++ b/www/window/MaintenanceOptions.js @@ -0,0 +1,72 @@ +Ext.define('PBS.form.oaintenanceType', { + extend: 'Proxmox.form.KVComboBox', + alias: 'widget.pbsMaintenanceType', + + comboItems: [ + ['__default__', gettext('None')], + ['read-only', 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: { + onGetValues: function(values) { + console.log(values); + if (values['maintenance-type']) { + values['maintenance-type'] = + `${values['maintenance-type']}-${values['maintenance-msg'] || ''}`; + } + return values; + }, + xtype: 'inputpanel', + items: [ + { + xtype: 'pbsMaintenanceType', + name: 'maintenance-type', + fieldLabel: gettext('Maintenance Type'), + value: '__default__', + deleteEmpty: true, + }, + { + xtype: 'proxmoxtextfield', + name: 'maintenance-msg', + fieldLabel: gettext('Description'), + }, + ], + }, + setValues: function(values) { + let me = this; + + let options = { + 'maintenance-type': '__default__', + 'maintenance-msg': '', + }; + if (values['maintenance-type']) { + let type = values['maintenance-type']; + let at = 0; + for (let x of ['read-only-', 'offline-']) { + if (type.startsWith(x)) { + at = x.length; + } + } + options = { + 'maintenance-type': type.substr(0, at-1) || '__default__', + 'maintenance-msg': type.substr(at) || '', + }; + } + + me.callParent([options]); + }, +}); -- 2.30.2