Merge pull request #1473 from notFloran/webui-rewrite-refresh-time

Better method to pass "refresh time" from glances to the WebUI

Merge pull request #1473 from notFloran/webui-rewrite-refresh-time
Better method to pass "refresh time" from glances to the WebUI
bf7267ba · Nicolas Hennion · GitHub · d8da3531 · e408a2a2 · bf7267ba
7 changed file
--- a/glances/outputs/static/js/components/glances/component.js
+++ b/glances/outputs/static/js/components/glances/component.js
@@ -7,5 +7,8 @@ import template from "./view.html";
 export default angular.module("glancesApp").component("glances", {
    controller: GlancesController,
    controllerAs: 'vm',
-    templateUrl: template,
+    bindings: {
+        refreshTime: "<"
+    },
+    templateUrl: template
 });
--- a/glances/outputs/static/js/components/glances/controller.js
+++ b/glances/outputs/static/js/components/glances/controller.js
@@ -4,6 +4,10 @@ export default function GlancesController($scope, GlancesStats, hotkeys, ARGUMEN
    vm.dataLoaded = false;
    vm.arguments = ARGUMENTS;

+    vm.$onInit = function () {
+        GlancesStats.init(vm.refreshTime);
+    };
+
    $scope.$on('data_refreshed', function (event, data) {
        vm.hasGpu = data.stats.gpu.length > 0;
        vm.dataLoaded = true;

--- a/glances/outputs/static/js/module.js
+++ b/glances/outputs/static/js/module.js
@@ -2,7 +2,7 @@
 import angular from "angular";
 import "angular-hotkeys";

-export default angular.module("glancesApp", ["glances.config", "cfp.hotkeys"])
+export default angular.module("glancesApp", ["cfp.hotkeys"])

 .value("CONFIG", {})
 .value("ARGUMENTS", {})
@@ -18,6 +18,4 @@ export default angular.module("glancesApp", ["glances.config", "cfp.hotkeys"])
    $rootScope.$on("data_refreshed", function (event, data) {
        $rootScope.title = `${data.stats.system.hostname} - Glances`;
    });
-
-    GlancesStats.init();
 });
--- a/glances/outputs/static/js/services/stats.js
+++ b/glances/outputs/static/js/services/stats.js

 import angular from "angular";

-function GlancesStats ($http, $q, $rootScope, $timeout, GlancesPluginHelper, REFRESH_TIME, CONFIG, ARGUMENTS) {
+function GlancesStats ($http, $q, $rootScope, $timeout, GlancesPluginHelper, CONFIG, ARGUMENTS) {

    var _data = false;

@@ -10,7 +10,7 @@ function GlancesStats ($http, $q, $rootScope, $timeout, GlancesPluginHelper, REF
    }

    // load config/limit/arguments and execute stats/views auto refresh
-    this.init = function () {
+    this.init = function (REFRESH_TIME) {
        var refreshData = function () {
            return $q.all([
                getAllStats(),

--- a/glances/outputs/static/public/glances.js
+++ b/glances/outputs/static/public/glances.js
--- a/glances/outputs/static/public/glances.map.js
+++ b/glances/outputs/static/public/glances.map.js
--- a/glances/outputs/static/templates/index.html.tpl
+++ b/glances/outputs/static/templates/index.html.tpl
@@ -8,14 +8,9 @@

    <link rel="icon" type="image/x-icon" href="favicon.ico" />
    <script type="text/javascript" src="glances.js"></script>
-    <script>
-        angular
-            .module('glances.config', [])
-            .constant('REFRESH_TIME', {{ refresh_time }});
-    </script>
 </head>

 <body>
-  <glances></glances>
+  <glances refresh-time="{{ refresh_time }}"></glances>
 </body>
 </html>