From b5c92cbcab2a83b4abbc5f19e4c12bfa7679f18c Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Sun, 19 Jun 2022 12:20:23 +0200
Subject: [PATCH] fix: fix typo in adding new heaters/temperature_fans to chart
 dataset (#918)

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/store/printer/tempHistory/actions.ts | 11 ++++++-----
 src/store/printer/tempHistory/getters.ts | 20 ++++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/store/printer/tempHistory/actions.ts b/src/store/printer/tempHistory/actions.ts
index a22bb501..8c622c49 100644
--- a/src/store/printer/tempHistory/actions.ts
+++ b/src/store/printer/tempHistory/actions.ts
@@ -26,6 +26,7 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
         dispatch('reset')
 
         const now = new Date()
+        const allHeaters = rootGetters['printer/getAvailableHeaters'] ?? []
         const allSensors = rootGetters['printer/getAvailableSensors'] ?? []
         const maxHistory = rootGetters['printer/tempHistory/getTemperatureStoreSize']
 
@@ -62,18 +63,18 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
                     const addValues: {
                         temperatures: number[]
                         targets?: number[]
-                        power?: number[]
-                        speed?: number[]
+                        powers?: number[]
+                        speeds?: number[]
                     } = {
                         temperatures: Array(maxHistory).fill(0),
                     }
 
-                    if (['heater_bed', 'heater_generic'].includes(sensorType) || sensorType.startsWith('extruder')) {
+                    if (allHeaters.includes(key)) {
                         addValues.targets = Array(maxHistory).fill(0)
-                        addValues.power = Array(maxHistory).fill(0)
+                        addValues.powers = Array(maxHistory).fill(0)
                     } else if (['temperature_fan'].includes(sensorType)) {
                         addValues.targets = Array(maxHistory).fill(0)
-                        addValues.speed = Array(maxHistory).fill(0)
+                        addValues.speeds = Array(maxHistory).fill(0)
                     }
 
                     importData[key] = { ...addValues }
diff --git a/src/store/printer/tempHistory/getters.ts b/src/store/printer/tempHistory/getters.ts
index 144bd26e..208fc680 100644
--- a/src/store/printer/tempHistory/getters.ts
+++ b/src/store/printer/tempHistory/getters.ts
@@ -20,16 +20,20 @@ export const getters: GetterTree<PrinterTempHistoryState, RootState> = {
 
     getSerieNames: (state) => (name: string) => {
         const output: string[] = []
+        const seriesKeys = state.series
+            .map((serie: PrinterTempHistoryStateSerie) => serie.name)
+            .filter((serieName) => serieName.startsWith(name))
 
-        if (state.series.findIndex((serie: PrinterTempHistoryStateSerie) => serie.name === name) !== -1) {
-            output.push('temperature')
-        }
+        seriesKeys.forEach((seriesKey) => {
+            if (seriesKey === name) {
+                output.push('temperature')
+                return
+            }
 
-        state.series
-            .filter((serie: PrinterTempHistoryStateSerie) => serie.name.startsWith(name + '-'))
-            .forEach((serie) => {
-                output.push(serie.name.substr(name.length + 1))
-            })
+            if (seriesKey.startsWith(name + '-')) {
+                output.push(seriesKey.slice(name.length + 1))
+            }
+        })
 
         return output
     },