From 9b2e7c78b0ceadc1092d02e126618fc0499ef66f Mon Sep 17 00:00:00 2001 From: Ben Klopfenstein Date: Thu, 12 Aug 2021 02:19:33 -0600 Subject: [PATCH] Add optionLabels --- gui/js/comp/ControlItem.js | 9 +++++++-- gui/js/comp/DashboardItems.js | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gui/js/comp/ControlItem.js b/gui/js/comp/ControlItem.js index ed52f92..dc4db21 100644 --- a/gui/js/comp/ControlItem.js +++ b/gui/js/comp/ControlItem.js @@ -97,8 +97,13 @@ export function ControlItem(props) { for (let i = 0; i < props.conditionalAttributes.options.length; i++) { if (data == props.conditionalAttributes.options[i]) { isOption = true; - } - options = <>{options}; + } + let optionLabel = props.conditionalAttributes.options[i]; + if (typeof props.conditionalAttributes.optionLabels[i] !== "undefined") { + optionLabel = props.conditionalAttributes.optionLabels[i]; + } + + options = <>{options}; } if (!isOption) { diff --git a/gui/js/comp/DashboardItems.js b/gui/js/comp/DashboardItems.js index 658be99..6fa491d 100644 --- a/gui/js/comp/DashboardItems.js +++ b/gui/js/comp/DashboardItems.js @@ -175,6 +175,7 @@ export function DashboardItems(props) { case "select": conditionalAttributes.options = props.items[i].options; + conditionalAttributes.optionLabels = props.items[i].optionLabels; break; } @@ -213,8 +214,12 @@ export function DashboardItems(props) { case "config": if (inputType == "select") { let options; - for (let i = 0; i < conditionalAttributes.options.length; i++) { - options = <>{options}; + for (let i = 0; i < conditionalAttributes.options.length; i++) { + let label = conditionalAttributes.options[i]; + if (typeof conditionalAttributes.optionLabels[i] !== "undefined") { + label = conditionalAttributes.optionLabels[i]; + } + options = <>{options}; } confItems = <>{confItems}