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 1320DCA20; Tue, 12 Apr 2022 12:34:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0D357D40A; Tue, 12 Apr 2022 12:34:40 +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 01C51D2ED; Tue, 12 Apr 2022 12:34:35 +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 CA24A415EA; Tue, 12 Apr 2022 12:34:34 +0200 (CEST) From: Stefan Sterz To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com Date: Tue, 12 Apr 2022 12:34:22 +0200 Message-Id: <20220412103423.3845322-5-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220412103423.3845322-1-s.sterz@proxmox.com> References: <20220412103423.3845322-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.024 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [data.id] Subject: [pve-devel] [PATCH manager v5 4/5] ui: move NotesView panel and NotesEdit window to widget kit 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, 12 Apr 2022 10:34:40 -0000 this removes the NotesView panel and NotesEdit and replaces them with with the version from the widget kit. requires a bump of the widget toolkit. Signed-off-by: Stefan Sterz --- www/manager6/Makefile | 2 - www/manager6/dc/Config.js | 2 +- www/manager6/node/Config.js | 2 +- www/manager6/panel/GuestSummary.js | 2 +- www/manager6/panel/NotesView.js | 129 ----------------------------- www/manager6/window/NotesEdit.js | 38 --------- 6 files changed, 3 insertions(+), 172 deletions(-) delete mode 100644 www/manager6/panel/NotesView.js delete mode 100644 www/manager6/window/NotesEdit.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index d488c3a8..2c7b1e70 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -84,7 +84,6 @@ JSSRC= \ panel/BackupJobPrune.js \ panel/HealthWidget.js \ panel/IPSet.js \ - panel/NotesView.js \ panel/RunningChart.js \ panel/StatusPanel.js \ panel/GuestStatusView.js \ @@ -102,7 +101,6 @@ JSSRC= \ window/FirewallLograteEdit.js \ window/LoginWindow.js \ window/Migrate.js \ - window/NotesEdit.js \ window/Prune.js \ window/Restore.js \ window/SafeDestroyGuest.js \ diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js index 9c54b19d..13ded12e 100644 --- a/www/manager6/dc/Config.js +++ b/www/manager6/dc/Config.js @@ -28,7 +28,7 @@ Ext.define('PVE.dc.Config', { itemId: 'summary', }, { - xtype: 'pveNotesView', + xtype: 'pmxNotesView', title: gettext('Notes'), iconCls: 'fa fa-sticky-note-o', itemId: 'notes', diff --git a/www/manager6/node/Config.js b/www/manager6/node/Config.js index 68f80391..52357df8 100644 --- a/www/manager6/node/Config.js +++ b/www/manager6/node/Config.js @@ -129,7 +129,7 @@ Ext.define('PVE.node.Config', { itemId: 'summary', }, { - xtype: 'pveNotesView', + xtype: 'pmxNotesView', title: gettext('Notes'), iconCls: 'fa fa-sticky-note-o', itemId: 'notes', diff --git a/www/manager6/panel/GuestSummary.js b/www/manager6/panel/GuestSummary.js index 82cc7a7f..35721419 100644 --- a/www/manager6/panel/GuestSummary.js +++ b/www/manager6/panel/GuestSummary.js @@ -40,7 +40,7 @@ Ext.define('PVE.qemu.Summary', { rstore: rstore, }, { - xtype: 'pveNotesView', + xtype: 'pmxNotesView', flex: 1, padding: template ? '5' : '0 0 0 5', itemId: 'notesview', diff --git a/www/manager6/panel/NotesView.js b/www/manager6/panel/NotesView.js deleted file mode 100644 index 7c8299d0..00000000 --- a/www/manager6/panel/NotesView.js +++ /dev/null @@ -1,129 +0,0 @@ -Ext.define('PVE.panel.NotesView', { - extend: 'Ext.panel.Panel', - xtype: 'pveNotesView', - - title: gettext("Notes"), - bodyPadding: 10, - scrollable: true, - animCollapse: false, - maxLength: 64 * 1024, - - tbar: { - itemId: 'tbar', - hidden: true, - items: [ - { - text: gettext('Edit'), - handler: function() { - let view = this.up('panel'); - view.run_editor(); - }, - }, - ], - }, - - run_editor: function() { - let me = this; - Ext.create('PVE.window.NotesEdit', { - pveSelNode: me.pveSelNode, - url: me.url, - listeners: { - destroy: () => me.load(), - }, - autoShow: true, - }).setMaxLength(me.maxLength); - }, - - load: function() { - var me = this; - - Proxmox.Utils.API2Request({ - url: me.url, - waitMsgTarget: me, - failure: function(response, opts) { - me.update(gettext('Error') + " " + response.htmlStatus); - me.setCollapsed(false); - }, - success: function(response, opts) { - var data = response.result.data.description || ''; - - let mdHTML = Proxmox.Markdown.parse(data); - me.update(mdHTML); - - if (me.collapsible && me.collapseMode === 'auto') { - me.setCollapsed(data === ''); - } - }, - }); - }, - - listeners: { - render: function(c) { - var me = this; - me.getEl().on('dblclick', me.run_editor, me); - }, - afterlayout: function() { - let me = this; - if (me.collapsible && !me.getCollapsed() && me.collapseMode === 'always') { - me.setCollapsed(true); - me.collapseMode = ''; // only once, on initial load! - } - }, - }, - - tools: [{ - type: 'gear', - handler: function() { - let view = this.up('panel'); - view.run_editor(); - }, - }], - - initComponent: function() { - const me = this; - const type = me.pveSelNode.data.type; - - if (me.pveSelNode.data.id === 'root') { - me.url = '/api2/extjs/cluster/options'; - } else { - const nodename = me.pveSelNode.data.node; - if (!nodename) { - throw "no node name specified"; - } - - if (!Ext.Array.contains(['node', 'qemu', 'lxc'], type)) { - throw 'invalid type specified'; - } - - const vmid = me.pveSelNode.data.vmid; - if (!vmid && type !== 'node') { - throw "no VM ID specified"; - } - - me.url = `/api2/extjs/nodes/${nodename}/`; - - // add the type specific path if qemu/lxc and set the backend's maxLen - if (type === 'qemu' || type === 'lxc') { - me.url += `${type}/${vmid}/`; - me.maxLength = 8 * 1024; - } - me.url += 'config'; - } - - me.callParent(); - if (type === 'node' || type === '') { // '' is for datacenter - me.down('#tbar').setVisible(true); - } else if (me.pveSelNode.data.template !== 1) { - me.setCollapsible(true); - me.collapseDirection = 'right'; - - let sp = Ext.state.Manager.getProvider(); - me.collapseMode = sp.get('guest-notes-collapse', 'never'); - - if (me.collapseMode === 'auto') { - me.setCollapsed(true); - } - } - me.load(); - }, -}); diff --git a/www/manager6/window/NotesEdit.js b/www/manager6/window/NotesEdit.js deleted file mode 100644 index 4649843e..00000000 --- a/www/manager6/window/NotesEdit.js +++ /dev/null @@ -1,38 +0,0 @@ -Ext.define('PVE.window.NotesEdit', { - extend: 'Proxmox.window.Edit', - - title: gettext('Notes'), - onlineHelp: 'markdown_basics', - - width: 800, - height: '600px', - - resizable: true, - layout: 'fit', - - autoLoad: true, - defaultButton: undefined, - - setMaxLength: function(maxLength) { - let me = this; - - let area = me.down('textarea[name="description"]'); - area.maxLength = maxLength; - area.validate(); - - return me; - }, - - items: { - xtype: 'textarea', - name: 'description', - height: '100%', - value: '', - hideLabel: true, - emptyText: gettext('You can use Markdown for rich text formatting.'), - fieldStyle: { - 'white-space': 'pre-wrap', - 'font-family': 'monospace', - }, - }, -}); -- 2.30.2