From a9c8e3a3d14ebae3fc05bf7c9c290e1f627fdf0c Mon Sep 17 00:00:00 2001 From: robertsLando Date: Thu, 16 Jan 2025 14:16:12 +0100 Subject: [PATCH] fix: do not allow to set `Unknown` and `Default (EU)` regions Ref: https://github.com/zwave-js/node-zwave-js/discussions/7133 --- api/lib/ZwaveClient.ts | 3 +++ src/components/nodes-table/NodeDetails.vue | 6 +----- src/lib/items.js | 11 ++++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/lib/ZwaveClient.ts b/api/lib/ZwaveClient.ts index fc69c591d1f..13248118a87 100644 --- a/api/lib/ZwaveClient.ts +++ b/api/lib/ZwaveClient.ts @@ -6137,6 +6137,9 @@ class ZwaveClient extends TypedEventEmitter { ?.map((region) => ({ value: region, text: getEnumMemberName(RFRegion, region), + disabled: + region === RFRegion.Unknown || + region === RFRegion['Default (EU)'], })) .sort((a, b) => a.text.localeCompare(b.text)) ?? [] } diff --git a/src/components/nodes-table/NodeDetails.vue b/src/components/nodes-table/NodeDetails.vue index 57619603974..a868c52a1d4 100644 --- a/src/components/nodes-table/NodeDetails.vue +++ b/src/components/nodes-table/NodeDetails.vue @@ -78,11 +78,7 @@ - + ({ text: key, value: RFRegion[key], + disabled: + RFRegion[key] === RFRegion.Unknown || + RFRegion[key] === RFRegion['Default (EU)'], })) - .filter( - (region) => - region.value !== RFRegion.Unknown && - region.value !== RFRegion['Default (EU)'], - ) .sort((a, b) => a.text.localeCompare(b.text)) export const znifferRegions = Object.keys(ZnifferRegion) @@ -19,6 +17,9 @@ export const znifferRegions = Object.keys(ZnifferRegion) .map((key) => ({ text: key, value: ZnifferRegion[key], + disabled: + RFRegion[key] === RFRegion.Unknown || + RFRegion[key] === RFRegion['Default (EU)'], })) .sort((a, b) => a.text.localeCompare(b.text))