From c76533c6d7c2247fc8b36788658eb793f4705a69 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sat, 20 Jun 2020 08:57:24 +0200
Subject: [PATCH] dataset should be a prop

---
 src/components/ftbot/CandleChart.vue | 25 ++++++++++++-------------
 src/views/Graphs.vue                 |  7 +++++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/components/ftbot/CandleChart.vue b/src/components/ftbot/CandleChart.vue
index d09187ff..23b67c8f 100644
--- a/src/components/ftbot/CandleChart.vue
+++ b/src/components/ftbot/CandleChart.vue
@@ -9,9 +9,9 @@
 <script>
 import ECharts from 'vue-echarts';
 import 'echarts';
-import { mapState } from 'vuex';
 
-const MARGINLEFT = '8%';
+const MARGINLEFT = '5%';
+const MARGINRIGHT = '5%';
 
 // TODO plotConfig should come from the backend, or be configurable via UI
 const plotConfig = {
@@ -35,13 +35,15 @@ export default {
   props: {
     pair: {
       type: String,
-      required: false,
-      default: 'XRP/USDT',
+      required: true,
     },
     timeframe: {
       type: String,
-      required: false,
-      default: '5m',
+      required: true,
+    },
+    dataset: {
+      type: Object,
+      required: true,
     },
   },
 
@@ -49,13 +51,10 @@ export default {
     return {};
   },
   computed: {
-    ...mapState('ftbot', ['history']),
     hasData() {
       return this.dataset !== null;
     },
-    dataset() {
-      return this.history[`${this.pair}__${this.timeframe}`];
-    },
+
     chartOptions() {
       if (!this.hasData) {
         return {};
@@ -116,7 +115,7 @@ export default {
           subPlots.xaxisIndex.push(plotIndex);
           subPlots.grid.push({
             left: MARGINLEFT,
-            right: '5%',
+            right: MARGINRIGHT,
             bottom: `${(plotIndex - 1) * 50}px`,
             height: '8%',
           });
@@ -232,14 +231,14 @@ export default {
         grid: [
           {
             left: MARGINLEFT,
-            right: '5%',
+            right: MARGINRIGHT,
             // height: '50%',
             bottom: '150px',
           },
           {
             // Volume
             left: MARGINLEFT,
-            right: '5%',
+            right: MARGINRIGHT,
             bottom: '20%',
             height: '80px',
           },
diff --git a/src/views/Graphs.vue b/src/views/Graphs.vue
index a536bced..39e30851 100644
--- a/src/views/Graphs.vue
+++ b/src/views/Graphs.vue
@@ -7,7 +7,7 @@
       <div class="col-mb-2"></div>
     </div>
     <div class="row">
-      <CandleChart :pair="pair" :timeframe="timeframe"> </CandleChart>
+      <CandleChart :pair="pair" :timeframe="timeframe" :dataset="dataset"> </CandleChart>
     </div>
   </div>
 </template>
@@ -29,7 +29,10 @@ export default {
     };
   },
   computed: {
-    ...mapState('ftbot', ['whitelist']),
+    ...mapState('ftbot', ['whitelist', 'history']),
+    dataset() {
+      return this.history[`${this.pair}__${this.timeframe}`];
+    },
   },
   mounted() {
     this.getWhitelist();