ui: fix horizontal overflow in dashboard (#58)

NethServer/dev#6206
NethServer · Jul 2, 2020 · 0254608 · 0254608
1 parent 6c5c59e
commit 0254608
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ui/src/piechart.js b/ui/src/piechart.js
@@ -20,7 +20,7 @@
 
 import c3 from 'c3'
 
-export default function generatePieChart(bindto, data) {
+export default function generatePieChart(bindto, data, size, tooltip, color) {
     var $ = window.jQuery
     var c3ChartDefaults = $().c3ChartDefaults()
     var pieChartRightConfig = c3ChartDefaults.getDefaultPieConfig()
@@ -32,5 +32,8 @@ export default function generatePieChart(bindto, data) {
         show: true,
         position: 'right'
     };
+    pieChartRightConfig.size = size;
+    pieChartRightConfig.tooltip = tooltip || {};
+    pieChartRightConfig.color = color;
     return c3.generate(pieChartRightConfig)
 }
diff --git a/ui/src/views/Dashboard.vue b/ui/src/views/Dashboard.vue
@@ -297,7 +297,7 @@
         </div>
       </div>
       <div class="col-sm-6">
-        <div v-if="!view.isFilterChartLoaded" class="spinner spinner-lg view-spinner"></div>
+        <div v-show="!view.isFilterChartLoaded" class="spinner spinner-lg view-spinner"></div>
         <div v-show="view.isFilterChartLoaded" class="row">
           <div class="col-sm-12">
             <div
@@ -525,6 +525,10 @@ export default {
                 requests: $.pfPaletteColors.green
               },
               columns: []
+            },
+            {
+              width: window.innerWidth * 0.4,
+              height: 175
             });
           }
           context.filterPieChart.load({