use RRDChart and RRDStore from widget toolkit

[pve-manager.git] / www / manager6 / storage / Summary.js

diff --git a/www/manager6/storage/Summary.js b/www/manager6/storage/Summary.js
index 3b3d86b42fdaa5f6f7c8e175712d6e8de37f467a..a94d8170842c31b8d87596bf5ad7a724e2effeed 100644 (file)
--- a/www/manager6/storage/Summary.js
+++ b/www/manager6/storage/Summary.js
@@ -4,8 +4,8 @@ Ext.define('PVE.storage.Summary', {
     scrollable: true,
     bodyPadding: 10,
     defaults: {
-       style: 'padding-top:10px',
-       width: 800
+       style: {'padding-top':'10px'},
+       width: 770
     },
     tbar: [
        '->',
@@ -26,32 +26,39 @@ Ext.define('PVE.storage.Summary', {
            throw "no storage ID specified";
        }
 
+       var rstore  = Ext.create('PVE.data.ObjectStore', {
+           url: "/api2/json/nodes/" + nodename + "/storage/" + storage + "/status",
+           interval: 1000
+       });
+
        var statusview = Ext.create('PVE.storage.StatusView', {
            pveSelNode: me.pveSelNode,
-           style: 'padding-top:0px'
+           rstore: rstore,
+           style: {'padding-top':'0px'}
        });
 
-       var rstore = statusview.rstore;
-
-       var rrdurl = "/api2/png/nodes/" + nodename + "/storage/" + storage + "/rrd";
+       var rrdstore = Ext.create('Proxmox.data.RRDStore', {
+           rrdurl:  "/api2/json/nodes/" + nodename + "/storage/" + storage + "/rrddata",
+           model: 'pve-rrd-storage'
+       });
 
        Ext.apply(me, {
            items: [
                statusview,
                {
-                   xtype: 'pveRRDView',
+                   xtype: 'proxmoxRRDChart',
                    title: gettext('Usage'),
-                   pveSelNode: me.pveSelNode,
-                   datasource: 'total,used',
-                   rrdurl: rrdurl
+                   fields: ['total','used'],
+                   fieldTitles: ['Total Size', 'Used Size'],
+                   store: rrdstore
                }
-           ]
+           ],
+           listeners: {
+               activate: function() { rstore.startUpdate(); rrdstore.startUpdate(); },
+               destroy: function() { rstore.stopUpdate(); rrdstore.stopUpdate(); }
+           }
        });
 
-       me.on('activate', rstore.startUpdate);
-       me.on('hide', rstore.stopUpdate);
-       me.on('destroy', rstore.stopUpdate);
-
        me.callParent();
     }
 });