@datarailsshared/dr_renderer 1.4.42 → 1.4.46

package/package.json

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

package/src/charts/dr_gauge_chart.js

@@ -141,9 +141,11 @@ function DrGaugeChart(pivotData, opts, isDynamicGoal) {
         const goalValue = isGoal
             ? `<span style="font-size: 1.125em; color: ${options.gauge.colors.goal};">${formattedValue}</span>`
             : `<span style="color: ${options.label.font_color};">${formattedValue}</span>`;
+
+        const goalTitleText = DrGaugeChart.getGoalTitleText(options);
         const goalTitle =
-            isGoal && options.label.show_goal_name && options.goal.title
-                ? `<span style="font-size: 0.75em; color: ${options.gauge.colors.goal};">${options.goal.title}</span>`
+            isGoal && options.label.show_goal_name && goalTitleText
+                ? `<span style="font-size: 0.75em; color: ${options.gauge.colors.goal};">${goalTitleText}</span>`
                 : "";
         const percentage = options.label.show_percentage_in_segments
             ? `<span style="font-size: 0.75em; color: ${options.gauge.colors.meta}; font-weight: 400;">(${this.toPercent(
@@ -376,7 +378,7 @@ function DrGaugeChart(pivotData, opts, isDynamicGoal) {
             // goal tooltip if lebels are hidden
             if (tick.pos === options.goal.value && !options.label.show) {
                 drTooltip.add(
-                    `${options.label.show_goal_name ? options.goal.title || "" : ""
+                    `${options.label.show_goal_name ? DrGaugeChart.getGoalTitleText(options) || "" : ""
                     }<span style="font-weight: 600">${this.formatValue(options.goal.value)}</span>`,
                     chart.goalIcon.element,
                     {
@@ -470,7 +472,7 @@ function DrGaugeChart(pivotData, opts, isDynamicGoal) {
     this.setGoal = function (pivotData, opts) {
         if (isDynamicGoal) {
             this.options.goal = {
-                title: this.options.goal.title,
+                title: DrGaugeChart.getGoalTitleText(this.options),
                 value: DrGaugeChart.getValue(pivotData, opts, true, true),
             };
         }
@@ -703,6 +705,12 @@ DrGaugeChart.getValue = function (pivotData, opts, isDynamicGoal = false, isForG
     return aggregator.value();
 };
 
+DrGaugeChart.getGoalTitleText = function(options) {
+    return DrGaugeChart.dynamicGoalFeatureEnabled()
+        ? _.get(options, 'label.goal_name') || options.goal.title
+        : options.goal.title;
+}
+
 DrGaugeChart.dynamicGoalFeatureEnabled = function() {
     return DrGaugeChart.highchartsRenderer.hasFeature(helpers.FEATURES.ENABLE_GAUGE_DYNAMIC_GOAL);
 }

package/src/highcharts_renderer.js

@@ -6975,12 +6975,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 {
                     element_type: 'devider',
                 },
-                {
-                    element_type: 'checkbox',
-                    element_label: 'Goal name',
-                    value_name: 'show_goal_name',
-                    default_value: true,
-                },
                 {
                     element_type: 'checkbox',
                     element_label: 'Value % out of Goal',
@@ -6993,6 +6987,20 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     value_name: 'show_percentage_in_segments',
                     default_value: false,
                 },
+                {
+                    element_type: 'checkbox',
+                    element_label: 'Show Goal label',
+                    value_name: 'show_goal_name',
+                    default_value: true,
+                },
+                {
+                    element_type: 'input',
+                    show_in_one_row: true,
+                    element_label: 'Goal name',
+                    value_name: 'goal_name',
+                    default_value: 'Goal',
+                    showFn: () => highchartsRenderer.hasFeature(FEATURES.ENABLE_GAUGE_DYNAMIC_GOAL),
+                },
             ]
         },
         'label_with_percentage': {