Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI minor bug fixes

Rich Turnerbbec2bd56ab4
diff --git a/ui/app/or-app/src/pages/page-assets.ts b/ui/app/or-app/src/pages/page-assets.ts
index 1247dfc9a..48d56d73e 100644
--- a/ui/app/or-app/src/pages/page-assets.ts
+++ b/ui/app/or-app/src/pages/page-assets.ts
@@ -194,7 +194,7 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {
if (silent) {
router.pause();
}
- getAssetsRoute(this._editMode, this._assetId);
+ router.navigate(getAssetsRoute(this._editMode, this._assetId));
if (silent) {
router.resume();
}
diff --git a/ui/component/core/src/asset-mixin.ts b/ui/component/core/src/asset-mixin.ts
index ad25df57d..357950f37 100644
--- a/ui/component/core/src/asset-mixin.ts
+++ b/ui/component/core/src/asset-mixin.ts
@@ -107,10 +107,18 @@ export const subscribe = (eventProviderFactory: EventProviderFactory) => <T exte
if (ids && ids.length > 0) {
if (!isAttributes) {
const assetSubscriptionId = await eventProviderFactory.getEventProvider()!.subscribeAssetEvents(ids, true, (event) => this._onEvent(event));
+ if (!this._subscriptionIds) {
+ eventProviderFactory.getEventProvider()!.unsubscribe(assetSubscriptionId);
+ return;
+ }
this._subscriptionIds.push(assetSubscriptionId);
}
const subscriptionId = await eventProviderFactory.getEventProvider()!.subscribeAttributeEvents(ids, isAttributes, (event) => this._onEvent(event));
- this._subscriptionIds.push(subscriptionId);
+ if (!this._subscriptionIds) {
+ eventProviderFactory.getEventProvider()!.unsubscribe(subscriptionId);
+ } else {
+ this._subscriptionIds.push(subscriptionId);
+ }
}
}
diff --git a/ui/component/or-attribute-input/src/index.ts b/ui/component/or-attribute-input/src/index.ts
index c48806b77..2db627510 100644
--- a/ui/component/or-attribute-input/src/index.ts
+++ b/ui/component/or-attribute-input/src/index.ts
@@ -226,7 +226,7 @@ export const GeoJsonPointInputTemplateProvider: AttributeInputCustomProvider = (
content = html`
<div>
<or-input .type="${InputType.TEXT}" comfortable outlined .pattern="${CoordinatesRegexPattern}" @keyup="${(e: KeyboardEvent) => getCoordinatesInputKeyHandler(valueChangeNotifier)(e)}"></or-input>
- <or-input .type="${InputType.BUTTON}" compact action icon="crosshairs-gps" @clicked="${onClick}"></or-input>
+ <or-input style="width: auto;" .type="${InputType.BUTTON}" compact action icon="crosshairs-gps" @clicked="${onClick}"></or-input>
</div>
`;
}
diff --git a/ui/component/or-map/src/index.ts b/ui/component/or-map/src/index.ts
index f18ec821b..a29ab6e45 100644
--- a/ui/component/or-map/src/index.ts
+++ b/ui/component/or-map/src/index.ts
@@ -158,7 +158,9 @@ export class OrMap extends LitElement {
public disconnectedCallback() {
super.disconnectedCallback();
- this._observer!.disconnect();
+ if (this._observer) {
+ this._observer.disconnect();
+ }
manager.removeListener(this.onManagerEvent);
}