hyper-analytics - npm Package Compare versions

Comparing version 0.11.23 to 0.11.24

js/DataNodeLeaf.js

@@ -52,5 +52,5 @@ 'use strict';
         if (index.length) {
-            var groupsOffset = Number(drillDown.hasGroups()),
+            var groupsOffset = drillDown.hasGroups() ? 1 : 0,
                 data = this.data,
-                dataLen = drillDown.getColumnCount() + groupsOffset,
+                dataLen = drillDown.getColumnCount() - groupsOffset,
                 i = 0,
@@ -57,0 +57,0 @@ sorter = drillDown.sorterInstance;

js/DataSourceAggregator.js

@@ -84,8 +84,25 @@ 'use strict';
 
+        this._schema = [];
+
         this.setAggregates({});
+
     },
 
+    get schema() {
+        if (this.viewMakesSense()){
+            return this._schema;
+        } else if (this.dataSource) {
+            return this.dataSource.schema;
+        }
+    },
+    set schema(schema) {
+        if (this.viewMakesSense()){
+            this._schema = schema;
+        } else if (this.dataSource) {
+            this.dataSource.schema = schema;
+        }
+    },
+
     isNullObject: false,
 
-
     /**
@@ -107,2 +124,3 @@ * @memberOf DataSourceAggregator#
         this.clearAggregations();
+        this._schema = [{name: 'Tree'}];
 
@@ -129,8 +147,6 @@ for (var key in aggregations) {
         }
-        var headers = this.aggregates.map(function(e) {
-            return e.header;
+        var headers = this.schema.map(function(columnSchema) {
+            return columnSchema.name;
         });
-        if (this.hasGroups()) {
-            headers.unshift('Tree');
-        }
+
         return headers;
@@ -146,2 +162,6 @@ },
         this.aggregates.push(func);
+        this.schema.push({
+            name: label,
+            header: func.header
+        });
     },
@@ -324,3 +344,3 @@
         }
-        return this.getHeaders().length;
+        return this.schema.length;
     },
@@ -327,0 +347,0 @@

js/DataSourceGroupView.js

@@ -70,4 +70,21 @@ 'use strict';
 
+        this._schema = [];
+
     },
 
+    get schema() {
+        if (this.viewMakesSense()){
+            return this._schema;
+        } else if (this.dataSource) {
+            return this.dataSource.schema;
+        }
+    },
+    set schema(schema) {
+        if (this.viewMakesSense()){
+            this._schema = schema;
+        } else if (this.dataSource) {
+            this.dataSource.schema = schema;
+        }
+    },
+
     isNullObject: false,
@@ -89,7 +106,6 @@
         }
-        var headers = this.dataSource.getHeaders().slice(0);
+        var headers = this.schema.map(function(columnSchema) {
+            return columnSchema.name;
+        });
 
-        if (this.hasGroups()) {
-            headers.unshift('Tree');
-        }
         return headers;
@@ -108,2 +124,5 @@ },
         });
+        var parentSchema = this.dataSource.schema.slice(0);
+        parentSchema.unshift({name: 'Tree'});
+        this._schema = parentSchema;
     },
@@ -350,9 +369,2 @@
 
-    /**
-     * @memberOf DataSourceGroupView#
-     */
-    getGrandTotals: function (){
-
-    },
-
     sortGroups: function(groupSorter) {
@@ -359,0 +371,0 @@ this.tree.clearGroupSorts();

js/DataSourceTreeview.js

@@ -154,3 +154,5 @@ 'use strict';
         // successful join requires that options object be given and that all columns exist
-        if (options) {
+        if (!options) {
+            this.joined = false;
+        } else {
             this.idColumn = options.idColumn;
@@ -157,0 +159,0 @@ this.parentIdColumn = options.parentIdColumn;

package.json

 {
   "name": "hyper-analytics",
-  "version": "0.11.23",
+  "version": "0.11.24",
   "description": "Data transformations on arrays of congruent JavaScript objects.",
@@ -5,0 +5,0 @@ "repository": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

91206

increased by1.07%

Lines of code

2801

increased by1.12%

No dependency changes