controllets and base datatel behavior update

Luigi Serra
1 parent 491a6e1f
Showing 10 changed files with 8 additions and 2 deletions
bower_components/iron-list/demo/demo1.html
bower_components/paper-checkbox/paper-checkbox.css
bower_components/paper-item/paper-item-shared.css
bower_components/paper-radio-button/paper-radio-button.css
bower_components/paper-slider/paper-slider.css
bower_components/paper-toggle-button/paper-toggle-button.css
bower_components/prism/plugins/show-language/prism-show-language.min.css
controllets/data-sevc-controllet/data-sevc-controllet.html
datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js
datalets/donutpie3dchart-datalet/donutpie3dchart-datalets.png
@@ -868,10 +868,14 @@ Example:
                 switch(next_selected_pass){
                     case 0:
+                        this.$.fields_treeview.setAttribute("json-data", null);
+                        this.$.fields_treeview.setAttribute("preselected-fields", null);
+                        this.$.fields_treeview.ready();//chrome
                         return true;
                     case 1:
-                        if(this.$.data_url.value == undefined){
-                            this.$.message.text = "You have to select a dataset to access to pass 2.";
+                        var x = this.$.fields_treeview.getAttribute("json-data");
+                        if(this.$.data_url.value == undefined || this.$.fields_treeview.getAttribute('json-data') == "null" || this.$.fields_treeview.getAttribute('json-data') == null){
+                            this.$.message.text = "You have to select a dataset to access to pass 2. It's possible that the data you selected are not available.";
                             this.$.message.show();
                             return false;
                         }else{
@@ -82,11 +82,13 @@ var AjaxJsonJsonPathBehavior = {
      */
     isFieldArray : function(field){
        if(field.length == 0) return false;
+
        var obj = this.properties.json_results.value[field[0]];
        for(var i=1; i < field.length; i++){
           obj = (obj.constructor == Array) ? obj[0][field[i]] : obj[field[i]];
        }
+       if(obj == null) return false;
        return (obj.constructor === Array && obj[0].constructor == Object) ? true : false;
     },