@datarailsshared/dr_renderer 1.2.445 → 1.2.447

package/package.json

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

package/src/highcharts_renderer.js

@@ -466,6 +466,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
         filtOb.show_in_graph = value.show_in_graph || false;
         filtOb.override_global_filter = value.override_global_filter || false;
+        filtOb.is_connected_to_datepicker = value.is_connected_to_datepicker;
         filtOb.field = value.id;
         filtOb.name = highchartsRenderer.decodeFunc(value.name);
         return filtOb;
@@ -5532,6 +5533,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     fieldOb.includes = filterObj.values;
                 }
             }
+            if (fieldOb) {
+                fieldOb.is_connected_to_datepicker = filterObj.is_connected_to_datepicker;
+            }
         });
 
         // // fill selected fields
@@ -8269,11 +8273,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 +8304,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 {

package/tests/highcharts_renderer.test.js

@@ -106,12 +106,14 @@ describe('highcharts_renderer', () => {
                 includes: ['test'],
                 show_in_graph: true,
                 override_global_filter: true,
+                is_connected_to_datepicker: false,
             };
             expect(highchartsRenderer.createFilterObject(field)).toEqual({
                 is_excluded: false,
                 values: ['test'],
                 show_in_graph: true,
                 override_global_filter: true,
+                is_connected_to_datepicker: false,
                 field: 1,
                 name: 'name',
             });

package/tests/mock/add-in-tables.json

@@ -63,7 +63,8 @@
         "is_excluded": false,
         "show_in_graph": false,
         "type": "Date",
-        "override_global_filter": false
+        "override_global_filter": false,
+        "is_connected_to_datepicker": true
       },
       {
         "field": 161923,