@datarailsshared/dr_renderer 1.2.442 → 1.2.444

package/package.json

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

package/src/highcharts_renderer.js

@@ -8120,8 +8120,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
 
     // TODO: refactor, too many conditions, unreadable
-    highchartsRenderer.getFilterLabel = function (fieldFilter, showTemplateName, isFormattingNumbers, isGlobalFilter = false) {
+    highchartsRenderer.getFilterLabel = function (fieldFilter, showTemplateName, isFormattingNumbers, isGlobalFilter = false, isPermissionFilter = false) {
         var displayname;
+        const isPermissionOrGlobalFilter = (isGlobalFilter || isPermissionFilter);
+        const separator = isGlobalFilter ? ': ' : isPermissionFilter ? highchartsRenderer.getPermissionFilterSeparatorHighlighter(` ${fieldFilter.excludes ? 'exclude': 'include'} `) : '';
+
         if (fieldFilter.new_name)
             displayname = fieldFilter.new_name.replace('RH_DIM_', '');
         else {
@@ -8133,7 +8136,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         if (fieldFilter.template_name && fieldFilter.datetypevalues && (fieldFilter.datetypevalues.datetype == 'range' || fieldFilter.datetypevalues.datetype == 'frame')) {
-            const label = displayname + (isGlobalFilter ? highchartsRenderer.getGlobalFilterValueHighlighter(fieldFilter.datetypevalues.datetype) : ' (' + fieldFilter.datetypevalues.datetype + ')');
+            const label = displayname + (isPermissionOrGlobalFilter ? highchartsRenderer.getGlobalFilterValueHighlighter(fieldFilter.datetypevalues.datetype) : ' (' + fieldFilter.datetypevalues.datetype + ')');
             return {
               label,
               tooltip: displayname + ' (' + fieldFilter.datetypevalues.datetype + ')'
@@ -8164,8 +8167,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (all_vals) {
                     all_vals = all_vals.join(', ');
                     tooltip = ' (' + all_vals + ')';
-                    if (all_vals.split(',').length > highchartsRenderer.MAX_SELECTED_ITEMS_BEFORE_COLLAPSING && isGlobalFilter
-                        || all_vals.length > highchartsRenderer.MAX_SELECTED_ITEMS_CHARECHTERS_IN_LABEL && !isGlobalFilter) {
+                    if (all_vals.split(',').length > highchartsRenderer.MAX_SELECTED_ITEMS_BEFORE_COLLAPSING && isPermissionOrGlobalFilter
+                        || all_vals.length > highchartsRenderer.MAX_SELECTED_ITEMS_CHARECHTERS_IN_LABEL && !isPermissionOrGlobalFilter) {
                         all_vals = 'Many';
                     }
                     all_vals = ' (' + all_vals + ')';
@@ -8176,9 +8179,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                 all_vals = highchartsRenderer.decodeFunc(all_vals);
                 tooltip = highchartsRenderer.decodeFunc(tooltip);
-                if (isGlobalFilter) {
+                if (isPermissionOrGlobalFilter) {
                     all_vals = highchartsRenderer.getGlobalFilterCounterString(all_vals);
-                    displayname = displayname + ': ';
+                    displayname = displayname + separator;
                 };
                 return {
                     label: displayname + all_vals,
@@ -8204,22 +8207,22 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                 if (all_vals) {
                     all_vals = all_vals.join(', ');
-                    tooltip = ' (Exclusions: ' + all_vals + ')';
-                    if (all_vals.split(',').length > highchartsRenderer.MAX_SELECTED_ITEMS_BEFORE_COLLAPSING && isGlobalFilter
-                        || all_vals.length > highchartsRenderer.MAX_SELECTED_ITEMS_CHARECHTERS_IN_LABEL && !isGlobalFilter) {
+                    tooltip = (isPermissionFilter ? ' (' : ' (Exclusions: ') + all_vals + ')';
+                    if (all_vals.split(',').length > highchartsRenderer.MAX_SELECTED_ITEMS_BEFORE_COLLAPSING && isPermissionOrGlobalFilter
+                        || all_vals.length > highchartsRenderer.MAX_SELECTED_ITEMS_CHARECHTERS_IN_LABEL && !isPermissionOrGlobalFilter) {
                         all_vals = 'Many';
                     }
-                    all_vals = ' (Exclusions: ' + all_vals + ')';
+                    all_vals = (isPermissionFilter ? ' (' : ' (Exclusions: ') + all_vals + ')';
                 } else {
-                    tooltip = isGlobalFilter ? ': All' : ' (All)';
+                    tooltip = isPermissionOrGlobalFilter ? separator + 'All' : ' (All)';
                     all_vals = 'All';
                 }
 
                 all_vals = highchartsRenderer.decodeFunc(all_vals);
                 tooltip = highchartsRenderer.decodeFunc(tooltip);
-                if (isGlobalFilter) {
+                if (isPermissionOrGlobalFilter) {
                     all_vals = highchartsRenderer.getGlobalFilterCounterString(all_vals);
-                    displayname = displayname + ': ';
+                    displayname = displayname + separator;
                 };
                 return {
                     label: displayname + all_vals,
@@ -8228,26 +8231,29 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             } else {
                 if ((fieldFilter.includes && fieldFilter.includes.length == 0))
                     return {
-                      label: displayname + (isGlobalFilter ? ': None' : ' (None)'),
-                      tooltip: displayname + (isGlobalFilter ? ' None' : ' (None)'),
+                      label: displayname + (isPermissionOrGlobalFilter ? separator + 'None' : ' (None)'),
+                      tooltip: displayname + (isPermissionOrGlobalFilter ? ' None' : ' (None)'),
                     };
                 else if ((fieldFilter.excludes && fieldFilter.excludes.length == 0))
                     return {
-                      label: displayname + (isGlobalFilter ? ': All' : ' (All)'),
-                      tooltip: displayname + (isGlobalFilter ? ' All' : ' (All)'),
+                      label: displayname + (isPermissionOrGlobalFilter ? separator + 'All' : ' (All)'),
+                      tooltip: displayname + (isPermissionOrGlobalFilter ? (isPermissionFilter ? separator : ' ') + 'All' : ' (All)'),
                     };
                 else if ((fieldFilter.includes))
                     return {
-                      label: displayname + (isGlobalFilter ? ': ' + highchartsRenderer.getGlobalFilterValueHighlighter('Many') : ' (Many)'),
+                      label: displayname + (isPermissionOrGlobalFilter ? separator + highchartsRenderer.getGlobalFilterValueHighlighter('Many') : ' (Many)'),
                       tooltip: displayname + ' (' +
                           lodash.map(fieldFilter.includes, item => highchartsRenderer.returnRawDataValue(fieldFilter.type, item, fieldFilter.format)).join(', ') +
                           ')'
                     };
                 else {
-                    const label = displayname + (isGlobalFilter ? ': ' + highchartsRenderer.getGlobalFilterValueHighlighter('Exclusions: Many') : ' (Exclusions Many)');
-                    return {
+                    let label = displayname + (isGlobalFilter ? separator + highchartsRenderer.getGlobalFilterValueHighlighter('Exclusions: Many') : ' (Exclusions Many)');
+                    if (isPermissionFilter) {
+                        label = displayname + separator + ' Many';
+                    }
+                     return {
                         label,
-                        tooltip: displayname + ' (Exclusions: ' +
+                        tooltip: displayname + (isPermissionFilter ? ' (' : ' (Exclusions: ') +
                             lodash.map(fieldFilter.excludes, item => highchartsRenderer.returnRawDataValue(fieldFilter.type, item, fieldFilter.format)).join(', ') +
                             ')'
                     };
@@ -8257,10 +8263,10 @@ 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 (isGlobalFilter) {
+                    if (isPermissionOrGlobalFilter) {
                         return {
-                            label: displayname + ': ' + highchartsRenderer.getGlobalFilterValueHighlighter(timeframeLabel),
-                            tooltip: displayname + ': ' + timeframeLabel,
+                            label: displayname + separator + highchartsRenderer.getGlobalFilterValueHighlighter(timeframeLabel),
+                            tooltip: displayname + separator + timeframeLabel,
                         }
                     }
                     displayname += ` (${ timeframeLabel })`;
@@ -8282,8 +8288,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                                 .toLocaleDateString();
                         }
                     });
-                    if (isGlobalFilter) {
-                        displayname += `: ${ highchartsRenderer.getGlobalFilterValueHighlighter(dates.from.displayedValue + '-' + dates.to.displayedValue) }`;
+                    if (isPermissionOrGlobalFilter) {
+                        displayname += `${separator}${ highchartsRenderer.getGlobalFilterValueHighlighter(dates.from.displayedValue + '-' + dates.to.displayedValue) }`;
                         return {
                             label: displayname,
                             tooltip: dates.from.displayedValue + '-' + dates.to.displayedValue,
@@ -8291,18 +8297,18 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     }
                     displayname += ` (${ dates.from.displayedValue }-${ dates.to.displayedValue })`;
                 } else {
-                    displayname += isGlobalFilter ? ': All' : ' (All)';
+                    displayname += isPermissionOrGlobalFilter ? separator + 'All' : ' (All)';
                 }
             } else if (fieldFilter &&
                 ((fieldFilter.values && fieldFilter.values.type === 'advanced') || (fieldFilter.datetypevalues && fieldFilter.datetypevalues.type === 'advanced'))) {
-                displayname +=  (isGlobalFilter ? ': ' + highchartsRenderer.getGlobalFilterValueHighlighter('Advanced') : ' (Advanced)');
+                displayname +=  (isPermissionOrGlobalFilter ? separator + highchartsRenderer.getGlobalFilterValueHighlighter('Advanced') : ' (Advanced)');
                 return {
                     label: displayname,
-                    tooltip: isGlobalFilter ? 'Advanced' : displayname,
+                    tooltip: isPermissionOrGlobalFilter ? 'Advanced' : displayname,
                 };
 
             } else {
-                displayname += isGlobalFilter ? ': All' : ' (All)';
+                displayname += isPermissionOrGlobalFilter ? separator + 'All' : ' (All)';
             }
 
             return {
@@ -8316,6 +8322,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return `<span class="filters-values-label">${ value }</span>`;
     }
 
+    highchartsRenderer.getPermissionFilterSeparatorHighlighter = function (value) {
+        return `<span class="filters-values-separator">${ value }</span>`;
+    }
+
     highchartsRenderer.getDateFilterCustomTimeframeLabel = function (value) {
         if (!value || !value.timeframe || !value.timeframe.startsWith('x')) return 'Custom';