fix: duplicate checkbox for pwm fan (fixes #799) (#802)

Co-authored-by: Stefan Dej <[email protected]>
mainsail-crew · May 15, 2022 · 9791202 · 9791202
1 parent 087d9b7
commit 9791202
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/src/components/charts/TempChart.vue b/src/components/charts/TempChart.vue
@@ -47,7 +47,7 @@ export default class TempChart extends Mixins(BaseMixin) {
                 fontSize: '14px',
             },
             padding: 15,
-            formatter: this.tooltipFormater,
+            formatter: this.tooltipFormatter,
             confine: true,
             className: 'echarts-tooltip',
             position: function (pos: any, params: any, dom: any, rect: any, size: any) {
@@ -297,21 +297,17 @@ export default class TempChart extends Mixins(BaseMixin) {
         }
     }
 
-    tooltipFormater(datasets: any) {
+    tooltipFormatter(datasets: any) {
         let output = ''
 
         const mainDatasets = datasets.filter((dataset: any) => {
             if (dataset.seriesName === 'date') return false
-            if (dataset.seriesName.includes('-')) {
-                if (dataset.seriesName.lastIndexOf('-') > -1) {
-                    const suffix = dataset.seriesName.slice(dataset.seriesName.lastIndexOf('-') + 1)
-                    return !['target', 'power'].includes(suffix)
-                }
 
-                return true
-            }
+            const lastIndex = dataset.seriesName.lastIndexOf('-')
+            if (lastIndex === -1) return true
 
-            return true
+            const suffix = dataset.seriesName.slice(lastIndex + 1)
+            return !['target', 'power', 'speed'].includes(suffix)
         })
         if (datasets.length) {
             let outputTime = datasets[0]['axisValueLabel']

diff --git a/src/store/printer/tempHistory/actions.ts b/src/store/printer/tempHistory/actions.ts
@@ -106,12 +106,12 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
             const masterDatasetKeys = tempDatasetKeys
                 .filter((tmp) => {
                     if (tmp.startsWith('_')) return false
-                    if (tmp.lastIndexOf('-') > -1) {
-                        const suffix = tmp.slice(tmp.lastIndexOf('-') + 1)
-                        return !['target', 'power'].includes(suffix)
-                    }
 
-                    return true
+                    const lastIndex = tmp.lastIndexOf('-')
+                    if (lastIndex === -1) return true
+
+                    const suffix = tmp.slice(lastIndex + 1)
+                    return !['target', 'power', 'speed'].includes(suffix)
                 })
                 .sort()
             const series: PrinterTempHistoryStateSerie[] = []