@c8y/ngx-components 1024.19.5 → 1024.20.0

package/fesm2022/c8y-ngx-components-datapoints-export-selector.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, input, output, ChangeDetectionStrategy, Component, InjectionToken, Inject, computed, viewChild } from '@angular/core';
 import * as i2 from '@c8y/client';
 import * as i1 from '@c8y/ngx-components';
-import { AGGREGATION_VALUES, CoreModule, ModalModule, IconDirective, C8yTranslatePipe, CommonModule } from '@c8y/ngx-components';
+import { translateDatapointLabel, translateDatapointUnit, AGGREGATION_VALUES, CoreModule, ModalModule, IconDirective, C8yTranslatePipe, CommonModule } from '@c8y/ngx-components';
 import { gettext } from '@c8y/ngx-components/gettext';
 import * as i3 from '@ngx-translate/core';
 import JSZip from 'jszip';
@@ -538,6 +538,7 @@ class DataFetchingService {
     async fetchAndPrepareListExportData(exportConfig) {
         const { datapointDetails, dateFrom, dateTo } = exportConfig;
         const dataPromises = datapointDetails.map(async (detail) => {
+            const label = translateDatapointLabel(detail.label, this.translateService) || this.getSeriesName(detail);
             try {
                 // Fetch the latest measurement within the date range
                 const filter = {
@@ -551,17 +552,20 @@ class DataFetchingService {
                 };
                 const { data } = await this.measurementService.list(filter);
                 const measurement = data && data.length > 0 ? data[0] : null;
-                // Extract value and unit from measurement
+                // Extract value and unit from measurement. The unit configured for the data point wins:
+                // that is the one a tenant registers a translation for, the measurement only reports
+                // whatever the device sent.
                 let current = null;
-                let unit;
+                let rawUnit = detail.unit;
                 if (measurement) {
                     const fragment = measurement[detail.valueFragmentType];
                     if (fragment && fragment[detail.valueFragmentSeries]) {
                         const seriesData = fragment[detail.valueFragmentSeries];
                         current = seriesData.value != null ? Number(seriesData.value) : null;
-                        unit = seriesData.unit;
+                        rawUnit = rawUnit || seriesData.unit;
                     }
                 }
+                const unit = translateDatapointUnit(rawUnit, this.translateService);
                 // Calculate derived values using target from detail
                 const target = detail.target;
                 const diff = current !== null && current !== undefined && target !== null && target !== undefined
@@ -570,7 +574,7 @@ class DataFetchingService {
                 const diffPercent = target !== null && target !== undefined && diff !== null ? (diff / target) * 100 : null;
                 return {
                     ...detail,
-                    label: detail.label || this.getSeriesName(detail),
+                    label,
                     target: target ?? null,
                     current,
                     diff,
@@ -581,7 +585,7 @@ class DataFetchingService {
             catch {
                 return {
                     ...detail,
-                    label: detail.label || this.getSeriesName(detail),
+                    label,
                     target: detail.target ?? null,
                     current: null,
                     diff: null,