From 901cd9282a174a1f302881b9819fa7fb75a04efe Mon Sep 17 00:00:00 2001
From: Hugoren Martinako <aumpfbahn@gmail.com>
Date: Fri, 9 Apr 2021 13:16:00 +0200
Subject: [PATCH 1/5] test date as strings

---
 .../components/commons/Visualizations.vue     | 54 +++++--------------
 1 file changed, 14 insertions(+), 40 deletions(-)

diff --git a/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue b/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
index 177db03152..36d12738d8 100644
--- a/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
+++ b/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
@@ -5,7 +5,7 @@
   />
 </template>
 <script>
-import perspective from "@finos/perspective";
+import "@finos/perspective";
 import "@finos/perspective-viewer";
 import "@finos/perspective-viewer-datagrid";
 import "@finos/perspective-viewer-d3fc";
@@ -84,49 +84,35 @@ export default {
       }
     },
     checkPerspectiveTypes() {
-      //Get columns generates from query
-      const arrayColumnsFromQuery = this.arrayColumnsQuery
-      //Get columns from API
-      const arrayColumnsFromAPI = Object.keys(this.objectColumns)
-
-      /* We compare the columns, if it returns true we pass the schema to Perspective, if false Perspective will convert the columns*/
-      const sameColumns = arrayColumnsFromAPI.length === arrayColumnsFromQuery.length && arrayColumnsFromAPI.every(column => arrayColumnsFromQuery.includes(column))
-
       //If columns contains Boolean values goes to replace them
       let replaceItems = this.items
       if (Object.values(this.objectColumns).some(value => value === "boolean")) {
         replaceItems = this.items.replace(/"t"/g, '"true"').replace(/"f"/g, '"false"')
       }
 
-      if (sameColumns) {
-        this.initPerspectiveWithSchema(replaceItems)
-      } else {
-        this.initPerspective(replaceItems)
-      }
+      this.initPerspectiveWithSchema(replaceItems)
     },
     initPerspectiveWithSchema(data) {
       this.viewer.setAttribute('plugin', this.typeChart)
       this.viewer.clear();
 
-      const transformColumns = this.objectColumns
+      const schema = this.objectColumns
 
-      Object.keys(transformColumns).forEach((key) => {
-        if (transformColumns[key] === 'hstore' || transformColumns[key] === 'jsonb' || transformColumns[key] === 'text') {
-          transformColumns[key] = 'string'
-        } else if (transformColumns[key] === 'decimal') {
-          transformColumns[key] = 'float'
-        } else if (transformColumns[key] === 'inet') {
-          transformColumns[key] = 'integer'
+      Object.keys(schema).forEach((key) => {
+        if (['text', 'hstore', 'jsonb', 'tsvector'].includes(schema[key])) {
+          schema[key] = 'string'
+        } else if (schema[key] === 'decimal') {
+          schema[key] = 'float'
+        } else if (schema[key] === 'inet') {
+          schema[key] = 'integer'
         //In some cases, Perspective throw an error when tried to convert column with date format, so we need to change the date to datetime
-        } else if (transformColumns[key] === 'date') {
-          transformColumns[key] = 'datetime'
-        } else if (transformColumns[key] === 'tsvector') {
-          transformColumns[key] = 'string'
+        } else if (schema[key] === 'date') {
+          // TESTING
+          schema[key] = 'string'
+          // schema[key] = 'datetime'
         }
       });
 
-      let schema = transformColumns
-
       const loadSchema = this.viewer.worker.table(schema);
       this.viewer.load(loadSchema)
       this.viewer.update(data)
@@ -137,18 +123,6 @@ export default {
 
       this.listenerPerspective()
     },
-    initPerspective(data) {
-      this.viewer.setAttribute('plugin', this.typeChart)
-      this.viewer.clear();
-
-      this.viewer.load(data)
-
-      if (this.config) {
-        this.loadConfig()
-      }
-
-      this.listenerPerspective()
-    },
     loadConfig() {
       this.viewer.restore(this.config);
       //Perspective can't restore row_pivots, column_pivots and computed_columns, so we need to check if visualization config contains some of these values, if contain them we've need to include these values to viewer

From db317fc3853500b7e37154dc988b0d7d4f9a450e Mon Sep 17 00:00:00 2001
From: Hugoren Martinako <aumpfbahn@gmail.com>
Date: Fri, 9 Apr 2021 13:41:53 +0200
Subject: [PATCH 2/5] Update Visualizations.vue

---
 .../webapp/components/commons/Visualizations.vue           | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue b/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
index 36d12738d8..6426934c0d 100644
--- a/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
+++ b/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
@@ -99,17 +99,12 @@ export default {
       const schema = this.objectColumns
 
       Object.keys(schema).forEach((key) => {
-        if (['text', 'hstore', 'jsonb', 'tsvector'].includes(schema[key])) {
+        if (['text', 'hstore', 'jsonb', 'tsvector', 'date'].includes(schema[key])) {
           schema[key] = 'string'
         } else if (schema[key] === 'decimal') {
           schema[key] = 'float'
         } else if (schema[key] === 'inet') {
           schema[key] = 'integer'
-        //In some cases, Perspective throw an error when tried to convert column with date format, so we need to change the date to datetime
-        } else if (schema[key] === 'date') {
-          // TESTING
-          schema[key] = 'string'
-          // schema[key] = 'datetime'
         }
       });
 

From b07e32480bb965d55347878006001e8682af769c Mon Sep 17 00:00:00 2001
From: Hugoren Martinako <aumpfbahn@gmail.com>
Date: Fri, 9 Apr 2021 15:57:56 +0200
Subject: [PATCH 3/5] currentQuery MUST NOT runQuery

---
 app/javascript/gobierto_data/webapp/components/Dataset.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/gobierto_data/webapp/components/Dataset.vue b/app/javascript/gobierto_data/webapp/components/Dataset.vue
index f529372900..5e588eaa6d 100644
--- a/app/javascript/gobierto_data/webapp/components/Dataset.vue
+++ b/app/javascript/gobierto_data/webapp/components/Dataset.vue
@@ -596,7 +596,6 @@ export default {
       }
 
       this.currentQuery = sql;
-      this.runCurrentQuery();
     },
     storeRecentQuery() {
       // if the currentQuery does not exist, nor recent, nor in stored queries neither

From ca4d3fb2907f9ab3d4bc2e0756db340a80d6ed5e Mon Sep 17 00:00:00 2001
From: Hugoren Martinako <aumpfbahn@gmail.com>
Date: Fri, 9 Apr 2021 16:22:20 +0200
Subject: [PATCH 4/5] restore datetime

---
 .../webapp/components/commons/Visualizations.vue              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue b/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
index 6426934c0d..340c1de4e2 100644
--- a/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
+++ b/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
@@ -99,12 +99,14 @@ export default {
       const schema = this.objectColumns
 
       Object.keys(schema).forEach((key) => {
-        if (['text', 'hstore', 'jsonb', 'tsvector', 'date'].includes(schema[key])) {
+        if (['text', 'hstore', 'jsonb', 'tsvector'].includes(schema[key])) {
           schema[key] = 'string'
         } else if (schema[key] === 'decimal') {
           schema[key] = 'float'
         } else if (schema[key] === 'inet') {
           schema[key] = 'integer'
+        } else if (schema[key] === 'date') {
+          schema[key] = 'datetime'
         }
       });
 

From 884236ed76bacd97066cdfafc26211836adf826b Mon Sep 17 00:00:00 2001
From: Jorge <jorgeatgu@gmail.com>
Date: Mon, 12 Apr 2021 12:51:40 +0200
Subject: [PATCH 5/5] init Perspective worker

---
 app/javascript/gobierto_data/lib/factories/data.js   |  1 -
 .../webapp/components/commons/Visualizations.vue     | 12 +++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/javascript/gobierto_data/lib/factories/data.js b/app/javascript/gobierto_data/lib/factories/data.js
index e464a61a93..db6a910c9e 100644
--- a/app/javascript/gobierto_data/lib/factories/data.js
+++ b/app/javascript/gobierto_data/lib/factories/data.js
@@ -5,7 +5,6 @@ import axios from "axios";
 const endPoint = `${baseUrl}/data.csv`;
 const token = getToken();
 const headers = {
-  "Content-type": "application/json",
   Authorization: token
 };
 
diff --git a/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue b/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
index 340c1de4e2..7864050b5c 100644
--- a/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
+++ b/app/javascript/gobierto_data/webapp/components/commons/Visualizations.vue
@@ -5,7 +5,7 @@
   />
 </template>
 <script>
-import "@finos/perspective";
+import perspective from "@finos/perspective";
 import "@finos/perspective-viewer";
 import "@finos/perspective-viewer-datagrid";
 import "@finos/perspective-viewer-d3fc";
@@ -63,6 +63,9 @@ export default {
       }
     }
   },
+  created() {
+    this.worker = perspective.worker();
+  },
   mounted() {
     this.viewer = this.$refs["perspective-viewer"];
     this.checkIfQueryResultIsEmpty(this.items)
@@ -110,15 +113,14 @@ export default {
         }
       });
 
-      const loadSchema = this.viewer.worker.table(schema);
-      this.viewer.load(loadSchema)
-      this.viewer.update(data)
-
       if (this.config) {
         this.loadConfig()
       }
 
       this.listenerPerspective()
+
+      this.worker.table(schema);
+      this.viewer.load(data)
     },
     loadConfig() {
       this.viewer.restore(this.config);