From 5162a18cfbcf2f67f64ce909bc6f5c47c352a33c Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Sun, 9 Jun 2024 18:55:01 +0200 Subject: [PATCH 1/3] chore: update echarts to v5.5.0 Signed-off-by: Stefan Dej --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 52d3e1bd8..060932a20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "codemirror": "^6.0.1", "core-js": "^3.16.0", "detect-browser": "^5.3.0", - "echarts": "^5.2.2", + "echarts": "^5.5.0", "echarts-gl": "^2.0.8", "hls.js": "^1.3.3", "jmuxer": "^2.0.5", @@ -5396,12 +5396,12 @@ } }, "node_modules/echarts": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz", - "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.5.0.tgz", + "integrity": "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==", "dependencies": { "tslib": "2.3.0", - "zrender": "5.4.4" + "zrender": "5.5.0" } }, "node_modules/echarts-gl": { @@ -10838,9 +10838,9 @@ } }, "node_modules/zrender": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz", - "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.5.0.tgz", + "integrity": "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==", "dependencies": { "tslib": "2.3.0" } diff --git a/package.json b/package.json index 602ea0568..f6ab5fa6d 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "codemirror": "^6.0.1", "core-js": "^3.16.0", "detect-browser": "^5.3.0", - "echarts": "^5.2.2", + "echarts": "^5.5.0", "echarts-gl": "^2.0.8", "hls.js": "^1.3.3", "jmuxer": "^2.0.5", From 27a871fdd36e6075f37e120d29b98c7854fb9f92 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Sun, 9 Jun 2024 19:00:11 +0200 Subject: [PATCH 2/3] refactor: simplify select legends action Signed-off-by: Stefan Dej --- src/components/charts/TempChart.vue | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/components/charts/TempChart.vue b/src/components/charts/TempChart.vue index 80fa415aa..2fe69636a 100644 --- a/src/components/charts/TempChart.vue +++ b/src/components/charts/TempChart.vue @@ -347,15 +347,8 @@ export default class TempChart extends Mixins(BaseMixin, ThemeMixin) { } @Watch('selectedLegends') - selectedLegendsChanged(newVal: any, oldVal: any) { - if (this.chart?.isDisposed() !== true) { - Object.keys(newVal).forEach((key) => { - if (newVal[key] !== oldVal[key]) { - const actionType = newVal[key] ? 'legendSelect' : 'legendUnSelect' - this.chart?.dispatchAction({ type: actionType, name: key }) - } - }) - } + selectedLegendsChanged(newVal: any) { + if (this.chart?.isDisposed() !== true) this.chart?.setOption({ legend: { selected: newVal } }) } @Watch('source') From 2a7816a779345ba1019d6e1a2a7ec5496995bcf9 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Sun, 9 Jun 2024 19:01:35 +0200 Subject: [PATCH 3/3] fix: add available_monitors to sensors check in getSelectedLegends check Signed-off-by: Stefan Dej --- src/store/printer/tempHistory/getters.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/store/printer/tempHistory/getters.ts b/src/store/printer/tempHistory/getters.ts index d9b591efd..ab74bbbe5 100644 --- a/src/store/printer/tempHistory/getters.ts +++ b/src/store/printer/tempHistory/getters.ts @@ -99,11 +99,12 @@ export const getters: GetterTree = { const selected: legends = {} const available_sensors = rootState.printer?.heaters?.available_sensors ?? [] + const available_monitors = rootState.printer?.heaters?.available_monitors ?? [] const viewSettings = rootState.gui?.view?.tempchart?.datasetSettings ?? {} Object.keys(viewSettings).forEach((key) => { // break if this element doesn't exist in available_sensors - if (!available_sensors.includes(key)) return + if (!available_sensors.includes(key) && !available_monitors.includes(key)) return Object.keys(viewSettings[key]).forEach((attrKey) => { // break if this element isn't a valid datasetType