@datarailsshared/dr_renderer 1.2.411 → 1.2.413

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 +10 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datarailsshared/dr_renderer",
3
- "version": "1.2.411",
3
+ "version": "1.2.413",
4
4
  "description": "DataRails charts and tables renderer",
5
5
  "keywords": [
6
6
  "datarails",
package/src/highcharts_renderer.js CHANGED
@@ -8357,8 +8357,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8357
8357
  (element.datetypevalues && element.datetypevalues.datetype != 'list')
8358
8358
  });
8359
8359
  dashboardsFilters = lodash.map(dashboardsFilters, function (element) {
8360
- var ret = {};
8361
- ret['fields'] = element.fields;
8360
+ var ret = {
8361
+ id: element.id,
8362
+ fields: element.fields,
8363
+ };
8362
8364
  if (element.datetypevalues && element.datetypevalues.datetype != 'list')
8363
8365
  ret['values'] = element.datetypevalues;
8364
8366
  else {
@@ -8547,10 +8549,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
8547
8549
  const range = { datetype: "range", val: { todate: 0, fromdate: 0 } };
8548
8550
  const timeframe = highchartsRenderer.getTimeframeByFormat(format);
8549
8551
 
8550
- const isFormattedDate = format && highchartsRenderer.isDateFormat(fieldnametoFilter, format);
8551
- if (isFormattedDate || highchartsRenderer.isDate(fieldnametoFilter)) {
8552
+ const isStringValue = typeof fieldnametoFilter === 'string';
8553
+ const isFormattedDateString = isStringValue && format && highchartsRenderer.isDateFormat(fieldnametoFilter, format);
8554
+ const isDateString = isStringValue && highchartsRenderer.isDate(fieldnametoFilter);
8555
+
8556
+ if (isFormattedDateString || isDateString) {
8552
8557
  const initialDateString = fieldnametoFilter;
8553
- if (isFormattedDate) {
8558
+ if (isFormattedDateString) {
8554
8559
  fieldnametoFilter = moment_lib(fieldnametoFilter, format, true).toISOString();
8555
8560
  }
8556
8561
  const dt = new Date(fieldnametoFilter);