Skip to content
This repository was archived by the owner on Feb 8, 2024. It is now read-only.

Add optionLabels for dropdowns #120

Merged
merged 1 commit into from
Nov 6, 2021
Merged

Add optionLabels for dropdowns #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions gui/js/comp/ControlItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}<option value={props.conditionalAttributes.options[i]}>{props.conditionalAttributes.options[i]}</option></>;
}
let optionLabel = props.conditionalAttributes.options[i];
if (typeof props.conditionalAttributes.optionLabels[i] !== "undefined") {
optionLabel = props.conditionalAttributes.optionLabels[i];
}

options = <>{options}<option value={props.conditionalAttributes.options[i]}>{optionLabel}</option></>;
}

if (!isOption) {
Expand Down
9 changes: 7 additions & 2 deletions gui/js/comp/DashboardItems.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ export function DashboardItems(props) {

case "select":
conditionalAttributes.options = props.items[i].options;
conditionalAttributes.optionLabels = props.items[i].optionLabels;
break;
}

Expand Down Expand Up @@ -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}<option value={conditionalAttributes.options[i]}>{conditionalAttributes.options[i]}</option></>;
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}<option value={conditionalAttributes.options[i]}>{label}</option></>;
}
confItems = <>{confItems}
<p>
Expand Down