Fix: Use custom feature name in non-binary charts (#2126)

GladysAssistant · Oct 9, 2024 · 7b512fb · 7b512fb
1 parent 2b8e274
commit 7b512fb
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/front/src/components/boxs/chart/Chart.jsx b/front/src/components/boxs/chart/Chart.jsx
@@ -192,9 +192,11 @@ class Chartbox extends Component {
         series = data.map((oneFeature, index) => {
           const oneUnit = this.props.box.units ? this.props.box.units[index] : this.props.box.unit;
           const oneUnitTranslated = oneUnit ? this.props.intl.dictionary.deviceFeatureUnitShort[oneUnit] : null;
-          const { values, deviceFeature } = oneFeature;
-          const deviceName = deviceFeature.name;
-          const name = oneUnitTranslated ? `${deviceName} (${oneUnitTranslated})` : deviceName;
+          const { values, deviceFeature, device } = oneFeature;
+          const deviceFeatureName = deviceFeatureNames
+            ? deviceFeatureNames[index]
+            : getDeviceName(device, deviceFeature);
+          const name = oneUnitTranslated ? `${deviceFeatureName} (${oneUnitTranslated})` : deviceFeatureName;
           return {
             name,
             data: values.map(value => {