OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sitemap editor: Remove sendFrequency parameter (#2705) 

See
https://github.com/openhab/openhab-core/issues/4338#issuecomment-2283251553

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
pull/2706/head
Mark Herwege 2024-08-12 10:55:12 +02:00 committed by GitHub
parent be71ace313
commit 175b639937
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.ui/web/src/assets/sitemap-lexer.nearley
View File

@ -11,7 +11,6 @@
icon: 'icon=',
widgetattr: ['url=', 'refresh=', 'service=', 'height=', 'minValue=', 'maxValue=', 'step=', 'encoding=', 'yAxisDecimalPattern=', 'inputHint=', 'columns='],
widgetboolattr: ['legend='],
widgetfreqattr: 'sendFrequency=',
widgetfrcitmattr: 'forceasitem=',
widgetmapattr: 'mappings=',
widgetbuttonattr: 'buttons=',
@ -116,7 +115,6 @@ WidgetAttr -> %widgetswitchattr
| %widgetronlyattr {% (d) => ['releaseOnly', true] %}
| %widgetfrcitmattr _ WidgetBooleanAttrValue {% (d) => ['forceAsItem', d[2]] %}
| %widgetboolattr _ WidgetBooleanAttrValue {% (d) => [d[0].value, d[2]] %}
| %widgetfreqattr _ WidgetAttrValue {% (d) => ['frequency', d[2]] %}
| %widgetperiodattr _ WidgetPeriodAttrValue {% (d) => ['period', d[2]] %}
| %icon _ WidgetIconRulesAttrValue {% (d) => ['iconrules', d[2]] %}
| %icon _ WidgetIconAttrValue {% (d) => [d[0].value, d[2].join("")] %}

2
bundles/org.openhab.ui/web/src/components/pagedesigner/sitemap/dslUtil.js
View File

@ -9,8 +9,6 @@ function writeWidget (widget, indent) {
dsl += ' switchSupport'
} else if (key === 'releaseOnly') {
dsl += ' releaseOnly'
} else if (key === 'frequency') {
dsl += ' sendFrequency=' + widget.config[key]
} else if (key === 'forceAsItem') {
dsl += ' forceasitem=' + widget.config[key]
} else if (key === 'icon') {

4
bundles/org.openhab.ui/web/src/components/pagedesigner/sitemap/widget-details.vue
View File

@ -28,7 +28,6 @@
validate pattern="^((P(\d+Y)?(\d+M)?(\d+W)?(\d+D)?(T(\d+H)?(\d+M)?(\d+S)?)?|\d*[YMWDh])-)?-?(P(\d+Y)?(\d+M)?(\d+W)?(\d+D)?(T(\d+H)?(\d+M)?(\d+S)?)?|\d*[YMWDh])$"
:value="widget.config.period" @input="updateParameter('period', $event)" clear-button />
<f7-list-input v-if="supports('height')" label="Height" type="number" :value="widget.config.height" @input="updateParameter('height', $event)" clear-button />
<f7-list-input v-if="supports('sendFrequency')" label="Frequency" type="number" :value="widget.config.sendFrequency" @input="updateParameter('sendFrequency', $event)" clear-button />
<f7-list-input v-if="supports('minValue')" label="Minimum" type="number" :value="widget.config.minValue" @input="updateParameter('minValue', $event)" clear-button />
<f7-list-input v-if="supports('maxValue')" label="Maximum" type="number" :value="widget.config.maxValue" @input="updateParameter('maxValue', $event)" clear-button />
<f7-list-input v-if="supports('step')" label="Step" type="number" :value="widget.config.step" @input="updateParameter('step', $event)" clear-button />
@ -91,9 +90,8 @@ export default {
Chart: ['service', 'period', 'refresh', 'legend', 'forceAsItem', 'yAxisDecimalPattern'],
Webview: ['url', 'height'],
Mapview: ['height'],
Slider: ['sendFrequency', 'switchEnabled', 'releaseOnly', 'minValue', 'maxValue', 'step'],
Slider: ['switchEnabled', 'releaseOnly', 'minValue', 'maxValue', 'step'],
Setpoint: ['minValue', 'maxValue', 'step'],
Colorpicker: ['sendFrequency'],
Input: ['inputHint'],
Default: ['height']
},