From 474d4e8f61ffc701ed7ceda24835f1477578a5b5 Mon Sep 17 00:00:00 2001
From: andrpet <andrpet@gmail.com>
Date: Thu, 10 Mar 2016 10:44:01 +0100
Subject: [PATCH] cache dataset explorer

---
 datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 datalets/base-datalet/static/js/WorkcycleBehavior.js                           |  1 +
 datalets/datasetexplorer-datalet/datasetexplorer-datalet.html                  | 13 ++++++++++---
 3 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js b/datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js
index ba5abf9..e84534f 100755
--- a/datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js
+++ b/datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js
@@ -56,9 +56,72 @@ var AjaxJsonJsonPathBehavior = {
 
         var comp = this;
 
+        /*if(typeof(Worker) !== "undefined") {
+
+            var myWorker = function() {
+
+                self.onmessage = function(event)
+                {
+                    console.log(event.data);
+
+                    var xmlhttp;
+
+                    if ( XMLHttpRequest) {
+                        // code for IE7+, Firefox, Chrome, Opera, Safari
+                        xmlhttp = new XMLHttpRequest();
+                    } else {
+                        // code for IE6, IE5
+                        xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+                    }
+
+                    xmlhttp.onreadystatechange = function() {
+                        if (xmlhttp.readyState == XMLHttpRequest.DONE ) {
+                            if(xmlhttp.status == 200){
+                                //console.log(xmlhttp.responseText);
+                                self.postMessage(xmlhttp.responseText);
+                            }
+                            else if(xmlhttp.status == 400) {
+                                console.log('There was an error 400')
+                            }
+                            else {
+                                console.log('something else other than 200 was returned')
+                            }
+                        }
+                    }
+
+                    //xmlhttp.open("GET", event.data, true);
+                    xmlhttp.open("GET", "http://172.16.15.77/openwall/api/datasetTree", true);
+                    xmlhttp.send();
+                }
+            };
+
+            var workerData = new Blob(['(' + myWorker.toString() + ')()'], {
+                type: "text/javascript"
+            });
+
+            myWorker = new Worker(window.URL.createObjectURL(workerData));
+            myWorker.postMessage(this._component.dataUrl);
+            myWorker.onmessage = function (e) {
+                console.log(e);
+                comp.handleResponse(JSON.parse(e.data));
+            };
+
+        } else {
+            $.ajax({
+                url: this._component.dataUrl,
+                dataType: "json",
+                async : true,
+                success: function(e){
+                    comp.handleResponse(e);
+                }
+            });
+        }*/
+
         $.ajax({
             url: this._component.dataUrl,
             dataType: "json",
+            async : true,
+            cache : false,
             success: function(e){
                 comp.handleResponse(e);
             }
diff --git a/datalets/base-datalet/static/js/WorkcycleBehavior.js b/datalets/base-datalet/static/js/WorkcycleBehavior.js
index fe7b2df..19c42d4 100755
--- a/datalets/base-datalet/static/js/WorkcycleBehavior.js
+++ b/datalets/base-datalet/static/js/WorkcycleBehavior.js
@@ -103,6 +103,7 @@ var WorkcycleBehavior = {
         }else{
             this._deleteWaitImage();
             this.data = JSON.parse(this._component.data);
+            this.filterData();
             this.transformData();
             this.presentData();
         }
diff --git a/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html b/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
index 3edbc16..352c22c 100755
--- a/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
+++ b/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
@@ -203,8 +203,13 @@ Example:
                 this._component.fire("datasetexplorer-datalet_data-url", { url: url });
             },
 
-            selectData : function() {
-                this.data = [];
+            filterData : function() {
+
+                var tmpData = [];
+
+                if(!this.properties.json_results.value.result)
+                    this.properties.json_results.value = this.data;
+
                 this.meta = this.properties.json_results.value.result.providers;
 
                 //Deal the fields with "'" char
@@ -221,11 +226,13 @@ Example:
                             query += "[*]";
                         }
                     }
-                    this.data.push({
+
+                    tmpData.push({
                         name: query_elements[query_elements.length - 1],
                         data: jsonPath(this.properties.json_results.value, query)
                     });
                 }
+                this.data = tmpData;
                 this._deleteWaitImage();
             }
 
--
libgit2 0.21.4