ui: panel/StatusView: use from widget-toolkit instead

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index e3b8d78ebbc075ddb50c06279de08c7548c6e99a..cd930cfda5622359b000cc4cba7a579af0e2351a 100644 (file)
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -81,7 +81,6 @@ JSSRC=                                                        \
        panel/NotesView.js                              \
        panel/RunningChart.js                           \
        panel/StatusPanel.js                            \
-       panel/StatusView.js                             \
        panel/GuestStatusView.js                        \
        panel/GuestSummary.js                           \
        panel/TemplateStatusView.js                     \

diff --git a/www/manager6/node/StatusView.js b/www/manager6/node/StatusView.js
index 573fbfae67b9025168bdeb56135d920bc2588355..afbc57e870bd0c8d25c7b9b5002c48731fc0cba4 100644 (file)
--- a/www/manager6/node/StatusView.js
+++ b/www/manager6/node/StatusView.js
@@ -1,5 +1,5 @@
 Ext.define('PVE.node.StatusView', {
-    extend: 'PVE.panel.StatusView',
+    extend: 'Proxmox.panel.StatusView',
     alias: 'widget.pveNodeStatus',
 
     height: 300,

diff --git a/www/manager6/panel/GuestStatusView.js b/www/manager6/panel/GuestStatusView.js
index d8439e5dc2bd71f9e0c26f331ed5e3d057310f1f..8d16827e68dc3fbb3e49342022bd9eb5d06f8e15 100644 (file)
--- a/www/manager6/panel/GuestStatusView.js
+++ b/www/manager6/panel/GuestStatusView.js
@@ -1,5 +1,5 @@
 Ext.define('PVE.panel.GuestStatusView', {
-    extend: 'PVE.panel.StatusView',
+    extend: 'Proxmox.panel.StatusView',
     alias: 'widget.pveGuestStatusView',
     mixins: ['Proxmox.Mixin.CBind'],
 

diff --git a/www/manager6/panel/StatusView.js b/www/manager6/panel/StatusView.js
deleted file mode 100644 (file)
index a8f01ce..0000000
--- a/www/manager6/panel/StatusView.js
+++ /dev/null
@@ -1,126 +0,0 @@
-Ext.define('PVE.panel.StatusView', {
-    extend: 'Ext.panel.Panel',
-    alias: 'widget.pveStatusView',
-
-    layout: {
-       type: 'column',
-    },
-
-    title: gettext('Status'),
-
-    getRecordValue: function(key, store) {
-       if (!key) {
-           throw "no key given";
-       }
-       var me = this;
-
-       if (store === undefined) {
-           store = me.getStore();
-       }
-
-       var rec = store.getById(key);
-       if (rec) {
-           return rec.data.value;
-       }
-
-       return '';
-    },
-
-    fieldRenderer: function(val, max) {
-       if (max === undefined) {
-           return val;
-       }
-
-       if (!Ext.isNumeric(max) || max === 1) {
-           return Proxmox.Utils.render_usage(val);
-       }
-       return Proxmox.Utils.render_size_usage(val, max);
-    },
-
-    fieldCalculator: function(used, max) {
-       if (!Ext.isNumeric(max) && Ext.isNumeric(used)) {
-           return used;
-       } else if (!Ext.isNumeric(used)) {
-           /* we come here if the field is from a node
-            * where the records are not mem and maxmem
-            * but mem.used and mem.total
-            */
-           if (used.used !== undefined &&
-               used.total !== undefined) {
-               return used.used/used.total;
-           }
-       }
-
-       return used/max;
-    },
-
-    updateField: function(field) {
-       var me = this;
-       var text = '';
-       var renderer = me.fieldRenderer;
-       if (Ext.isFunction(field.renderer)) {
-           renderer = field.renderer;
-       }
-       if (field.multiField === true) {
-           field.updateValue(renderer.call(field, me.getStore().getRecord()));
-       } else if (field.textField !== undefined) {
-           field.updateValue(renderer.call(field, me.getRecordValue(field.textField)));
-       } else if (field.valueField !== undefined) {
-           var used = me.getRecordValue(field.valueField);
-           /* string and int */
-           var max = field.maxField !== undefined ? me.getRecordValue(field.maxField) : 1;
-
-           var calculate = me.fieldCalculator;
-
-           if (Ext.isFunction(field.calculate)) {
-               calculate = field.calculate;
-           }
-           field.updateValue(renderer.call(field, used, max), calculate(used, max));
-       }
-    },
-
-    getStore: function() {
-       var me = this;
-       if (!me.rstore) {
-           throw "there is no rstore";
-       }
-
-       return me.rstore;
-    },
-
-    updateTitle: function() {
-       var me = this;
-       me.setTitle(me.getRecordValue('name'));
-    },
-
-    updateValues: function(store, records, success) {
-       if (!success) {
-           return; // do not update if store load was not successful
-       }
-       var me = this;
-       var itemsToUpdate = me.query('pveInfoWidget');
-
-       itemsToUpdate.forEach(me.updateField, me);
-
-       me.updateTitle(store);
-    },
-
-    initComponent: function() {
-       var me = this;
-
-       if (!me.rstore) {
-           throw "no rstore given";
-       }
-
-       if (!me.title) {
-           throw "no title given";
-       }
-
-       Proxmox.Utils.monStoreErrors(me, me.rstore);
-
-       me.callParent();
-
-       me.mon(me.rstore, 'load', 'updateValues');
-    },
-
-});

diff --git a/www/manager6/panel/TemplateStatusView.js b/www/manager6/panel/TemplateStatusView.js
index b8e01d433947c2c81543d4b7a474822e127a024d..44d983b3305a756b8df78330c22a7938ed49fa07 100644 (file)
--- a/www/manager6/panel/TemplateStatusView.js
+++ b/www/manager6/panel/TemplateStatusView.js
@@ -1,5 +1,5 @@
 Ext.define('PVE.panel.TemplateStatusView', {
-    extend: 'PVE.panel.StatusView',
+    extend: 'Proxmox.panel.StatusView',
     alias: 'widget.pveTemplateStatusView',
 
     layout: {

diff --git a/www/manager6/storage/StatusView.js b/www/manager6/storage/StatusView.js
index e42e8a7d1f6e6037037a722bc8ec5da135ab1b1f..923d73f2e9400ca3259314da860cb33d157aeb06 100644 (file)
--- a/www/manager6/storage/StatusView.js
+++ b/www/manager6/storage/StatusView.js
@@ -1,5 +1,5 @@
 Ext.define('PVE.storage.StatusView', {
-    extend: 'PVE.panel.StatusView',
+    extend: 'Proxmox.panel.StatusView',
     alias: 'widget.pveStorageStatusView',
 
     height: 230,