From 5b661286590bd3161831419049835809173e176b Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Thu, 4 Apr 2024 10:24:17 +0200 Subject: [PATCH] fix: fix case sensibility for printer power device (#1827) --- src/components/mixins/base.ts | 10 +++++++--- src/components/settings/SettingsUiSettingsTab.vue | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/components/mixins/base.ts b/src/components/mixins/base.ts index c21c665b4..4aabadbc8 100644 --- a/src/components/mixins/base.ts +++ b/src/components/mixins/base.ts @@ -52,10 +52,14 @@ export default class BaseMixin extends Vue { } get printerPowerDevice(): string { - let deviceName = this.$store.state.gui.uiSettings.powerDeviceName ?? null - if (deviceName === null) deviceName = 'printer' + const deviceName = this.$store.state.gui.uiSettings.powerDeviceName ?? null + if (deviceName !== null) return deviceName - return deviceName + const devices = this.$store.getters['server/power/getDevices'] ?? [] + return ( + devices.find((device: ServerPowerStateDevice) => device.device.toLowerCase() === 'printer')?.device ?? + 'printer' + ) } get isPrinterPowerOff() { diff --git a/src/components/settings/SettingsUiSettingsTab.vue b/src/components/settings/SettingsUiSettingsTab.vue index 96d4a7556..8f26db6e2 100644 --- a/src/components/settings/SettingsUiSettingsTab.vue +++ b/src/components/settings/SettingsUiSettingsTab.vue @@ -445,10 +445,10 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) { } get autoPowerDevice() { - const autoIndex = this.powerDevices.findIndex((device: ServerPowerStateDevice) => device.device === 'printer') - if (autoIndex === -1) return '--' - - return this.powerDevices[autoIndex].device + return ( + this.powerDevices.find((device: ServerPowerStateDevice) => device.device.toLowerCase() === 'printer') + ?.device ?? '--' + ) } get powerDeviceName() {