@datarailsshared/dr_renderer 1.2.365 → 1.2.366

package/.circleci/config.yml

@@ -20,7 +20,7 @@ jobs:
           name: Prepare publish version
           command: |
             postfix=""
-            if [[ "${CIRCLE_BRANCH}" != prod ]] ; then
+            if [[ "${CIRCLE_BRANCH}" != master ]] ; then
               postfix="-$CIRCLE_BRANCH"
             fi
 
@@ -70,7 +70,7 @@ workflows:
           filters:
             branches:
               only:
-                - /prod.*/
+                - /master/
                 - /tigers/
                 - /bratans/
                 - /dragons/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.365",
+  "version": "1.2.366",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/dr-renderer-helpers.js

@@ -0,0 +1,7 @@
+function backendSortingKeysAreNotEmpty(keys) {
+    return !!keys && (!!keys.row_keys && !!keys.row_keys.length || !!keys.col_keys && !!keys.col_keys.length);
+}
+
+module.exports = {
+    backendSortingKeysAreNotEmpty: backendSortingKeysAreNotEmpty,
+}

package/src/dr_pivottable.js

@@ -12,6 +12,10 @@ let initDRPivotTable = function($, window, document) {
       document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.use_new_ux;
     // const numberOfRows = 500; // change to activate the handsontable when num of rows bigger then this.
 
+    const isFlatKeyInPivotKeys = function(keys, flatKey) {
+        return keys.some(key => key.join(delim) === flatKey);
+    };
+
     DRPivotData = (function(superClass) {
         extend(DRPivotData, superClass);
 
@@ -91,6 +95,7 @@ let initDRPivotTable = function($, window, document) {
 
         DRPivotData.prototype.arrSort = function(attrs) {
             var a, sortersArr;
+            const sortByValueAttrs = this.sortByValueAttrs;
             sortersArr = (function() {
                 var l, len1, results;
                 results = [];
@@ -100,11 +105,21 @@ let initDRPivotTable = function($, window, document) {
                 }
                 return results;
             }).call(this);
+
             return function(a, b) {
                 var comparison, i, sorter;
                 for (i in sortersArr) {
-                    sorter = sortersArr[i];
-                    comparison = sorter(a[i], b[i]);
+                    const index = parseInt(i);
+                    sorter = sortersArr[index];
+                    if (sortByValueAttrs.indexOf(attrs[index]) !== -1) {
+
+                        // For case current Field attrs[index] is sorted by value we are concatenating values passed to sorter function
+                        // Concatenation is done from first field in a block (first axis or first series) until current field index.
+                        // Cause for this case sorting will be as list of these concatenated strings (which is prepared in getSortingByValueOrderList)
+                        comparison = sorter(a.slice(0, index + 1).join(','), b.slice(0, index + 1).join(','));
+                    } else {
+                        comparison = sorter(a[index], b[index]);
+                    }
                     if (comparison !== 0) {
                         return comparison;
                     }
@@ -143,7 +158,15 @@ let initDRPivotTable = function($, window, document) {
             return key;
         };
 
+        DRPivotData.prototype.getInsight = function(colKey, rowKey) {
+            const insightInfo = _.find(this.insights, insight => insight.colKey === colKey && insight.rowKey === rowKey);
+            return _.get(insightInfo, 'insight', null);
+        }
+
         DRPivotData.prototype.processRecord = function(record, useTotalsCalculation) {
+            const insight = record.insight;
+            delete record.insight;
+            
             if (useTotalsCalculation) {
                 if (!this.notFirst) {
                     this.keysLength = _.filter(_.keys(record), key => !_.includes(['data_types', 'formats', 'values_formats'], key)).length - 1;
@@ -180,10 +203,10 @@ let initDRPivotTable = function($, window, document) {
                 let flatColKey = colKey.join(delim);
 
                 if (this.keysLength === rowKey.length + colKey.length) {
-                    if (!this.rowKeys.some(rKey => rKey.join(delim) === flatRowKey)) {
+                    if (!this.isKeysSortingDoneOnBackendSide && !isFlatKeyInPivotKeys(this.rowKeys, flatRowKey)) {
                         this.rowKeys.push(rowKey);
                     }
-                    if (!this.colKeys.some(cKey => cKey.join(delim) === flatColKey)) {
+                    if (!this.isKeysSortingDoneOnBackendSide && !isFlatKeyInPivotKeys(this.colKeys, flatColKey)) {
                         this.colKeys.push(colKey);
                     }
                 }
@@ -207,6 +230,14 @@ let initDRPivotTable = function($, window, document) {
                     this.tree[flatRowKey][flatColKey] = this.aggregator(this, rowKey, colKey);
                     this.tree[flatRowKey][flatColKey].push(record);
                 }
+
+                if (insight && (flatRowKey || flatColKey)) {
+                    this.insights.push({
+                        colKey: flatColKey,
+                        rowKey: flatRowKey,
+                        insight: insight,
+                    });
+                }
                 return;
             }
 
@@ -230,6 +261,19 @@ let initDRPivotTable = function($, window, document) {
                 };
             })(this));
 
+            if (insight) {
+                const flatRowKeyForInsight = rowKey.join(delim);
+                const flatColKeyForInsight = colKey.join(delim);
+
+                if (flatRowKeyForInsight || flatColKeyForInsight) {
+                    this.insights.push({
+                        colKey: flatColKeyForInsight,
+                        rowKey: flatRowKeyForInsight,
+                        insight: insight,
+                    });
+                }
+            }
+
             m = rowKey.length - 1;
             n = colKey.length - 1;
             if (m < 0 || n < 0) {
@@ -471,8 +515,11 @@ let initDRPivotTable = function($, window, document) {
             return resultsArr;
         } else {
             let tooMuch = false;
-            if (pvtData && (pvtData.rowKeys.length > 1000 || pvtData.colKeys.length > 500) &&
-                (!opts.show_more_function_cols || !opts.show_more_function_cols)) {
+            const show_more_than_thousand_rows = _.get(opts, 'chartOptions.table_options.show_more_than_thousand_rows', false);
+            if (pvtData &&
+                (pvtData.rowKeys.length > 1000 || pvtData.colKeys.length > 500) &&
+                (!opts.show_more_function_cols || !opts.show_more_function_cols) &&
+                !show_more_than_thousand_rows) {
                 pvtData.rowKeys = [];
                 pvtData.colKeys = [];
                 tooMuch = true;
@@ -876,7 +923,7 @@ let initDRPivotTable = function($, window, document) {
             return string_val;
         };
 
-        processKeys = function(keysArr, className, dimention, attrs) {
+        processKeys = function(keysArr, className, dimention, attrs, formattedKeys) {
             for (let i = 0; i < keysArr.length; i++) {
                 const additionalField = _.find(additionalFieldsList, {key: keysArr[i][0]})
 
@@ -897,7 +944,7 @@ let initDRPivotTable = function($, window, document) {
                 lastCol = 0;
             }
             rMark = [];
-            th = createElement("th", className, valueNoDashes(encodeHtmlEntities(keysArr[0][0]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, 0, 0)));
+            th = createElement("th", className, valueNoDashes(encodeHtmlEntities(formattedKeys[0][0]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, 0, 0)));
             key = [];
             key.push(keysArr[0][0]);
             nodePos = 0;
@@ -917,7 +964,7 @@ let initDRPivotTable = function($, window, document) {
             rMark[0] = node;
             c = 1;
             while (c <= lastCol) {
-                th = createElement("th", className, valueNoDashes(encodeHtmlEntities(keysArr[0][c]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, 0, c)));
+                th = createElement("th", className, valueNoDashes(encodeHtmlEntities(formattedKeys[0][c]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, 0, c)));
                 key = key.slice();
                 key.push(keysArr[0][c]);
                 ++nodePos;
@@ -983,7 +1030,7 @@ let initDRPivotTable = function($, window, document) {
                     }
 
 
-                    th = createElement("th", className, valueNoDashes(encodeHtmlEntities(keysArr[r][c]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, r, c)));
+                    th = createElement("th", className, valueNoDashes(encodeHtmlEntities(formattedKeys[r][c]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, r, c)));
                     ++nodePos;
                     node = {
                         node: nodePos,
@@ -2407,7 +2454,7 @@ let initDRPivotTable = function($, window, document) {
             return Array.from(wrapper.querySelectorAll(selectString));
         }
 
-        main = function(rowAttrs, rowKeys, colAttrs, colKeys) {
+        main = function(rowAttrs, rowKeys, colAttrs, colKeys, pivotData) {
             var c,rowspan, colHeaderCols, colHeaderHeaders, colHeaders, h, k, l, len, len1, result, rowHeaderHeaders, rowHeaderRows, rowHeaders, tbody, thead, tr;
             rowHeaders = [];
             colHeaders = [];
@@ -2416,10 +2463,12 @@ let initDRPivotTable = function($, window, document) {
             colHeaderHeaders = [];
             colHeaderCols = [];
             if (rowAttrs.length > 0 && rowKeys.length > 0) {
-                rowHeaders = processKeys(rowKeys, "pvtRowLabel", 'rows', rowAttrs);
+                const formattedKeys = pivotData.getFormattedRowKeys(rowKeys);
+                rowHeaders = processKeys(rowKeys, "pvtRowLabel", 'rows', rowAttrs, formattedKeys);
             }
             if (colAttrs.length > 0 && colKeys.length > 0) {
-                colHeaders = processKeys(colKeys, "pvtColLabel", 'cols', colAttrs);
+                const formattedKeys = pivotData.getFormattedColKeys(colKeys);
+                colHeaders = processKeys(colKeys, "pvtColLabel", 'cols', colAttrs, formattedKeys);
             }
             var tableClasses = ['pvtTable'];
             if (opts.chartOptions.table_options.use_new_table_design) {
@@ -2564,7 +2613,7 @@ let initDRPivotTable = function($, window, document) {
 
             return wrapper;
         };
-        return main(rowAttrs, rowKeys, colAttrs, colKeys);
+        return main(rowAttrs, rowKeys, colAttrs, colKeys, pivotData);
     };
     // $.pivotUtilities.subtotal_renderers = SubtotalRenderer;
     $.pivotUtilities.subtotal_renderers = NovixRenderer;