Merge pull request #54 from tilak-io/dev

Fixed issue with GraphXY

Author: HmZyy

api/server.py

@@ -190,16 +190,16 @@ def get_yt_values():
 def get_xy_values():
     field = request.get_json()
     table = field['table']
-    columns = field['columns']
-    columns.append("timestamp_tiplot")
-    columns = list(set(columns))
+    xCol = field['x']
+    yCol = field['y']
+    columns = [xCol, yCol, "timestamp_tiplot"]
     datadict = store.Store.get().datadict
     try:
         values = datadict[table][columns].fillna(0).to_dict('records')
     except:
         # columns not found
         values = []
-    response = {"table": table, "x": columns[0], "y": columns[1] , "values": values}
+    response = {"table": table, "x": xCol, "y": yCol, "values": values}
     return response
 
 @app.route('/correlation', methods=['POST'])

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiplot",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "private": true,
   "homepage": "./",
   "proxy": "http://localhost:5000",

src/controllers/PlotData.js

@@ -93,7 +93,7 @@ export default class PlotData {
 
   // get data for xy graphs
   getDataXY = async (x, y) => {
-    const field = { table: x.table, columns: [x.column, y.column] };
+    const field = { table: x.table, x: x.column, y: y.column };
     const response = await fetch(`http://localhost:${PORT}/values_xy`, {
       headers: {
         "Content-Type": "application/json",