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 4EE9861471; Tue, 18 Aug 2020 10:43:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 12A7C10EAA; Tue, 18 Aug 2020 10:43:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 2A4B010D48; Tue, 18 Aug 2020 10:43:18 +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 D542744666; Tue, 18 Aug 2020 10:43:17 +0200 (CEST) From: Hannes Laimer To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Tue, 18 Aug 2020 10:40:20 +0200 Message-Id: <20200818084023.54780-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200818084023.54780-1-h.laimer@proxmox.com> References: <20200818084023.54780-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [item.id, result.data] Subject: [pve-devel] [PATCH pve-manager 2/5] ui refactoring: SafeDestroy moved into widgettoolkit + adjusted usages X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2020 08:43:23 -0000 Signed-off-by: Hannes Laimer --- www/manager6/Makefile | 1 - www/manager6/ceph/Pool.js | 2 +- www/manager6/lxc/Config.js | 2 +- www/manager6/qemu/Config.js | 2 +- www/manager6/storage/ContentView.js | 2 +- www/manager6/window/SafeDestroy.js | 194 ---------------------------- 6 files changed, 4 insertions(+), 199 deletions(-) delete mode 100644 www/manager6/window/SafeDestroy.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 4288acdd..89a45d85 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -247,7 +247,6 @@ JSSRC= \ window/Migrate.js \ window/NotesEdit.js \ window/Restore.js \ - window/SafeDestroy.js \ window/Settings.js \ window/Snapshot.js \ window/StartupEdit.js \ diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js index 19eb01e9..4c3a29c8 100644 --- a/www/manager6/ceph/Pool.js +++ b/www/manager6/ceph/Pool.js @@ -229,7 +229,7 @@ Ext.define('PVE.node.CephPoolList', { var base_url = '/nodes/' + nodename + '/ceph/pools/' + rec.data.pool_name; - var win = Ext.create('PVE.window.SafeDestroy', { + var win = Ext.create('Proxmox.window.SafeRemove', { showProgress: true, url: base_url, params: { diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index c2222d3a..94c4bc11 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -149,7 +149,7 @@ Ext.define('PVE.lxc.Config', { disabled: !caps.vms['VM.Allocate'], itemId: 'removeBtn', handler: function() { - Ext.create('PVE.window.SafeDestroy', { + Ext.create('Proxmox.window.SafeRemove', { url: base_url, item: { type: 'CT', id: vmid } }).show(); diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index a13bf0c5..cf397f59 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -124,7 +124,7 @@ Ext.define('PVE.qemu.Config', { itemId: 'removeBtn', disabled: !caps.vms['VM.Allocate'], handler: function() { - Ext.create('PVE.window.SafeDestroy', { + Ext.create('Proxmox.window.SafeRemove', { url: base_url, item: { type: 'VM', id: vmid } }).show(); diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js index c70c732c..83c9ab1d 100644 --- a/www/manager6/storage/ContentView.js +++ b/www/manager6/storage/ContentView.js @@ -483,7 +483,7 @@ Ext.define('PVE.storage.ContentView', { return; } } - var win = Ext.create('PVE.window.SafeDestroy', { + var win = Ext.create('Proxmox.window.SafeRemove', { title: Ext.String.format(gettext("Destroy '{0}'"), rec.data.volid), showProgress: true, url: url, diff --git a/www/manager6/window/SafeDestroy.js b/www/manager6/window/SafeDestroy.js deleted file mode 100644 index cc32f6e0..00000000 --- a/www/manager6/window/SafeDestroy.js +++ /dev/null @@ -1,194 +0,0 @@ -/* Popup a message window - * where the user has to manually enter the resource ID - * to enable the destroy button - */ -Ext.define('PVE.window.SafeDestroy', { - extend: 'Ext.window.Window', - alias: 'widget.pveSafeDestroy', - - title: gettext('Confirm'), - modal: true, - buttonAlign: 'center', - bodyPadding: 10, - width: 450, - layout: { type:'hbox' }, - defaultFocus: 'confirmField', - showProgress: false, - - config: { - item: { - id: undefined, - type: undefined - }, - url: undefined, - params: {} - }, - - getParams: function() { - var me = this; - var purgeCheckbox = me.lookupReference('purgeCheckbox'); - if (purgeCheckbox.checked) { - me.params.purge = 1; - } - if (Ext.Object.isEmpty(me.params)) { - return ''; - } - return '?' + Ext.Object.toQueryString(me.params); - }, - - controller: { - - xclass: 'Ext.app.ViewController', - - control: { - 'field[name=confirm]': { - change: function(f, value) { - var view = this.getView(); - var removeButton = this.lookupReference('removeButton'); - if (value === view.getItem().id.toString()) { - removeButton.enable(); - } else { - removeButton.disable(); - } - }, - specialkey: function (field, event) { - var removeButton = this.lookupReference('removeButton'); - if (!removeButton.isDisabled() && event.getKey() == event.ENTER) { - removeButton.fireEvent('click', removeButton, event); - } - } - }, - 'button[reference=removeButton]': { - click: function() { - var view = this.getView(); - Proxmox.Utils.API2Request({ - url: view.getUrl() + view.getParams(), - method: 'DELETE', - waitMsgTarget: view, - failure: function(response, opts) { - view.close(); - Ext.Msg.alert('Error', response.htmlStatus); - }, - success: function(response, options) { - var hasProgressBar = view.showProgress && - response.result.data ? true : false; - - if (hasProgressBar) { - // stay around so we can trigger our close events - // when background action is completed - view.hide(); - - var upid = response.result.data; - var win = Ext.create('Proxmox.window.TaskProgress', { - upid: upid, - listeners: { - destroy: function () { - view.close(); - } - } - }); - win.show(); - } else { - view.close(); - } - } - }); - } - } - } - }, - - items: [ - { - xtype: 'component', - cls: [ Ext.baseCSSPrefix + 'message-box-icon', - Ext.baseCSSPrefix + 'message-box-warning', - Ext.baseCSSPrefix + 'dlg-icon'] - }, - { - xtype: 'container', - flex: 1, - layout: { - type: 'vbox', - align: 'stretch' - }, - items: [ - { - xtype: 'component', - reference: 'messageCmp' - }, - { - itemId: 'confirmField', - reference: 'confirmField', - xtype: 'textfield', - name: 'confirm', - labelWidth: 300, - hideTrigger: true, - allowBlank: false - }, - { - xtype: 'proxmoxcheckbox', - name: 'purge', - reference: 'purgeCheckbox', - boxLabel: gettext('Purge'), - checked: false, - autoEl: { - tag: 'div', - 'data-qtip': gettext('Remove from replication and backup jobs') - } - } - ] - } - ], - buttons: [ - { - reference: 'removeButton', - text: gettext('Remove'), - disabled: true - } - ], - - initComponent : function() { - var me = this; - - me.callParent(); - - var item = me.getItem(); - - if (!Ext.isDefined(item.id)) { - throw "no ID specified"; - } - - if (!Ext.isDefined(item.type)) { - throw "no VM type specified"; - } - - var messageCmp = me.lookupReference('messageCmp'); - var msg; - - if (item.type === 'VM') { - msg = Proxmox.Utils.format_task_description('qmdestroy', item.id); - } else if (item.type === 'CT') { - msg = Proxmox.Utils.format_task_description('vzdestroy', item.id); - } else if (item.type === 'CephPool') { - msg = Proxmox.Utils.format_task_description('cephdestroypool', item.id); - } else if (item.type === 'Image') { - msg = Proxmox.Utils.format_task_description('unknownimgdel', item.id); - } else { - throw "unknown item type specified"; - } - - messageCmp.setHtml(msg); - - if (!(item.type === 'VM' || item.type === 'CT')) { - let purgeCheckbox = me.lookupReference('purgeCheckbox'); - purgeCheckbox.setDisabled(true); - purgeCheckbox.setHidden(true); - } - - var confirmField = me.lookupReference('confirmField'); - msg = gettext('Please enter the ID to confirm') + - ' (' + item.id + ')'; - confirmField.setFieldLabel(msg); - } -}); -- 2.20.1