@datarailsshared/dr_renderer 1.2.222-unittests → 1.2.223

package/.circleci/config.yml

@@ -31,12 +31,6 @@ jobs:
       - run:
           name: Authenticate with registry
           command: echo "//registry.npmjs.org/:_authToken=$npm_TOKEN" > ~/repo/.npmrc
-      - run:
-          name: Install dependencies 
-          command: npm install
-      - run:
-          name: Run npm test
-          command: npm test
       - run:
           name: Publish package
           command: npm publish . --access=public
@@ -71,4 +65,3 @@ workflows:
                 - /tigers/
                 - /wizards/
                 - /rocket/
-                - /unittests/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.222-unittests",
+  "version": "1.2.223",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",
@@ -9,8 +9,7 @@
     "tables"
   ],
   "scripts": {
-    "login": "npm login",
-    "test": "jest --coverage"
+    "login": "npm login"
   },
   "author": "Sergey Spivakov",
   "repository": {
@@ -18,21 +17,6 @@
     "url": "git+https://bitbucket.org/datarails/dr_renderer.git"
   },
   "license": "",
-  "dependencies": {
-    "jquery": "^3.6.0",
-    "lodash": "^4.17.20",
-    "regenerator-runtime": "^0.13.5"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/preset-env": "^7.20.2",
-    "@testing-library/dom": "^7.2.1",
-    "@testing-library/jest-dom": "^5.5.0",
-    "babel-jest": "^25.5.1",
-    "jest": "^25.3.0",
-    "moment": "^2.29.1",
-    "serve": "^11.3.0"
-  },
   "bugs": {
     "url": ""
   },
@@ -40,10 +24,5 @@
   "whitelistedNonPeerDependencies": [],
   "main": "src/index.js",
   "module": "src/index.js",
-  "sideEffects": false,
-  "jest": {
-    "setupFiles": [
-      "./setup-jest.js"
-    ]
-  }
+  "sideEffects": false
 }

package/src/highcharts_renderer.js

@@ -87,6 +87,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         EXCEL_VIEWER: 'excel_viewer',
     };
 
