npm - @datarailsshared/dr_renderer - Versions diffs - 1.2.445 → 1.2.446 - Mend

@datarailsshared/dr_renderer 1.2.445 → 1.2.446

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/src/highcharts_renderer.js +14 -2

package/package.json CHANGED Viewed

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

package/src/highcharts_renderer.js CHANGED Viewed

@@ -8269,11 +8269,17 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (fieldFilter && fieldFilter.type && fieldFilter.type === 'Date' && fieldFilter.datetypevalues) {
                 if (fieldFilter.datetypevalues.datetype === "frame") {
                     const timeframeLabel = highchartsRenderer.DATE_FILTER_TIMEFRAME_LABELS[fieldFilter.datetypevalues.val.timeframe] || highchartsRenderer.getDateFilterCustomTimeframeLabel(fieldFilter.datetypevalues.val);
-                    if (isPermissionOrGlobalFilter) {
+                    if (isGlobalFilter) {
                         return {
                             label: displayname + separator + highchartsRenderer.getGlobalFilterValueHighlighter(timeframeLabel),
                             tooltip: displayname + separator + timeframeLabel,
                         }
+                    } else if (isPermissionFilter) {
+                        const value =  `${displayname} ${highchartsRenderer.getGlobalFilterValueHighlighter( `(${ timeframeLabel })`)}`;
+                        return {
+                            label: value,
+                            tooltip: value
+                        };
                     }
                     displayname += ` (${ timeframeLabel })`;
                 } else if (fieldFilter.datetypevalues.datetype === "range") {
@@ -8294,12 +8300,18 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                                 .toLocaleDateString();
                         }
                     });
-                    if (isPermissionOrGlobalFilter) {
+                    if (isGlobalFilter) {
                         displayname += `${separator}${ highchartsRenderer.getGlobalFilterValueHighlighter(dates.from.displayedValue + '-' + dates.to.displayedValue) }`;
                         return {
                             label: displayname,
                             tooltip: dates.from.displayedValue + '-' + dates.to.displayedValue,
                         }
+                    } else if (isPermissionFilter) {
+                        const value =  `${displayname} ${highchartsRenderer.getGlobalFilterValueHighlighter( `(${ dates.from.displayedValue } - ${ dates.to.displayedValue })`)}`;
+                        return {
+                            label: value,
+                            tooltip: value,
+                        };
                     }
                     displayname += ` (${ dates.from.displayedValue }-${ dates.to.displayedValue })`;
                 } else {