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 620D67645A for ; Fri, 23 Apr 2021 10:28:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4D8C82511A for ; Fri, 23 Apr 2021 10:27:51 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E9A10250FA for ; Fri, 23 Apr 2021 10:27:49 +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 BF83A42832 for ; Fri, 23 Apr 2021 10:27:49 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 23 Apr 2021 10:27:48 +0200 Message-Id: <20210423082748.18119-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 Adjusted score from AWL reputation of From: address 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 Subject: [pve-devel] [PATCH manager] ui: use pmxInfoWidget instead of pveInfoWidget 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: Fri, 23 Apr 2021 08:28:21 -0000 to prevent that they further diverge than they alread have (pmxInfoWidget got an additional function that is compatible) Signed-off-by: Dominik Csapak --- www/manager6/Makefile | 1 - www/manager6/node/StatusView.js | 2 +- www/manager6/panel/GuestStatusView.js | 4 +- www/manager6/panel/InfoWidget.js | 96 ------------------------ www/manager6/panel/TemplateStatusView.js | 2 +- www/manager6/storage/StatusView.js | 2 +- 6 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 www/manager6/panel/InfoWidget.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index cd930cfd..eedf5aad 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -77,7 +77,6 @@ JSSRC= \ panel/ConfigPanel.js \ panel/HealthWidget.js \ panel/IPSet.js \ - panel/InfoWidget.js \ panel/NotesView.js \ panel/RunningChart.js \ panel/StatusPanel.js \ diff --git a/www/manager6/node/StatusView.js b/www/manager6/node/StatusView.js index afbc57e8..564658c4 100644 --- a/www/manager6/node/StatusView.js +++ b/www/manager6/node/StatusView.js @@ -16,7 +16,7 @@ Ext.define('PVE.node.StatusView', { }, defaults: { - xtype: 'pveInfoWidget', + xtype: 'pmxInfoWidget', padding: '0 15 5 15', }, diff --git a/www/manager6/panel/GuestStatusView.js b/www/manager6/panel/GuestStatusView.js index 8d16827e..5929d9bf 100644 --- a/www/manager6/panel/GuestStatusView.js +++ b/www/manager6/panel/GuestStatusView.js @@ -19,7 +19,7 @@ Ext.define('PVE.panel.GuestStatusView', { }, defaults: { - xtype: 'pveInfoWidget', + xtype: 'pmxInfoWidget', padding: '2 25', }, items: [ @@ -52,7 +52,6 @@ Ext.define('PVE.panel.GuestStatusView', { renderer: PVE.Utils.format_ha, }, { - xtype: 'pveInfoWidget', itemId: 'node', iconCls: 'fa fa-building fa-fw', title: gettext('Node'), @@ -85,7 +84,6 @@ Ext.define('PVE.panel.GuestStatusView', { }, { itemId: 'swap', - xtype: 'pveInfoWidget', iconCls: 'fa fa-refresh fa-fw', title: gettext('SWAP usage'), valueField: 'swap', diff --git a/www/manager6/panel/InfoWidget.js b/www/manager6/panel/InfoWidget.js deleted file mode 100644 index f3b07038..00000000 --- a/www/manager6/panel/InfoWidget.js +++ /dev/null @@ -1,96 +0,0 @@ -Ext.define('PVE.widget.Info', { - extend: 'Ext.container.Container', - alias: 'widget.pveInfoWidget', - - layout: { - type: 'vbox', - align: 'stretch', - }, - - value: 0, - maximum: 1, - printBar: true, - items: [ - { - xtype: 'component', - itemId: 'label', - data: { - title: '', - usage: '', - iconCls: undefined, - }, - tpl: [ - '
', - '', - ' ', - '', - '{title}
 
{usage}
', - ], - }, - { - height: 2, - border: 0, - }, - { - xtype: 'progressbar', - itemId: 'progress', - height: 5, - value: 0, - animate: true, - }, - ], - - warningThreshold: 0.6, - criticalThreshold: 0.9, - - setPrintBar: function(enable) { - var me = this; - me.printBar = enable; - me.getComponent('progress').setVisible(enable); - }, - - setIconCls: function(iconCls) { - var me = this; - me.getComponent('label').data.iconCls = iconCls; - }, - - updateValue: function(text, usage) { - var me = this; - var label = me.getComponent('label'); - label.update(Ext.apply(label.data, { title: me.title, usage: text })); - - if (usage !== undefined && - me.printBar && - Ext.isNumeric(usage) && - usage >= 0) { - var progressBar = me.getComponent('progress'); - progressBar.updateProgress(usage, ''); - if (usage > me.criticalThreshold) { - progressBar.removeCls('warning'); - progressBar.addCls('critical'); - } else if (usage > me.warningThreshold) { - progressBar.removeCls('critical'); - progressBar.addCls('warning'); - } else { - progressBar.removeCls('warning'); - progressBar.removeCls('critical'); - } - } - }, - - initComponent: function() { - var me = this; - - if (!me.title) { - throw "no title defined"; - } - - me.callParent(); - - me.getComponent('progress').setVisible(me.printBar); - - me.updateValue(me.text, me.value); - me.setIconCls(me.iconCls); - }, - -}); diff --git a/www/manager6/panel/TemplateStatusView.js b/www/manager6/panel/TemplateStatusView.js index 44d983b3..4e17a41c 100644 --- a/www/manager6/panel/TemplateStatusView.js +++ b/www/manager6/panel/TemplateStatusView.js @@ -8,7 +8,7 @@ Ext.define('PVE.panel.TemplateStatusView', { }, defaults: { - xtype: 'pveInfoWidget', + xtype: 'pmxInfoWidget', printBar: false, padding: '2 25', }, diff --git a/www/manager6/storage/StatusView.js b/www/manager6/storage/StatusView.js index 923d73f2..f3450218 100644 --- a/www/manager6/storage/StatusView.js +++ b/www/manager6/storage/StatusView.js @@ -11,7 +11,7 @@ Ext.define('PVE.storage.StatusView', { }, defaults: { - xtype: 'pveInfoWidget', + xtype: 'pmxInfoWidget', padding: '0 30 5 30', }, items: [ -- 2.20.1