@datarailsshared/dr_renderer 1.2.441 → 1.2.444

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
  1. package/package.json +1 -1
  2. package/src/highcharts_renderer.js +41 -30
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datarailsshared/dr_renderer",
3
- "version": "1.2.441",
3
+ "version": "1.2.444",
4
4
  "description": "DataRails charts and tables renderer",
5
5
  "keywords": [
6
6
  "datarails",
package/src/highcharts_renderer.js CHANGED
@@ -5239,6 +5239,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
5239
5239
 
5240
5240
  lodash.forEach(template.fields, function (field) {
5241
5241
  field.name = highchartsRenderer.decodeFunc(field.name);
5242
+ field.displayName = highchartsRenderer.getFieldName(field.name);
5242
5243
  field.description = highchartsRenderer.decodeFunc(field.description);
5243
5244
  field.format = highchartsRenderer.decodeFunc(field.format);
5244
5245
  if (field.sorting && field.sorting.values) {
@@ -8119,8 +8120,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8119
8120
  }
8120
8121
 
8121
8122
  // TODO: refactor, too many conditions, unreadable
8122
- highchartsRenderer.getFilterLabel = function (fieldFilter, showTemplateName, isFormattingNumbers, isGlobalFilter = false) {
8123
+ highchartsRenderer.getFilterLabel = function (fieldFilter, showTemplateName, isFormattingNumbers, isGlobalFilter = false, isPermissionFilter = false) {
8123
8124
  var displayname;
8125
+ const isPermissionOrGlobalFilter = (isGlobalFilter || isPermissionFilter);
8126
+ const separator = isGlobalFilter ? ': ' : isPermissionFilter ? highchartsRenderer.getPermissionFilterSeparatorHighlighter(` ${fieldFilter.excludes ? 'exclude': 'include'} `) : '';
8127
+
8124
8128
  if (fieldFilter.new_name)
8125
8129
  displayname = fieldFilter.new_name.replace('RH_DIM_', '');
8126
8130
  else {
@@ -8132,7 +8136,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8132
8136
  }
8133
8137
 
8134
8138
  if (fieldFilter.template_name && fieldFilter.datetypevalues && (fieldFilter.datetypevalues.datetype == 'range' || fieldFilter.datetypevalues.datetype == 'frame')) {
8135
- const label = displayname + (isGlobalFilter ? highchartsRenderer.getGlobalFilterValueHighlighter(fieldFilter.datetypevalues.datetype) : ' (' + fieldFilter.datetypevalues.datetype + ')');
8139
+ const label = displayname + (isPermissionOrGlobalFilter ? highchartsRenderer.getGlobalFilterValueHighlighter(fieldFilter.datetypevalues.datetype) : ' (' + fieldFilter.datetypevalues.datetype + ')');
8136
8140
  return {
8137
8141
  label,
8138
8142
  tooltip: displayname + ' (' + fieldFilter.datetypevalues.datetype + ')'
@@ -8163,8 +8167,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8163
8167
  if (all_vals) {
8164
8168
  all_vals = all_vals.join(', ');
8165
8169
  tooltip = ' (' + all_vals + ')';
8166
- if (all_vals.split(',').length > highchartsRenderer.MAX_SELECTED_ITEMS_BEFORE_COLLAPSING && isGlobalFilter
8167
- || all_vals.length > highchartsRenderer.MAX_SELECTED_ITEMS_CHARECHTERS_IN_LABEL && !isGlobalFilter) {
8170
+ if (all_vals.split(',').length > highchartsRenderer.MAX_SELECTED_ITEMS_BEFORE_COLLAPSING && isPermissionOrGlobalFilter
8171
+ || all_vals.length > highchartsRenderer.MAX_SELECTED_ITEMS_CHARECHTERS_IN_LABEL && !isPermissionOrGlobalFilter) {
8168
8172
  all_vals = 'Many';
8169
8173
  }
8170
8174
  all_vals = ' (' + all_vals + ')';
@@ -8175,9 +8179,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8175
8179
 
8176
8180
  all_vals = highchartsRenderer.decodeFunc(all_vals);
8177
8181
  tooltip = highchartsRenderer.decodeFunc(tooltip);
8178
- if (isGlobalFilter) {
8182
+ if (isPermissionOrGlobalFilter) {
8179
8183
  all_vals = highchartsRenderer.getGlobalFilterCounterString(all_vals);
8180
- displayname = displayname + ': ';
8184
+ displayname = displayname + separator;
8181
8185
  };
8182
8186
  return {
8183
8187
  label: displayname + all_vals,
@@ -8203,22 +8207,22 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8203
8207
 
8204
8208
  if (all_vals) {
8205
8209
  all_vals = all_vals.join(', ');
8206
- tooltip = ' (Exclusions: ' + all_vals + ')';
8207
- if (all_vals.split(',').length > highchartsRenderer.MAX_SELECTED_ITEMS_BEFORE_COLLAPSING && isGlobalFilter
8208
- || all_vals.length > highchartsRenderer.MAX_SELECTED_ITEMS_CHARECHTERS_IN_LABEL && !isGlobalFilter) {
8210
+ tooltip = (isPermissionFilter ? ' (' : ' (Exclusions: ') + all_vals + ')';
8211
+ if (all_vals.split(',').length > highchartsRenderer.MAX_SELECTED_ITEMS_BEFORE_COLLAPSING && isPermissionOrGlobalFilter
8212
+ || all_vals.length > highchartsRenderer.MAX_SELECTED_ITEMS_CHARECHTERS_IN_LABEL && !isPermissionOrGlobalFilter) {
8209
8213
  all_vals = 'Many';
8210
8214
  }
8211
- all_vals = ' (Exclusions: ' + all_vals + ')';
8215
+ all_vals = (isPermissionFilter ? ' (' : ' (Exclusions: ') + all_vals + ')';
8212
8216
  } else {
8213
- tooltip = isGlobalFilter ? ': All' : ' (All)';
8217
+ tooltip = isPermissionOrGlobalFilter ? separator + 'All' : ' (All)';
8214
8218
  all_vals = 'All';
8215
8219
  }
8216
8220
 
8217
8221
  all_vals = highchartsRenderer.decodeFunc(all_vals);
8218
8222
  tooltip = highchartsRenderer.decodeFunc(tooltip);
8219
- if (isGlobalFilter) {
8223
+ if (isPermissionOrGlobalFilter) {
8220
8224
  all_vals = highchartsRenderer.getGlobalFilterCounterString(all_vals);
8221
- displayname = displayname + ': ';
8225
+ displayname = displayname + separator;
8222
8226
  };
8223
8227
  return {
8224
8228
  label: displayname + all_vals,
@@ -8227,26 +8231,29 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8227
8231
  } else {
8228
8232
  if ((fieldFilter.includes && fieldFilter.includes.length == 0))
8229
8233
  return {
8230
- label: displayname + (isGlobalFilter ? ': None' : ' (None)'),
8231
- tooltip: displayname + (isGlobalFilter ? ' None' : ' (None)'),
8234
+ label: displayname + (isPermissionOrGlobalFilter ? separator + 'None' : ' (None)'),
8235
+ tooltip: displayname + (isPermissionOrGlobalFilter ? ' None' : ' (None)'),
8232
8236
  };
8233
8237
  else if ((fieldFilter.excludes && fieldFilter.excludes.length == 0))
8234
8238
  return {
8235
- label: displayname + (isGlobalFilter ? ': All' : ' (All)'),
8236
- tooltip: displayname + (isGlobalFilter ? ' All' : ' (All)'),
8239
+ label: displayname + (isPermissionOrGlobalFilter ? separator + 'All' : ' (All)'),
8240
+ tooltip: displayname + (isPermissionOrGlobalFilter ? (isPermissionFilter ? separator : ' ') + 'All' : ' (All)'),
8237
8241
  };
8238
8242
  else if ((fieldFilter.includes))
8239
8243
  return {
8240
- label: displayname + (isGlobalFilter ? ': ' + highchartsRenderer.getGlobalFilterValueHighlighter('Many') : ' (Many)'),
8244
+ label: displayname + (isPermissionOrGlobalFilter ? separator + highchartsRenderer.getGlobalFilterValueHighlighter('Many') : ' (Many)'),
8241
8245
  tooltip: displayname + ' (' +
8242
8246
  lodash.map(fieldFilter.includes, item => highchartsRenderer.returnRawDataValue(fieldFilter.type, item, fieldFilter.format)).join(', ') +
8243
8247
  ')'
8244
8248
  };
8245
8249
  else {
8246
- const label = displayname + (isGlobalFilter ? ': ' + highchartsRenderer.getGlobalFilterValueHighlighter('Exclusions: Many') : ' (Exclusions Many)');
8247
- return {
8250
+ let label = displayname + (isGlobalFilter ? separator + highchartsRenderer.getGlobalFilterValueHighlighter('Exclusions: Many') : ' (Exclusions Many)');
8251
+ if (isPermissionFilter) {
8252
+ label = displayname + separator + ' Many';
8253
+ }
8254
+ return {
8248
8255
  label,
8249
- tooltip: displayname + ' (Exclusions: ' +
8256
+ tooltip: displayname + (isPermissionFilter ? ' (' : ' (Exclusions: ') +
8250
8257
  lodash.map(fieldFilter.excludes, item => highchartsRenderer.returnRawDataValue(fieldFilter.type, item, fieldFilter.format)).join(', ') +
8251
8258
  ')'
8252
8259
  };
@@ -8256,10 +8263,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8256
8263
  if (fieldFilter && fieldFilter.type && fieldFilter.type === 'Date' && fieldFilter.datetypevalues) {
8257
8264
  if (fieldFilter.datetypevalues.datetype === "frame") {
8258
8265
  const timeframeLabel = highchartsRenderer.DATE_FILTER_TIMEFRAME_LABELS[fieldFilter.datetypevalues.val.timeframe] || highchartsRenderer.getDateFilterCustomTimeframeLabel(fieldFilter.datetypevalues.val);
8259
- if (isGlobalFilter) {
8266
+ if (isPermissionOrGlobalFilter) {
8260
8267
  return {
8261
- label: displayname + ': ' + highchartsRenderer.getGlobalFilterValueHighlighter(timeframeLabel),
8262
- tooltip: displayname + ': ' + timeframeLabel,
8268
+ label: displayname + separator + highchartsRenderer.getGlobalFilterValueHighlighter(timeframeLabel),
8269
+ tooltip: displayname + separator + timeframeLabel,
8263
8270
  }
8264
8271
  }
8265
8272
  displayname += ` (${ timeframeLabel })`;
@@ -8281,8 +8288,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8281
8288
  .toLocaleDateString();
8282
8289
  }
8283
8290
  });
8284
- if (isGlobalFilter) {
8285
- displayname += `: ${ highchartsRenderer.getGlobalFilterValueHighlighter(dates.from.displayedValue + '-' + dates.to.displayedValue) }`;
8291
+ if (isPermissionOrGlobalFilter) {
8292
+ displayname += `${separator}${ highchartsRenderer.getGlobalFilterValueHighlighter(dates.from.displayedValue + '-' + dates.to.displayedValue) }`;
8286
8293
  return {
8287
8294
  label: displayname,
8288
8295
  tooltip: dates.from.displayedValue + '-' + dates.to.displayedValue,
@@ -8290,18 +8297,18 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8290
8297
  }
8291
8298
  displayname += ` (${ dates.from.displayedValue }-${ dates.to.displayedValue })`;
8292
8299
  } else {
8293
- displayname += isGlobalFilter ? ': All' : ' (All)';
8300
+ displayname += isPermissionOrGlobalFilter ? separator + 'All' : ' (All)';
8294
8301
  }
8295
8302
  } else if (fieldFilter &&
8296
8303
  ((fieldFilter.values && fieldFilter.values.type === 'advanced') || (fieldFilter.datetypevalues && fieldFilter.datetypevalues.type === 'advanced'))) {
8297
- displayname += (isGlobalFilter ? ': ' + highchartsRenderer.getGlobalFilterValueHighlighter('Advanced') : ' (Advanced)');
8304
+ displayname += (isPermissionOrGlobalFilter ? separator + highchartsRenderer.getGlobalFilterValueHighlighter('Advanced') : ' (Advanced)');
8298
8305
  return {
8299
8306
  label: displayname,
8300
- tooltip: isGlobalFilter ? 'Advanced' : displayname,
8307
+ tooltip: isPermissionOrGlobalFilter ? 'Advanced' : displayname,
8301
8308
  };
8302
8309
 
8303
8310
  } else {
8304
- displayname += isGlobalFilter ? ': All' : ' (All)';
8311
+ displayname += isPermissionOrGlobalFilter ? separator + 'All' : ' (All)';
8305
8312
  }
8306
8313
 
8307
8314
  return {
@@ -8315,6 +8322,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8315
8322
  return `<span class="filters-values-label">${ value }</span>`;
8316
8323
  }
8317
8324
 
8325
+ highchartsRenderer.getPermissionFilterSeparatorHighlighter = function (value) {
8326
+ return `<span class="filters-values-separator">${ value }</span>`;
8327
+ }
8328
+
8318
8329
  highchartsRenderer.getDateFilterCustomTimeframeLabel = function (value) {
8319
8330
  if (!value || !value.timeframe || !value.timeframe.startsWith('x')) return 'Custom';
8320
8331