Fix bug with useless rerendering of Dashboard chart.

Changes: * add rerendering of chart (or some of its lines) only when it needed. Closes #242 See merge request polemarch/ce!184
vstconsulting · Jan 10, 2020 · 8c1c888 · 8c1c888
2 parents f9c3d97 + 6f8fe49
commit 8c1c888
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 18 deletions.
diff --git a/polemarch/main/models/tasks.py b/polemarch/main/models/tasks.py
@@ -321,7 +321,7 @@ def _get_history_stats_by(self, qs, grouped_by='day') -> List:
             sum_by_date[hist_stat[grouped_by]] = (
                 sum_by_date.get(hist_stat[grouped_by], 0) + hist_stat['sum']
             )
-        for hist_stat in qs.order_by(grouped_by):
+        for hist_stat in qs.order_by(grouped_by, 'status'):
             hist_stat.update({'all': sum_by_date[hist_stat[grouped_by]]})
             values.append(hist_stat)
         return values

diff --git a/polemarch/static/js/pmDashboard.js b/polemarch/static/js/pmDashboard.js
@@ -102,7 +102,10 @@ guiWidgets.history_chart = class HistoryChart extends guiWidgets.line_chart {
                                 color: guiCustomizer.skin.settings.chart_axes_lines_color,
                             }
                         }]
-                    }
+                    },
+                    tooltips: {
+                        mode: 'index',
+                    },
                 };
             }
         });
@@ -570,12 +573,6 @@ customRoutesComponentsTemplates.home = { /* globals customRoutesComponentsTempla
                 this.setLoadingError(error);
             });
         },
-        /**
-         * Redefinition of 'getAutoUpdateInterval' method of view_with_autoupdate_mixin.
-         */
-        getAutoUpdateInterval() {
-            return 15000;
-        },
         /**
          * Redefinition of 'updateData' method of view_with_autoupdate_mixin.
          */
@@ -640,13 +637,16 @@ customRoutesComponentsTemplates.home = { /* globals customRoutesComponentsTempla
             let exclude_stats = ['jobs'];
 
             for(let key in response.data) {
-                if (response.data.hasOwnProperty(key)) {
-                    if (exclude_stats.includes(key)) {
-                        w_data.pmwChartWidget = response.data[key];
-                    }
+                if (!response.data.hasOwnProperty(key)) {
+                    continue;
+                }
 
-                    w_data['pmw' + capitalizeString(key) + 'Counter'] = response.data[key];
+                if (exclude_stats.includes(key)) {
+                    w_data.pmwChartWidget = response.data[key];
+                    continue;
                 }
+
+                w_data['pmw' + capitalizeString(key) + 'Counter'] = response.data[key];
             }
 
             return w_data;

diff --git a/polemarch/static/js/pmItems.js b/polemarch/static/js/pmItems.js
@@ -70,8 +70,8 @@ vst_vue_components.widgets.w_history_chart = Vue.component('w_history_chart', {
                 };
             },
             watch: {
-                'customizer.skin.name': function(value) { /* jshint unused: false */ /* TODO ask about args*/
-                    this.generateChart();
+                'customizer.skin.name': function(value) { /* jshint unused: false */
+                    this.updateChartData();
                 }
             },
             computed: {

diff --git a/polemarch/static/templates/pmItems.html b/polemarch/static/templates/pmItems.html
@@ -126,7 +126,19 @@ <h5 class="text-center" style="margin-top:25px;">{{ $t('statistic') | capitalize
                         <div class="progress-group">
                             {{ $t(line.name) }}
                             <span class="float-right">
-                                <b> {{ progressBarsData[line.name].sum }} </b>/ {{ progressBarsData[line.name].all }}
+                                <span>
+                                    <transition name="slide-fade" mode="out-in">
+                                    <span :key="progressBarsData[line.name].sum">
+                                        <b> {{ progressBarsData[line.name].sum }} </b>
+                                    </span>
+                                    </transition>
+                                </span>
+                                <span>/</span>
+                                <span>
+                                    <span>
+                                        {{ progressBarsData[line.name].all }}
+                                    </span>
+                                </span>
                             </span>
                             <div class="progress progress-sm">
                                 <div class="progress-bar"

diff --git a/polemarch/translations/en.py b/polemarch/translations/en.py
@@ -13,4 +13,5 @@
     'groups counter': 'groups | group | groups',
     'hosts counter': 'hosts | host | hosts',
     'users counter': 'users | user | users',
+    'all_tasks': 'all tasks',
 }
diff --git a/requirements-doc.txt b/requirements-doc.txt
@@ -1,2 +1,2 @@
 # Docs
-vstutils[doc]~=2.15.1
+vstutils[doc]~=2.15.2
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 # Main
-vstutils[rpc,ldap,doc,prod]~=2.15.1
+vstutils[rpc,ldap,doc,prod]~=2.15.2
 docutils==0.15.2
 markdown2==2.3.8