@datarailsshared/dr_renderer 1.4.59 → 1.4.65

package/README.md

@@ -14,11 +14,13 @@ This project was generated by amazing Datarails R&D team
     let hr = dr_renderer.getInitHighchartsRenderer($, document, default_colors, Highcharts);
 
 ## Development
+
 ### Types
-To be able to compile types with `npm run build:types` you need to install typescript globally:
 
-```npm i -g typescript```
+To compile types for the project use: `npm run build:types`
 
 ## Publish to npm
-Just merge to prod branch
-###
+
+Just merge to master branch
+
+###

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.4.59",
+  "version": "1.4.65",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",
@@ -11,7 +11,7 @@
   "scripts": {
     "login": "npm login",
     "test": "jest --coverage",
-    "build:types": "tsc --build --verbose"
+    "build:types": "npx tsc --build --verbose"
   },
   "author": "Sergey Spivakov",
   "repository": {
@@ -32,11 +32,10 @@
     "babel-jest": "^25.5.1",
     "jest": "^25.3.0",
     "moment": "^2.29.1",
-    "serve": "^11.3.0"
-  },
-  "bugs": {
-    "url": ""
+    "serve": "^11.3.0",
+    "typescript": "^5.0.0"
   },
+  "types": "src/index.d.ts",
   "homepage": "https://bitbucket.org/datarails/dr_renderer/src/master/",
   "whitelistedNonPeerDependencies": [],
   "main": "src/index.js",

package/src/highcharts_renderer.js

@@ -5256,10 +5256,27 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
     };
 
-    highchartsRenderer.setMissingWidgetOptions = function(options, type) {
-        if (!lodash.has(options, 'chartOptions')) return;
+    highchartsRenderer.setMissingWidgetOptions = function (options, type) {
+        if (!options || !lodash.has(options, 'chartOptions')) return;
+
         const defaultOptions = highchartsRenderer.getDefaultValueForChart(type);
-        options.chartOptions = lodash.merge(defaultOptions, options.chartOptions);
+
+        // User can remove segment and this part of code was made to
+        // prevent a set of default value
+        if (type === highchartsRenderer.CHART_TYPES.GAUGE_CHART_DYNAMIC_GOAL) {
+            const chartOptions = options.chartOptions || {};
+            const userSegments = chartOptions.segments;
+            const merged = lodash.merge({}, defaultOptions, lodash.omit(chartOptions, 'segments'));
+
+            if (Array.isArray(userSegments)) {
+                merged.segments = userSegments;
+            }
+
+            options.chartOptions = merged;
+            return;
+        }
+
+        options.chartOptions = lodash.merge({}, defaultOptions, options.chartOptions);
     };
 
     highchartsRenderer.addPivotOptions = function (selectedTemplateWOData, widgetOptions, drilldownFunction, drillDownListFunction) {

package/src/index.d.ts

@@ -0,0 +1,52 @@
+export * from './types';
+import DataFormatterType = require('./dataformatter');
+
+declare module '*.css' {
+    const content: { [className: string]: string };
+    export default content;
+}
+
+declare namespace DrRenderFactory {
+    interface ColorsOptions {
+        colors: string[];
+        variance_color: string | null;
+    }
+
+    interface InitOptions {
+        $: any;
+        window: Window;
+        document: Document;
+        Handsontable?: any;
+    }
+
+    interface HighchartsRendererOptions {
+        $: any;
+        document: Document;
+        Highcharts: any;
+        default_colors: ColorsOptions;
+        highchartsRenderer: any;
+        lodash: any;
+        moment_lib: any;
+        isNewAngular: boolean;
+    }
+
+    interface Factory {
+        init($: any, window: Window, document: Document, Handsontable?: any): void;
+        getInitHighchartsRenderer(
+            $: any,
+            document: Document,
+            Highcharts: any,
+            default_colors: ColorsOptions,
+            highchartsRenderer: any,
+            lodash: any,
+            moment_lib: any,
+            isNewAngular: boolean
+        ): any;
+        getInitPublishedItemsRenderer(publishedItemsRenderer: any, bind?: any): any;
+
+        DataFormatter: typeof DataFormatterType;
+    }
+}
+
+declare const dr_render_factory: DrRenderFactory.Factory;
+export = dr_render_factory;

package/src/index.js

@@ -24,5 +24,7 @@ dr_render_factory.getInitPublishedItemsRenderer = function (publishedItemsRender
     return getPublishedItemsRenderer.bind(bind)(publishedItemsRenderer);
 }
 
+dr_render_factory.DataFormatter = DataFormatter;
+
 //const $ = require( "jquery" )( window );
-module.exports = dr_render_factory;
+module.exports = dr_render_factory;

package/tsconfig.json

@@ -2,7 +2,7 @@
     "compilerOptions": {
         "declaration": true,
         "allowJs": true,
-        "declarationDir": "./types",
+        "declarationDir": "./src/types",
         "checkJs": true,
         "moduleResolution": "Node16",
         "module": "Node16",

package/tsconfig.tsbuildinfo

@@ -0,0 +1,6 @@
+{
+    "root": [
+        "./src/graph-table-renderer.js"
+    ],
+    "version": "5.9.2"
+}