100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI updates: Bug fix for modifying configuration items
Rich Turner71cb493f1882
diff --git a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts b/ui/component/or-asset-viewer/src/or-edit-asset-panel.tsindex 19cc13855..1517b4ffd 100644--- a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts+++ b/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts@@ -1,5 +1,5 @@import {css, customElement, html, LitElement, property, TemplateResult, unsafeCSS} from "lit-element";-import {InputType, OrInput, OrInputChangedEvent, getValueHolderInputTemplateProvider, ValueInputProviderOptions} from "@openremote/or-input";+import {InputType, OrInput, OrInputChangedEvent, getValueHolderInputTemplateProvider, ValueInputProviderOptions, OrInputChangedEventDetail} from "@openremote/or-input";import i18next from "i18next";import {Asset, Attribute, NameValueHolder} from "@openremote/model";import {AssetModelUtil, DefaultColor5, Util} from "@openremote/core";@@ -252,8 +252,9 @@ export class OrEditAssetPanel extends LitElement {this._onModified();}- protected _onMetaItemModified(metaItem: NameValueHolder<any>, value: any) {- metaItem.value = value;+ protected _onMetaItemModified(attribute: Attribute<any>, metaItem: NameValueHolder<any>, detail: OrInputChangedEventDetail) {+ metaItem.value = detail.value;+ attribute.meta![metaItem.name!] = detail.value;this._onModified();}@@ -274,7 +275,7 @@ export class OrEditAssetPanel extends LitElement {const options: ValueInputProviderOptions = {label: Util.getMetaLabel(metaItem, descriptor!, this.asset.type!, true)};- const provider = getValueHolderInputTemplateProvider(this.asset.type!, metaItem, descriptor, valueDescriptor, (v: any) => this._onMetaItemModified(metaItem, v), options);+ const provider = getValueHolderInputTemplateProvider(this.asset.type!, metaItem, descriptor, valueDescriptor, (detail: OrInputChangedEventDetail) => this._onMetaItemModified(attribute, metaItem, detail), options);if (provider.templateFunction) {content = provider.templateFunction(metaItem.value, false, false, false, false, undefined);diff --git a/ui/component/or-attribute-input/src/index.ts b/ui/component/or-attribute-input/src/index.tsindex 4922f85ea..03e7784dd 100644--- a/ui/component/or-attribute-input/src/index.ts+++ b/ui/component/or-attribute-input/src/index.ts@@ -23,7 +23,7 @@ import {} from "@openremote/model";import manager, {AssetModelUtil, DefaultColor4, subscribe, Util} from "@openremote/core";import "@openremote/or-input";-import {InputType, OrInput, OrInputChangedEvent, ValueInputProviderOptions, ValueInputProviderGenerator, getValueHolderInputTemplateProvider, ValueInputProvider} from "@openremote/or-input";+import {InputType, OrInput, OrInputChangedEvent, ValueInputProviderOptions, ValueInputProviderGenerator, getValueHolderInputTemplateProvider, ValueInputProvider, OrInputChangedEventDetail} from "@openremote/or-input";import "@openremote/or-map";import { geoJsonPointInputTemplateProvider } from "@openremote/or-map";@@ -509,14 +509,14 @@ export class OrAttributeInput extends subscribe(manager)(translate(i18next)(LitE}// Fallback to simple input provider- const valueChangeHandler = (e: OrInputChangedEvent) => {- if (e.detail.enterPressed || !this._templateProvider || !this._templateProvider.supportsSendButton) {- this._onInputValueChanged(e.detail.value);+ const valueChangeHandler = (detail: OrInputChangedEventDetail) => {+ if (detail.enterPressed || !this._templateProvider || !this._templateProvider.supportsSendButton) {+ this._onInputValueChanged(detail.value);} else {- this._newValue = e.detail.value;+ this._newValue = detail.value;}};- this._templateProvider = getValueHolderInputTemplateProvider(this.assetType, this.attribute, this._attributeDescriptor, valueDescriptor, (e: any) => valueChangeHandler(e), options);+ this._templateProvider = getValueHolderInputTemplateProvider(this.assetType, this.attribute, this._attributeDescriptor, valueDescriptor, (e: OrInputChangedEventDetail) => valueChangeHandler(e), options);}public getLabel(): string | undefined {diff --git a/ui/component/or-input/src/index.ts b/ui/component/or-input/src/index.tsindex 3c045f2c0..2913cf601 100644--- a/ui/component/or-input/src/index.ts+++ b/ui/component/or-input/src/index.ts@@ -110,7 +110,7 @@ export interface ValueInputProvider {export type ValueInputTemplateFunction = ((value: any, focused: boolean, loading: boolean, sending: boolean, error: boolean, helperText: string | undefined) => TemplateResult) | undefined;-export type ValueInputProviderGenerator = (assetDescriptor: AssetDescriptor | string, valueHolder: NameHolder & ValueHolder<any> | undefined, valueHolderDescriptor: ValueDescriptorHolder | undefined, valueDescriptor: ValueDescriptor, valueChangeNotifier: (value: any | undefined) => void, options: ValueInputProviderOptions) => ValueInputProvider;+export type ValueInputProviderGenerator = (assetDescriptor: AssetDescriptor | string, valueHolder: NameHolder & ValueHolder<any> | undefined, valueHolderDescriptor: ValueDescriptorHolder | undefined, valueDescriptor: ValueDescriptor, valueChangeNotifier: (value: OrInputChangedEventDetail | any | undefined) => void, options: ValueInputProviderOptions) => ValueInputProvider;function inputTypeSupportsButton(inputType: InputType): boolean {return inputType === InputType.NUMBER@@ -345,7 +345,7 @@ export const getValueHolderInputTemplateProvider: ValueInputProviderGenerator =}}" @or-input-changed="${(e: OrInputChangedEvent) => {e.stopPropagation();e.detail.value = valueConverter ? valueConverter(e.detail.value) : e.detail.value;- valueChangeNotifier(e);+ valueChangeNotifier(e.detail);}}"></or-input>`};