Support configuring Input element for sitemaps (#1735)

openhab/openhab-core#3398 added an Input element to sitemaps. This adds support for configuring this element to MainUI. A PR for BasicUI to support input elements is in progress (#1729). Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
openhab · Feb 28, 2023 · a028d1c · a028d1c
1 parent 27eeefc
commit a028d1c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/bundles/org.openhab.ui/web/src/assets/sitemap-lexer.nearley b/bundles/org.openhab.ui/web/src/assets/sitemap-lexer.nearley
@@ -17,7 +17,7 @@
     widgetvisiattr:   'visibility=',
     widgetcolorattr:  ['labelcolor=', 'valuecolor=', 'iconcolor='],
     widgetswitchattr: 'switchSupport',
-    nlwidget:         ['Switch ', 'Selection ', 'Slider ', 'List ', 'Setpoint ', 'Video ', 'Chart ', 'Webview ', 'Colorpicker ', 'Mapview ', 'Default '],
+    nlwidget:         ['Switch ', 'Selection ', 'Slider ', 'List ', 'Setpoint ', 'Input ', 'Video ', 'Chart ', 'Webview ', 'Colorpicker ', 'Mapview ', 'Default '],
     lwidget:          ['Text ', 'Group ', 'Image ', 'Frame '],
     identifier:       /[A-Za-z0-9_]+/,
     lparen:           '(',
@@ -37,7 +37,7 @@
     comma:            ',',
     NL:               { match: /\n/, lineBreaks: true }
   })
-  const requiresItem = ['Group', 'Chart', 'Switch', 'Mapview', 'Slider', 'Selection', 'List', 'Setpoint', 'Colorpicker', 'Default']
+  const requiresItem = ['Group', 'Chart', 'Switch', 'Mapview', 'Slider', 'Selection', 'List', 'Setpoint', 'Input ', 'Colorpicker', 'Default']
 
   function getSitemap(d) {
     return {

diff --git a/bundles/org.openhab.ui/web/src/components/pagedesigner/sitemap/treeview-item.vue b/bundles/org.openhab.ui/web/src/components/pagedesigner/sitemap/treeview-item.vue
@@ -32,6 +32,8 @@ export default {
           return 'f7:square_list'
         case 'Setpoint':
           return 'f7:plus_slash_minus'
+        case 'Input':
+          return 'f7:text_cursor'
         case 'Video':
           return 'f7:videocam'
         case 'Chart':

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/pages/sitemap/sitemap-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/pages/sitemap/sitemap-edit.vue
@@ -242,6 +242,7 @@ export default {
         { type: 'Slider', icon: 'slider_horizontal_3' },
         { type: 'Frame', icon: 'macwindow' },
         { type: 'Setpoint', icon: 'plus_slash_minus' },
+        { type: 'Input', icon: 'text_cursor' },
         { type: 'Default', icon: 'rectangle' },
         { type: 'Group', icon: 'square_stack_3d_down_right' },
         { type: 'Chart', icon: 'chart_bar_square' },
@@ -253,7 +254,7 @@ export default {
         { type: 'Video', icon: 'videocam' }
       ],
       linkableWidgetTypes: ['Sitemap', 'Text', 'Frame', 'Group', 'Image'],
-      widgetTypesRequiringItem: ['Group', 'Chart', 'Switch', 'Mapview', 'Slider', 'Selection', 'List', 'Setpoint', 'Colorpicker', 'Default']
+      widgetTypesRequiringItem: ['Group', 'Chart', 'Switch', 'Mapview', 'Slider', 'Selection', 'List', 'Setpoint', 'Input', 'Colorpicker', 'Default']
     }
   },
   created () {