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 fixes for attribute input
Rich Turnerc8fb900d1e71
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 2297d0bd9..297e0686a 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -930,7 +930,7 @@ export async function saveAsset(asset: Asset): Promise<SaveResult> {}} catch (e) {success = false;- showSnackbar(undefined, i18next.t("createAssetFailed"), i18next.t("dismiss"));+ showSnackbar(undefined, i18next.t(isUpdate ? "saveAssetFailed" : "createAssetFailed"), i18next.t("dismiss"));console.error("Failed to save asset", e);}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 ebb354de6..edb7bd82d 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@@ -323,7 +323,7 @@ export class OrEditAssetPanel extends LitElement {};const standardInputProvider = getValueHolderInputTemplateProvider(this.asset.type!, metaItem, descriptor, valueDescriptor, (detail) => this._onMetaItemModified(attribute, metaItem, detail), options);- let provider = jsonFormsInputTemplateProvider(this.asset.type!, metaItem, descriptor, valueDescriptor, (detail) => this._onMetaItemModified(attribute, metaItem, detail), options, standardInputProvider);+ let provider = jsonFormsInputTemplateProvider(standardInputProvider)(this.asset.type!, metaItem, descriptor, valueDescriptor, (detail) => this._onMetaItemModified(attribute, metaItem, detail), options);if (!provider) {provider = standardInputProvider;diff --git a/ui/component/or-attribute-input/src/index.ts b/ui/component/or-attribute-input/src/index.tsindex 96b9540c5..cb183bb93 100644--- a/ui/component/or-attribute-input/src/index.ts+++ b/ui/component/or-attribute-input/src/index.ts@@ -116,7 +116,7 @@ export function getHelperText(sending: boolean, error: boolean, timestamp: numbeconst jsonFormsAttributeRenderers = [...StandardRenderers, agentIdRendererRegistryEntry];type ErrorMessage = "agentNotFound" | "agentTypeMismatch";-export const jsonFormsInputTemplateProvider: (assetDescriptor: AssetDescriptor | string, valueHolder: NameHolder & ValueHolder<any> | undefined, valueHolderDescriptor: ValueDescriptorHolder | undefined, valueDescriptor: ValueDescriptor, valueChangeNotifier: (value: OrInputChangedEventDetail | undefined) => void, options: ValueInputProviderOptions, fallback: ValueInputProvider) => ValueInputProvider = (assetDescriptor, valueHolder, valueHolderDescriptor, valueDescriptor, valueChangeNotifier, options, fallback) => {+export const jsonFormsInputTemplateProvider: (fallback: ValueInputProvider) => ValueInputProviderGenerator = (fallback) => (assetDescriptor, valueHolder, valueHolderDescriptor, valueDescriptor, valueChangeNotifier, options) => {const disabled = !!(options && options.disabled);const readonly = !!(options && options.readonly);@@ -125,8 +125,6 @@ export const jsonFormsInputTemplateProvider: (assetDescriptor: AssetDescriptor |// Agent link needs some special handling as we need an agent picker no matter whatif (valueDescriptor.name === WellknownValueTypes.AGENTLINK) {--const templateFunction: ValueInputTemplateFunction = (value, focused, loading, sending, error, helperText) => {const jsonForms: Ref<OrJSONForms> = createRef();const containerDiv: Ref<HTMLDivElement> = createRef();@@ -191,6 +189,7 @@ export const jsonFormsInputTemplateProvider: (assetDescriptor: AssetDescriptor |return html`<or-json-forms .renderers="${jsonFormsAttributeRenderers}" ${ref(jsonForms)} .config="${config}"+ .disabled="${disabled}" .readonly="${readonly}" .label="${label}".schema="${schema}" label="Agent link" .uischema="${uiSchema}" .onChange="${onAgentLinkChanged}".data="${agentLink}"></or-json-forms>`;@@ -672,28 +671,27 @@ export class OrAttributeInput extends subscribe(manager)(translate(i18next)(LitEinputType: this.inputType};++ // Use json forms with fallback to simple input provider+ const valueChangeHandler = (detail: OrInputChangedEventDetail | undefined) => {+ const value = detail ? detail.value : undefined;+ const updateImmediately = (detail && detail.enterPressed) || !this._templateProvider || !this.showButton || !this._templateProvider.supportsSendButton;+ this._onInputValueChanged(value, updateImmediately);+ };+if (this.customProvider) {- this._templateProvider = this.customProvider ? this.customProvider(this.assetType, this.attribute, this._attributeDescriptor, valueDescriptor, (v) => this._onInputValueChanged(v), options) : undefined;+ this._templateProvider = this.customProvider ? this.customProvider(this.assetType, this.attribute, this._attributeDescriptor, valueDescriptor, (detail) => valueChangeHandler(detail), options) : undefined;return;}// Handle special value typesif (valueDescriptor.name === WellknownValueTypes.GEOJSONPOINT) {- this._templateProvider = geoJsonPointInputTemplateProvider(this.assetType, this.attribute, this._attributeDescriptor, valueDescriptor, (v: any) => this._onInputValueChanged(v), options);+ this._templateProvider = geoJsonPointInputTemplateProvider(this.assetType, this.attribute, this._attributeDescriptor, valueDescriptor, (detail) => valueChangeHandler(detail), options);return;}- // Use json forms with fallback to simple input provider- const valueChangeHandler = (detail: OrInputChangedEventDetail | undefined) => {- if (detail && (detail.enterPressed || !this._templateProvider || !this.showButton || !this._templateProvider.supportsSendButton)) {- this._onInputValueChanged(detail.value);- } else {- this._newValue = detail ? detail.value : undefined;- }- };-- const standardInputProvider = getValueHolderInputTemplateProvider(this.assetType, this.attribute, this._attributeDescriptor, valueDescriptor, (e) => valueChangeHandler(e), options);- this._templateProvider = jsonFormsInputTemplateProvider(this.assetType, this.attribute, this._attributeDescriptor, valueDescriptor, (v: any) => this._onInputValueChanged(v), options, standardInputProvider);+ const standardInputProvider = getValueHolderInputTemplateProvider(this.assetType, this.attribute, this._attributeDescriptor, valueDescriptor, (detail) => valueChangeHandler(detail), options);+ this._templateProvider = jsonFormsInputTemplateProvider(standardInputProvider)(this.assetType, this.attribute, this._attributeDescriptor, valueDescriptor, (detail) => valueChangeHandler(detail), options);if (!this._templateProvider) {this._templateProvider = standardInputProvider;@@ -796,9 +794,12 @@ export class OrAttributeInput extends subscribe(manager)(translate(i18next)(LitEthis.dispatchEvent(new OrAttributeInputChangedEvent(newValue, oldValue));}- protected _onInputValueChanged(value: any) {+ protected _onInputValueChanged(value: any, updateImmediately: boolean) {this._newValue = value;- this._updateValue();++ if (updateImmediately) {+ this._updateValue();+ }}protected _updateValue() {diff --git a/ui/component/or-map/src/index.ts b/ui/component/or-map/src/index.tsindex 93747d56a..ff9e1ed53 100644--- a/ui/component/or-map/src/index.ts+++ b/ui/component/or-map/src/index.ts@@ -192,7 +192,7 @@ export const geoJsonPointInputTemplateProvider: ValueInputProviderGenerator = (a}if (value) {valueChangeNotifier({- value: value+ value: Util.getGeoJSONPoint(value)});} else {valueChangeNotifier(undefined);diff --git a/ui/component/or-mwc-components/src/or-mwc-input.ts b/ui/component/or-mwc-components/src/or-mwc-input.tsindex 96753dbb9..903446191 100644--- a/ui/component/or-mwc-components/src/or-mwc-input.ts+++ b/ui/component/or-mwc-components/src/or-mwc-input.ts@@ -172,7 +172,7 @@ function inputTypeSupportsLabel(inputType: InputType) {return inputTypeSupportsHelperText(inputType) || inputType === InputType.CHECKBOX;}-export const getValueHolderInputTemplateProvider: ValueInputProviderGenerator = (assetDescriptor: AssetDescriptor | string, valueHolder: NameValueHolder<any> | undefined, valueHolderDescriptor: ValueDescriptorHolder | undefined, valueDescriptor: ValueDescriptor, valueChangeNotifier: (value: any | undefined) => void, options: ValueInputProviderOptions) => {+export const getValueHolderInputTemplateProvider: ValueInputProviderGenerator = (assetDescriptor, valueHolder, valueHolderDescriptor, valueDescriptor, valueChangeNotifier, options) => {let inputType: InputType | undefined = options.inputType;let step: number | undefined;