Optional label in OpenHABOptions (#850)

timbms · web-flow · commit dd5553e6c9a8 · 2024-10-31T18:38:36.000+01:00
* OpenHABOptions label as optional string

Signed-off-by: Tim Bert &lt;5411131+timbms@users.noreply.github.com&gt;
diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABOptions.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABOptions.swift
@@ -13,5 +13,5 @@ import Foundation
 
 public class OpenHABOptions: Decodable {
     public var value = ""
-    public var label = ""
+    public var label: String?
 }
diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift
@@ -119,7 +119,7 @@ public class OpenHABWidget: NSObject, MKAnnotation, Identifiable {
         if mappings.isEmpty, let commandOptions = item?.commandDescription?.commandOptions {
             commandOptions.map { OpenHABWidgetMapping(command: $0.command, label: $0.label ?? "") }
         } else if mappings.isEmpty, let stateOptions = item?.stateDescription?.options {
-            stateOptions.map { OpenHABWidgetMapping(command: $0.value, label: $0.label) }
+            stateOptions.map { OpenHABWidgetMapping(command: $0.value, label: $0.label ?? "") }
         } else {
             mappings
         }
diff --git a/openHABWatch/Model/ObservableOpenHABWidget.swift b/openHABWatch/Model/ObservableOpenHABWidget.swift
@@ -97,7 +97,7 @@ class ObservableOpenHABWidget: NSObject, MKAnnotation, Identifiable, ObservableO
         if mappings.isEmpty, let commandOptions = item?.commandDescription?.commandOptions {
             commandOptions.map { OpenHABWidgetMapping(command: $0.command, label: $0.label ?? "") }
         } else if mappings.isEmpty, let stateOptions = item?.stateDescription?.options {
-            stateOptions.map { OpenHABWidgetMapping(command: $0.value, label: $0.label) }
+            stateOptions.map { OpenHABWidgetMapping(command: $0.value, label: $0.label ?? "") }
         } else {
             mappings
         }

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ import Foundation`
`13`	`13`
`14`	`14`	`public class OpenHABOptions: Decodable {`
`15`	`15`	`public var value = ""`
`16`		`- public var label = ""`
	`16`	`+ public var label: String?`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public class OpenHABWidget: NSObject, MKAnnotation, Identifiable {`
`119`	`119`	`if mappings.isEmpty, let commandOptions = item?.commandDescription?.commandOptions {`
`120`	`120`	`commandOptions.map { OpenHABWidgetMapping(command: $0.command, label: $0.label ?? "") }`
`121`	`121`	`} else if mappings.isEmpty, let stateOptions = item?.stateDescription?.options {`
`122`		`- stateOptions.map { OpenHABWidgetMapping(command: $0.value, label: $0.label) }`
	`122`	`+ stateOptions.map { OpenHABWidgetMapping(command: $0.value, label: $0.label ?? "") }`
`123`	`123`	`} else {`
`124`	`124`	`mappings`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ class ObservableOpenHABWidget: NSObject, MKAnnotation, Identifiable, ObservableO`
`97`	`97`	`if mappings.isEmpty, let commandOptions = item?.commandDescription?.commandOptions {`
`98`	`98`	`commandOptions.map { OpenHABWidgetMapping(command: $0.command, label: $0.label ?? "") }`
`99`	`99`	`} else if mappings.isEmpty, let stateOptions = item?.stateDescription?.options {`
`100`		`- stateOptions.map { OpenHABWidgetMapping(command: $0.value, label: $0.label) }`
	`100`	`+ stateOptions.map { OpenHABWidgetMapping(command: $0.value, label: $0.label ?? "") }`
`101`	`101`	`} else {`
`102`	`102`	`mappings`
`103`	`103`	`}`