@datarailsshared/dr_renderer 1.5.174 → 1.5.180

package/package.json

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

package/src/dr_pivottable.js

@@ -365,7 +365,7 @@ let initDRPivotTable = function($, window, document) {
                 pvtData.colKeys = [];
 
                 const tooMuchDataError = new TooMuchDataError();
-                console.error(tooMuchDataError.title);
+                console.error(tooMuchDataError);
                 throw tooMuchDataError;
             }
             return SubtotalRenderer(pvtData, opts, charttype);

package/src/highcharts_renderer.js

@@ -122,34 +122,29 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     const environment = envOptions || {};
     highchartsRenderer.environment = environment;
 
-    const _handleComputationalError = (err, onlyOptions) => {
+    /**
+     * Handles errors that occur during pivot renderer processing.
+     * 
+     * @param {Error} err - The error that occurred during pivot rendering
+     * @param {boolean} onlyOptions - If true, logs the error and returns empty options object instead of throwing
+     * @param {Error} fallbackError - The fallback error to throw when onlyOptions is false and err is not a BaseRendererError
+     * @returns {Object|void} Returns empty object when onlyOptions is true, otherwise throws an error
+     * @throws {BaseRendererError} Throws the original error if it's an instance of BaseRendererError
+     * @throws {Error} Throws the fallbackError when onlyOptions is false and err is not a BaseRendererError
+     */
+    const _handlePivotRendererError = (err, onlyOptions, fallbackError) => {
         if (err instanceof BaseRendererError) {
             throw err;
         }
 
-        const genericError = new GenericComputationalError();
+        console.error(err);
         if (onlyOptions) {
-            console.error(genericError.title);
             return {};
         } else {
-            throw genericError;
+            throw fallbackError;
         }
     };
 
-    const _handleRenderingError = (err, onlyOptions) => {
-        if (err instanceof BaseRendererError) {
-            throw err;
-        }
-
-        const genericError = new GenericRenderingError();
-        console.error(genericError.title);
-        if (onlyOptions) {
-            return {};
-        } else {
-            throw genericError;
-        }
-    }
-
     /**
      * Sanitizes series data for 100% stacking by converting negative values to 0.
      * @param {Array<Object>} series - Array of Highcharts series objects
@@ -1206,11 +1201,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         if (!seriesDataLength && !chartOptions.onlyText) {
             const noDataError = new NoDataError();
-            console.error(noDataError.title);
+            console.error(noDataError);
             throw noDataError;
         } else if (!chartOptions.onlyText && chartOptions.series && toMatch) {
             const tooMuchDataError = new TooMuchDataError();
-            console.error(tooMuchDataError.title);
+            console.error(tooMuchDataError);
             throw tooMuchDataError;
         } else {
             chartOptions = highchartsRenderer.updateChartOptions(chartOptions, opts);
@@ -1821,14 +1816,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             let color = '';
 
-            if (!lodash.get(waterfallOptions, 'colors', {}) && value.color) {
+            if (!lodash.get(waterfallOptions, 'colors') && value.color) {
                 color = value.color;
             } else if (value.trend === 'total') {
-                color = lodash.get(waterfallOptions, 'colors', {}).total || baseColor.total;
+                color = (lodash.get(waterfallOptions, 'colors') || {}).total || baseColor.total;
             } else {
                 color = val > 0
-                    ? lodash.get(waterfallOptions, 'colors', {}).increase || baseColor.increase
-                    : lodash.get(waterfallOptions, 'colors', {}).decrease || baseColor.decrease;
+                    ? (lodash.get(waterfallOptions, 'colors') || {}).increase || baseColor.increase
+                    : (lodash.get(waterfallOptions, 'colors') || {}).decrease || baseColor.decrease;
             }
             if (val !== 0) {
                 resultObject.data.push({
@@ -4666,7 +4661,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     minCategories,
                     maxCategories
                 });
-                console.error(dataConflictError.title);
+                console.error(dataConflictError);
                 throw dataConflictError;
             }
         }
@@ -4677,7 +4672,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
 
             const noDataError = new NoDataError();
-            console.error(noDataError.title);
+            console.error(noDataError);
             throw noDataError;
         }
 
@@ -4687,7 +4682,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
 
             const tooMuchDataError = new TooMuchDataError();
-            console.error(tooMuchDataError.title);
+            console.error(tooMuchDataError);
             throw tooMuchDataError;
         }
 
@@ -4728,10 +4723,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                 result = opts.renderer(pivotData, opts.rendererOptions);
             } catch (_error) {
-                result = _handleRenderingError(_error, options.onlyOptions);
+                result = _handlePivotRendererError(_error, options.onlyOptions, new GenericRenderingError());
             }
         } catch (_error) {
-            result = _handleComputationalError(_error, options.onlyOptions);
+            result = _handlePivotRendererError(_error, options.onlyOptions, new GenericComputationalError());
         }
 
         return result;
@@ -4775,7 +4770,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     minCategories,
                     maxCategories
                 });
-                console.error(dataConflictError.title);
+                console.error(dataConflictError);
                 throw dataConflictError;
             }
         }
@@ -4786,7 +4781,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
 
             const noDataError = new NoDataError();
-            console.error(noDataError.title);
+            console.error(noDataError);
             throw noDataError;
         }
 
@@ -4796,7 +4791,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
 
             const tooMuchDataError = new TooMuchDataError();
-            console.error(tooMuchDataError.title);
+            console.error(tooMuchDataError);
             throw tooMuchDataError;
         }
 
@@ -4807,7 +4802,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             if (noNeedleOrGoalSelected) {
                 const gaugeError = new GaugeConfigurationError();
-                console.error(gaugeError.title);
+                console.error(gaugeError);
                 throw gaugeError;
             }
         }
@@ -4848,10 +4843,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                 result = opts.renderer(pivotData, opts.rendererOptions);
             } catch (_error) {
-                result = _handleRenderingError(_error, options.onlyOptions);
+                result = _handlePivotRendererError(_error, options.onlyOptions, new GenericRenderingError());
             }
         } catch (_error) {
-            result = _handleComputationalError(_error, options.onlyOptions);
+            result = _handlePivotRendererError(_error, options.onlyOptions, new GenericComputationalError());
         }
 
         return result;