Add Input widget to main UI sitemap configuration and REST API (openh…

…ab#3431) * add input widget to UI SitemapProviderImpl * inputHint in UIComponentSitemapProvider * add input element to REST Signed-off-by: Mark Herwege <mark.herwege@telenet.be> GitOrigin-RevId: 44a146f
ConnectorIO · Jul 12, 2023 · e44b96f · e44b96f
1 parent 51db37e
commit e44b96f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/...rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java b/...rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java
@@ -75,6 +75,7 @@
 import org.openhab.core.model.sitemap.sitemap.ColorArray;
 import org.openhab.core.model.sitemap.sitemap.Frame;
 import org.openhab.core.model.sitemap.sitemap.Image;
+import org.openhab.core.model.sitemap.sitemap.Input;
 import org.openhab.core.model.sitemap.sitemap.LinkableWidget;
 import org.openhab.core.model.sitemap.sitemap.Mapping;
 import org.openhab.core.model.sitemap.sitemap.Mapview;
@@ -558,6 +559,10 @@ private PageDTO createPageBean(String sitemapName, @Nullable String title, @Null
                 bean.mappings.add(mappingBean);
             }
         }
+        if (widget instanceof Input) {
+            Input inputWidget = (Input) widget;
+            bean.inputHint = inputWidget.getInputHint();
+        }
         if (widget instanceof Slider) {
             Slider sliderWidget = (Slider) widget;
             bean.sendFrequency = sliderWidget.getFrequency();

diff --git a/...re.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java b/...re.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java
@@ -47,6 +47,7 @@ public class WidgetDTO {
     public BigDecimal minValue;
     public BigDecimal maxValue;
     public BigDecimal step;
+    public String inputHint;
     public String url;
     public String encoding;
     public String service;

diff --git a/....ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java b/....ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java
@@ -45,6 +45,7 @@
 import org.openhab.core.model.sitemap.sitemap.impl.FrameImpl;
 import org.openhab.core.model.sitemap.sitemap.impl.GroupImpl;
 import org.openhab.core.model.sitemap.sitemap.impl.ImageImpl;
+import org.openhab.core.model.sitemap.sitemap.impl.InputImpl;
 import org.openhab.core.model.sitemap.sitemap.impl.MappingImpl;
 import org.openhab.core.model.sitemap.sitemap.impl.MapviewImpl;
 import org.openhab.core.model.sitemap.sitemap.impl.SelectionImpl;
@@ -235,6 +236,11 @@ protected Sitemap buildSitemap(RootUIComponent rootComponent) {
                 addWidgetMappings(selectionWidget.getMappings(), component);
                 widget = selectionWidget;
                 break;
+            case "Input":
+                InputImpl inputWidget = (InputImpl) SitemapFactory.eINSTANCE.createInput();
+                widget = inputWidget;
+                setWidgetPropertyFromComponentConfig(widget, component, "inputHint", SitemapPackage.INPUT__INPUT_HINT);
+                break;
             case "Setpoint":
                 SetpointImpl setpointWidget = (SetpointImpl) SitemapFactory.eINSTANCE.createSetpoint();
                 widget = setpointWidget;