Update with dev branch: fix filter and type selection issue

appbaseio · May 28, 2016 · 09424cb · 09424cb
1 parent 62d6b00
commit 09424cb
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 29 deletions.
diff --git a/site/dist/main.js b/site/dist/main.js
diff --git a/site/dist/main.min.js b/site/dist/main.min.js
diff --git a/site/src/js/homePage.jsx b/site/src/js/homePage.jsx
@@ -399,13 +399,6 @@ var HomePage = React.createClass({
                 setTimeout(this.getTotalRecord, 1000);
         }
     },
-    getCount: function() {
-        if(subsetESTypes.length) {
-            feed.countStream(subsetESTypes, function(total, fromStream, method) {
-                this.streamCallback(total, fromStream, method);
-            }.bind(this));
-        }
-    },
     watchStock: function(typeName) {
         this.setState({
             sortInfo: {
@@ -438,7 +431,7 @@ var HomePage = React.createClass({
         this.getStreamingData(subsetESTypes);
         input_state.selectedType = subsetESTypes;
         this.watchSelectedRecord();
-        this.getCount();
+        this.applyGetStream();
     },
     typeCounter: function() {
         var typeInfo = this.state.typeInfo;

diff --git a/site/src/js/table/dataTable.jsx b/site/src/js/table/dataTable.jsx
@@ -29,21 +29,29 @@ var DataTable = React.createClass({
             if ($this.props.infoObj.showing != 0) {
                 fixed = ['json'];
                 columns = ['json'];
+                initial_final_cols = [{column: 'json', type: ''}];
             } else {
                 fixed = [];
                 columns = [];
+                initial_final_cols = [];
             }
 
             fullColumns = {
                 type: '',
-                columns: columns
+                columns: columns,
+                final_cols: initial_final_cols
             }
             for (var each in data) {
                 fullColumns.type = data[each]['_type'];
                 for (column in data[each]) {
-                    if (fixed.indexOf(column) <= -1 && column != '_id' && column != '_type') {
+                    if (fixed.indexOf(column) <= -1 && column != '_id' && column != '_type' && column != '_checked') {
                         if (fullColumns.columns.indexOf(column) <= -1) {
                             fullColumns.columns.push(column);
+                            var obj = {
+                                type: data[each]['_type'],
+                                column: column
+                            };
+                            fullColumns.final_cols.push(obj);
                         }
                     }
                 }
@@ -101,9 +109,9 @@ var DataTable = React.createClass({
                 'row': renderRow
             });
         }
-        var renderColumns = fullColumns.columns.map(function(item) {
-            return (<Column _item={item} key={item}
-                        _type={fullColumns.type}
+        var renderColumns = fullColumns.final_cols.map(function(item) {
+            return (<Column _item={item.column} key={item.column}
+                        _type={item.type}
                         _sortInfo={$this.props.sortInfo}
                         handleSort={$this.props.handleSort}
                         mappingObj={$this.props.mappingObj}