+    highchartsRenderer.VIRTUAL_FIELDS = {
+        WATERFALL_VARIANCE: 'DR_WATERFALL_BREAKDOWN_VARIANCE',
+    };
+
     highchartsRenderer.highcharts_theme = {
         "colors": highchartsRenderer.defaults_colors,
         "chart": {
@@ -1344,7 +1348,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const chart_series = [];
         const row_n_keys = pivotData.getRowKeys();
         const col_n_keys = pivotData.getColKeys();
-        const hasBreakdownValues = lodash.get(opts, 'breakdown_options.values.breakdown.length');
 
         let resultObject = {
             data: [],
@@ -1363,8 +1366,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         lodash.forEach(col_n_keys, function(col_n_value, col_index) {
 
             const totalColumnValue = pivotData.getAggregator([], col_n_value).value();
-            const nextTotalColumnKey = col_n_keys[col_index + 1];
-            const nextTotalColumnValue = nextTotalColumnKey ? pivotData.getAggregator([], nextTotalColumnKey).value() : null;
             resultObject.data.push({
                 y: totalColumnValue,
                 name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
@@ -1376,9 +1377,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (col_index !== col_n_keys.length - 1) {
                 lodash.forEach(row_n_keys, function (row_n_value) {
                     const agg = pivotData.getAggregator(row_n_value, col_n_value);
-                    let val = hasBreakdownValues
-                        ? agg.value()
-                        : nextTotalColumnValue - totalColumnValue;
+                    let val = agg.value();
 
                     val = $.isNumeric(val) ? parseFloat(val) : 0;
                     if (val) {
@@ -1389,6 +1388,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         if (tmoobj.name) {
                             tmoobj.name = tmoobj.name.replace('DR_Others', highchartsRenderer.getOthersName(opts));
                         }
+
                         if (lodash.isEmpty(String(tmoobj.name))) {
                             tmoobj.name = lodash.unescape(col_n_value);
                             tmoobj.visible = false;
@@ -1398,12 +1398,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         tmoobj.colKeys = [lodash.unescape(col_n_keys[col_index - 1]), lodash.unescape(col_n_value)];
                         resultObject.data.push(tmoobj);
                     }
+
                 });
             }
         });
 
         chart_series.push(resultObject);
-
         opts.chart_series = [];
         if (!lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
             chart_series.forEach(series => {
@@ -4954,12 +4954,28 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         });
 
+        // add virtual fields to rows if required
+        let rows = widgetOptions.rows;
+        if (!lodash.get(widgetOptions, 'rows.length') && widgetOptions.options.breakdown_options) {
+            rows = [
+                {
+                    id: -1,
+                    name: highchartsRenderer.VIRTUAL_FIELDS.WATERFALL_VARIANCE,
+                    type: 'Text',
+                },
+            ];
+        }
+
         // fill rows fields
-        lodash.forEach(widgetOptions.rows, function (valObj) {
-            fieldOb = lodash.find(fields, {id: valObj.id});
-            if (fieldOb) {
-                legendFields.push(fieldOb);
-                lodash.remove(fields, {id: fieldOb.id});
+        lodash.forEach(rows, function (valObj) {
+            if (lodash.includes(highchartsRenderer.VIRTUAL_FIELDS, valObj.name)) {
+                legendFields.push(valObj);
+            } else {
+                fieldOb = lodash.find(fields, {id: valObj.id});
+                if (fieldOb) {
+                    legendFields.push(fieldOb);
+                    lodash.remove(fields, {id: fieldOb.id});
+                }
             }
         });
 
@@ -7976,7 +7992,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.createDateFromString = function (dateString, format) {
-        if ((format && !highchartsRenderer.isDateFormat(dateString, format)) || !highchartsRenderer.isDate(dateString)) {
+        if (!(format && highchartsRenderer.isDateFormat(dateString, format) || highchartsRenderer.isDate(dateString))) {
             return null;
         }
         const utcDate = format 
@@ -8130,6 +8146,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 filter.is_excluded = false;
             } else {
                 filter = highchartsRenderer.createDrillDownFilterObject(widget, widget.cols[0], colKey[0]);
+                filters.push(filter);
             }
             filter.values = [];
             for (let i = 0; i < colKey.length; i++) {

package/babel.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-    presets: [['@babel/preset-env', {targets: {node: 'current'}}]],
-};

package/jest.config.js

@@ -1,27 +0,0 @@
-module.exports = {
-    clearMocks: true,
-    setupFilesAfterEnv: ['regenerator-runtime/runtime'],
-    testPathIgnorePatterns: [
-        "/node_modules/",
-    ],
-    transformIgnorePatterns: [
-        "<rootDir>/node_modules/(?!jquery|lodash|moment/)",
-    ],
-    collectCoverage: true,
-    collectCoverageFrom: [
-        '**/*.js',
-        '!**/*.config.js',
-        '!**/build/**',
-        '!**/coverage/**',
-        '!**/node_modules/**',
-        '!**/vendor/**'
-    ],
-    // coverageThreshold: {
-    //     "global": {
-    //         "branches": 100,
-    //         "functions": 100,
-    //         "lines": 100,
-    //         "statements": 100
-    //     }
-    // },
-};

package/tests/highcharts_renderer.test.js

@@ -1,48 +0,0 @@
-import * as $ from 'jquery';
-import * as lodash from 'lodash';
-import * as moment from 'moment';
-import initPivotTable from "../src/pivottable";
-import initDRPivotTable from "../src/dr_pivottable";
-
-const getHighchartsRenderer = require('../src/highcharts_renderer');
-const DataFormatter = require('../src/dataformatter');
-const DEFAULT_USER_COLORS = {
-    colors: ['#008aff', '#91e7e7', '#f37789', '#ffdc65', '#0e569d', '#bbe0ff', '#57b2ff', '#5ecfb9', '#c7ffda', '#179ab9'],
-    variance_color: null
-};
-
-let highchartsRenderer = {};
-let _window = window;
-let _document = document;
-
-describe('highcharts_renderer', () => {
-    beforeAll(() => {
-        const Highcharts = {
-            opt: {},
-            setOptions: function(value) {Highcharts.opt = value;},
-            numberFormat: function(value) { return value ;},
-            getOptions: function() { return Highcharts.opt; }
-        };
-        _window.DataFormatter = DataFormatter;
-        initPivotTable($, _window, _document);
-        initDRPivotTable($, _window, _document);
-
-        highchartsRenderer = getHighchartsRenderer($, _document, Highcharts, DEFAULT_USER_COLORS, highchartsRenderer,
-            DataFormatter, lodash, moment, true)
-    })
-
-    describe('function isSystemField', () => {
-        it('system name', () => {
-            const field = {
-                name: 'Doc_ID'
-            };
-            expect(highchartsRenderer.isSystemField(field)).toBe(true)
-        });
-        it('not system name', () => {
-            const field = {
-                name: 'field name'
-            };
-            expect(highchartsRenderer.isSystemField(field)).toBe(false)
-        });
-    });
-});