@c8y/ngx-components 1023.14.165 → 1023.14.168

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.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sources":["../../echart/models/datapoints-graph-widget.model.ts","../../echart/models/chart.model.ts","../../echart/models/svg-icons.model.ts","../../echart/charts.component.ts","../../echart/services/chart-alarms.service.ts","../../echart/services/chart-events.service.ts","../../echart/services/chart-helpers.service.ts","../../echart/select-aggregated-datapoint/select-aggregated-datapoint.component.ts"],"sourcesContent":[null,null,null,null,null,null,null,null],"names":[],"mappings":";;;;;;;;;;;;;;AAoBM;;;;AAKA;AACJ;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;;;;;;;;AASA;;AAEA;AACA;AACA;AACA;AACA;;;AAGA;;;;;;;;;;AAWI;;;;;;;;;;AAUJ;;;AAII;;AAEJ;AACA;;AAGI;;;AAIN;;AAEG;;AAGG;AAIN;AACE;AACA;AACD;AAED;AACM;;AAEL;AAED;;;;AAIM;;;;;;;AAQL;AAED;;;;;AAUE;;;;;AAGD;;AAGC;;AAEA;;AAEE;;AAEF;;;AACD;;;;;;;AAQC;AACA;AACD;AAEK;AACA;AAEA;AAEA;AAEN;;;;AAKA;;;;;;;;;;;;;AAcM;AACA;AAEA;;;;AAKA;;;;;;;;;;;;AAaL;AAED;;;;;;;;AAUE;AACA;AACD;;ACtND;;;;;;AAMG;AACH;AACE;;;;AAIA;;;AACD;;;AAIA;;;AAIA;AAEK;AACA;AACJ;AACE;AACD;AACF;;AAGC;AACA;AACD;AAED;AACE;AACA;AACA;AACD;;AC3CD;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACD;AAED;;;;;;;;;;;AC2DA;AA4BE;;AAEA;;;;;;;;AAQA;;;;;;AAMK;AACK;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEV;;;;;AAgBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;AA4DA;;;;;AAoKuB;;;AAA4B;AAiDnD;AAOA;AAIA;AAwBA;AA6BA;AAWA;;;;;;AAMG;AACH;AAoCA;;;;;AAKG;AACH;AA4BA;AAeA;AA0BA;;AA8DA;;;AA4OA;AAiEA;AAsDA;AAmBA;AAWA;AAYA;;;AA6BD;;AC3kCD;AAEc;AAAQ;AAEpB;;;;;AAKG;AACG;;;AAqCP;;AC/CD;AAEc;AAAQ;AAEpB;;;;;AAKG;AACG;;;AAuBP;;AChCD;AAEE;;;;AAIG;;;;;;;;;;;AAcH;AAcA;;;AAGD;;ACtBD;;AAqBW;AACC;AAEV;;AAGA;;;AAiBA;;;AAgBD;;;"}
1
+ {"version":3,"file":"index.d.ts","sources":["../../echart/models/datapoints-graph-widget.model.ts","../../echart/models/chart.model.ts","../../echart/models/svg-icons.model.ts","../../echart/charts.component.ts","../../echart/services/chart-alarms.service.ts","../../echart/services/chart-events.service.ts","../../echart/services/chart-helpers.service.ts","../../echart/select-aggregated-datapoint/select-aggregated-datapoint.component.ts"],"sourcesContent":[null,null,null,null,null,null,null,null],"names":[],"mappings":";;;;;;;;;;;;;;AAoBM;;;;AAKA;AACJ;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;;;;;;;;AASA;;AAEA;AACA;AACA;AACA;AACA;;;AAGA;;;;;;;;;;AAWI;;;;;;;;;;AAUJ;;;AAII;;AAEJ;AACA;;AAGI;;;AAIN;;AAEG;;AAGG;AAIN;AACE;AACA;AACD;AAED;AACM;;AAEL;AAED;;;;AAIM;;;;;;;AAQL;AAED;;;;;AAUE;;;;;AAGD;;AAGC;;AAEA;;AAEE;;AAEF;;;AACD;;;;;;;AAQC;AACA;AACD;AAEK;AACA;AAEA;AAEA;AAEN;;;;AAKA;;;;;;;;;;;;;AAcM;AACA;AAEA;;;;AAKA;;;;;;;;;;;;AAaL;AAED;;;;;;;;AAUE;AACA;AACD;;ACtND;;;;;;AAMG;AACH;AACE;;;;AAIA;;;AACD;;;AAIA;;;AAIA;AAEK;AACA;AACJ;AACE;AACD;AACF;;AAGC;AACA;AACD;AAED;AACE;AACA;AACA;AACD;;AC3CD;AACE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACD;AAED;;;;;;;;;;;AC2DA;AA4BE;;AAEA;;;;;;;;AAQA;;;;;;AAMK;AACK;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEV;;;;;AAgBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;AA4DA;;;;;AAoKuB;;;AAA4B;AAiDnD;AAOA;AAIA;AAwBA;AA6BA;AAWA;;;;;;AAMG;AACH;AAoCA;;;;;AAKG;AACH;AA4BA;AAeA;AA0BA;;AA8DA;;;AA4OA;AAyEA;AAwDA;AAmBA;AAWA;AAYA;;;AA6BD;;ACrlCD;AAEc;AAAQ;AAEpB;;;;;AAKG;AACG;;;AAqCP;;AC/CD;AAEc;AAAQ;AAEpB;;;;;AAKG;AACG;;;AAuBP;;AChCD;AAEE;;;;AAIG;;;;;;;;;;;AAcH;AAcA;;;AAGD;;ACtBD;;AAqBW;AACC;AAEV;;AAGA;;;AAiBA;;;AAgBD;;;"}
@@ -811,8 +811,11 @@ class EchartsOptionsService {
811
811
  const XAxisValue = tooltipParams[0].data[0];
812
812
  const YAxisReadings = [];
813
813
  const allSeries = this.echartsInstance?.getOption()['series'];
814
- // filter out alarm and event series
815
- const allDataPointSeries = allSeries.filter(series => series['typeOfSeries'] !== 'alarm' && series['typeOfSeries'] !== 'event');
814
+ const legendSelected = this.echartsInstance?.getOption()['legend']?.[0]?.selected;
815
+ // filter out alarm, event, and hidden series
816
+ const allDataPointSeries = allSeries.filter(series => series['typeOfSeries'] !== 'alarm' &&
817
+ series['typeOfSeries'] !== 'event' &&
818
+ legendSelected?.[series['name']] !== false);
816
819
  this.processSeries(allDataPointSeries, XAxisValue, YAxisReadings, displayOptions);
817
820
  // find event and alarm of the same type as the hovered markedLine or markedPoint
818
821
  const event = allEvents.find(e => e.type === params.data.itemType && params.data.value === e.time);
@@ -1461,9 +1464,11 @@ class EchartsOptionsService {
1461
1464
  const XAxisValue = data[0];
1462
1465
  const YAxisReadings = [];
1463
1466
  const allSeries = this.echartsInstance?.getOption()['series'];
1467
+ const legendSelected = this.echartsInstance?.getOption()['legend']?.[0]?.selected;
1464
1468
  const allDataPointSeries = allSeries.filter(series => series['typeOfSeries'] !== 'alarm' &&
1465
1469
  series['typeOfSeries'] !== 'event' &&
1466
- series['typeOfSeries'] !== 'fake');
1470
+ series['typeOfSeries'] !== 'fake' &&
1471
+ legendSelected?.[series['name']] !== false);
1467
1472
  allDataPointSeries.forEach((series) => {
1468
1473
  let value;
1469
1474
  const id = series['id'];
@@ -1728,6 +1733,14 @@ class ChartRealtimeService {
1728
1733
  if (!seriesMatchingDatapoint) {
1729
1734
  return;
1730
1735
  }
1736
+ // If the datapoint already has a unit (e.g. from config), keep it. Otherwise, try to get it from the realtime measurement.
1737
+ if (!seriesMatchingDatapoint['datapointUnit'] && measurements.length > 0) {
1738
+ const unit = measurements[0]?.[datapoint.fragment]?.[datapoint.series].unit;
1739
+ if (unit) {
1740
+ const renderType = datapoint.renderType || 'min';
1741
+ seriesMatchingDatapoint['datapointUnit'] = renderType !== 'count' ? unit : '';
1742
+ }
1743
+ }
1731
1744
  const seriesDataToUpdate = seriesMatchingDatapoint['data'];
1732
1745
  let lastExistingTimestamp = seriesDataToUpdate.length
1733
1746
  ? new Date(seriesDataToUpdate[seriesDataToUpdate.length - 1][0]).valueOf()
@@ -2712,7 +2725,7 @@ class ChartsComponent {
2712
2725
  }
2713
2726
  this.updateActiveDatapoints.emit(this.activeDatapoints);
2714
2727
  const datapointsWithValuesRequests = [];
2715
- const timeRange = this.getTimeRange(60_000);
2728
+ const timeRange = this.getTimeRange();
2716
2729
  for (const dp of this.activeDatapoints) {
2717
2730
  const request = defer(() => this.measurementService.listSeries({
2718
2731
  revert: true,
@@ -2739,6 +2752,13 @@ class ChartsComponent {
2739
2752
  this.alerts.clear();
2740
2753
  }
2741
2754
  }
2755
+ // If the datapoint already has a unit (e.g. from config), keep it. Otherwise, try to get it from the series response.
2756
+ if (!dp.unit) {
2757
+ const unitFromSeries = res.data.series[0]?.unit;
2758
+ if (unitFromSeries) {
2759
+ dp.unit = unitFromSeries;
2760
+ }
2761
+ }
2742
2762
  return { ...dp, values, truncated: res.data.truncated };
2743
2763
  }));
2744
2764
  datapointsWithValuesRequests.push(request);
@@ -2751,7 +2771,9 @@ class ChartsComponent {
2751
2771
  }));
2752
2772
  }
2753
2773
  fetchAggregatedSeriesForSelectedDatapoint$(customTimeRange, aggregatedDatapoint) {
2754
- const timeRange = this.getTimeRange(60_000);
2774
+ const { dateTo: unpaddedDateTo } = this.getTimeRange();
2775
+ const { dateFrom: paddedDateFrom } = this.getTimeRange(60_000);
2776
+ const timeRange = { dateFrom: paddedDateFrom, dateTo: unpaddedDateTo };
2755
2777
  aggregatedDatapoint = aggregatedDatapoint
2756
2778
  ? aggregatedDatapoint
2757
2779
  : this.config?.datapoints?.filter(dp => dp.__active)[0];