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
Replace LitElement with OrElement (#3102)
Koen3d170090e557
diff --git a/ui/app/insights/package.json b/ui/app/insights/package.jsonindex a8af4d559..1e977370d 100644--- a/ui/app/insights/package.json+++ b/ui/app/insights/package.json@@ -29,6 +29,7 @@"@openremote/model": "workspace:*","@openremote/or-app": "workspace:*","@openremote/or-dashboard-builder": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-mwc-components": "workspace:*","@openremote/or-translate": "workspace:*","@openremote/rest": "workspace:*",diff --git a/ui/app/insights/src/components/dashboard-menu.ts b/ui/app/insights/src/components/dashboard-menu.tsindex 616985b86..70ba49447 100644--- a/ui/app/insights/src/components/dashboard-menu.ts+++ b/ui/app/insights/src/components/dashboard-menu.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, css, LitElement, type TemplateResult, unsafeCSS } from "lit";+import { html, css, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import "@openremote/or-mwc-components/or-mwc-drawer";import { when } from "lit/directives/when.js";@@ -50,7 +51,7 @@ const styling = css``;@customElement("dashboard-menu")-export class DashboardMenu extends LitElement {+export class DashboardMenu extends OrElement {@property() // list of dashboards: if set to 'undefined', it will pull new dashboards automatically.protected readonly dashboards?: Dashboard[];diff --git a/ui/app/insights/tsconfig.json b/ui/app/insights/tsconfig.jsonindex 63ccd1210..0160c964b 100644--- a/ui/app/insights/tsconfig.json+++ b/ui/app/insights/tsconfig.json@@ -6,5 +6,5 @@"strict": false},"include": ["./src"],- "references": [{ "path": "../../component/or-app" }]+ "references": [{ "path": "../../component/or-element" }, { "path": "../../component/or-app" }]}diff --git a/ui/app/manager/src/components/configuration/or-conf-json.ts b/ui/app/manager/src/components/configuration/or-conf-json.tsindex a440d4e9e..d4d84296a 100644--- a/ui/app/manager/src/components/configuration/or-conf-json.ts+++ b/ui/app/manager/src/components/configuration/or-conf-json.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement } from "lit";+import { html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import "@openremote/or-components/or-ace-editor";import type { DialogAction } from "@openremote/or-mwc-components/or-mwc-dialog";@@ -26,7 +27,7 @@ import type { OrAceEditor, OrAceEditorChangedEvent } from "@openremote/or-componimport type { ManagerAppConfig, MapConfig } from "@openremote/model";@customElement("or-conf-json")-export class OrConfJson extends LitElement {+export class OrConfJson extends OrElement {@property({ attribute: false })public config: ManagerAppConfig | MapConfig = {};diff --git a/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-card.ts b/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-card.tsindex 4c3ba2277..e677fb673 100644--- a/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-card.ts+++ b/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-card.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, type TemplateResult, LitElement } from "lit";+import { css, html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { when } from "lit/directives/when.js";import "@openremote/or-components/or-file-uploader";@@ -29,7 +30,7 @@ import type { LngLat } from "maplibre-gl";import "./or-conf-map-geojson";@customElement("or-conf-map-card")-export class OrConfMapCard extends LitElement {+export class OrConfMapCard extends OrElement {static styles = css`or-collapsible-panel {margin-bottom: 10px;diff --git a/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-geojson.ts b/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-geojson.tsindex 8f3d55a93..ab0f752a8 100644--- a/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-geojson.ts+++ b/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-geojson.ts@@ -18,13 +18,14 @@*/import type { GeoJsonConfig } from "@openremote/model";import { OrMwcDialog, showDialog } from "@openremote/or-mwc-components/or-mwc-dialog";-import { html, LitElement } from "lit";+import { html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import "@openremote/or-components/or-ace-editor";import type { OrAceEditorChangedEvent } from "@openremote/or-components/or-ace-editor";@customElement("or-conf-map-geojson")-export class OrConfMapGeoJson extends LitElement {+export class OrConfMapGeoJson extends OrElement {@property()protected geoJson?: GeoJsonConfig;diff --git a/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-global.ts b/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-global.tsindex 7ee01e46e..fc22c24f4 100644--- a/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-global.ts+++ b/ui/app/manager/src/components/configuration/or-conf-map/or-conf-map-global.ts@@ -18,7 +18,8 @@*/import type { MapConfig } from "@openremote/model";import { InputType, type OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";-import { css, html, LitElement } from "lit";+import { css, html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { when } from "lit/directives/when.js";import { showSnackbar } from "@openremote/or-mwc-components/or-mwc-snackbar";@@ -26,7 +27,7 @@ import { i18next } from "@openremote/or-translate";import type { StyleSpecification } from "maplibre-gl";@customElement("or-conf-map-global")-export class OrConfMapGlobal extends LitElement {+export class OrConfMapGlobal extends OrElement {static styles = css`.subheader {padding: 10px 0 4px;diff --git a/ui/app/manager/src/components/configuration/or-conf-panel.ts b/ui/app/manager/src/components/configuration/or-conf-panel.tsindex cc8b0a526..b58825665 100644--- a/ui/app/manager/src/components/configuration/or-conf-panel.ts+++ b/ui/app/manager/src/components/configuration/or-conf-panel.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement, type TemplateResult } from "lit";+import { html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { InputType, OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";import { customElement, property } from "lit/decorators.js";import { when } from "lit/directives/when.js";@@ -31,7 +32,7 @@ import type { OrConfMapCard } from "./or-conf-map/or-conf-map-card";import type { OrVaadinSelect } from "@openremote/or-vaadin-components/or-vaadin-select";@customElement("or-conf-panel")-export class OrConfPanel extends LitElement {+export class OrConfPanel extends OrElement {@property()public config?: MapConfig | ManagerAppConfig = {};diff --git a/ui/app/manager/src/components/configuration/or-conf-realm/or-conf-realm-card.ts b/ui/app/manager/src/components/configuration/or-conf-realm/or-conf-realm-card.tsindex 85492998a..52daf6353 100644--- a/ui/app/manager/src/components/configuration/or-conf-realm/or-conf-realm-card.ts+++ b/ui/app/manager/src/components/configuration/or-conf-realm/or-conf-realm-card.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, unsafeCSS } from "lit";+import { css, html, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { InputType, type OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";import { customElement, property } from "lit/decorators.js";import "@openremote/or-components/or-file-uploader";@@ -40,7 +41,7 @@ import { DefaultHeaderMainMenu, DefaultHeaderSecondaryMenu } from "../../../indeimport type { OrVaadinMultiSelectComboBox } from "@openremote/or-vaadin-components/or-vaadin-multi-select-combo-box";@customElement("or-conf-realm-card")-export class OrConfRealmCard extends translate(i18next)(LitElement) {+export class OrConfRealmCard extends translate(i18next)(OrElement) {static styles = css`.language {width: 100%;diff --git a/ui/app/manager/tsconfig.json b/ui/app/manager/tsconfig.jsonindex 63ccd1210..0160c964b 100644--- a/ui/app/manager/tsconfig.json+++ b/ui/app/manager/tsconfig.json@@ -6,5 +6,5 @@"strict": false},"include": ["./src"],- "references": [{ "path": "../../component/or-app" }]+ "references": [{ "path": "../../component/or-element" }, { "path": "../../component/or-app" }]}diff --git a/ui/component/or-app/package.json b/ui/component/or-app/package.jsonindex 6f27005f0..e38b662d1 100644--- a/ui/component/or-app/package.json+++ b/ui/component/or-app/package.json@@ -27,6 +27,7 @@"dependencies": {"@openremote/core": "workspace:*","@openremote/model": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-mwc-components": "workspace:*","@openremote/or-translate": "workspace:*",diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.tsindex d07496e19..0ad1b205a 100644--- a/ui/component/or-app/src/index.ts+++ b/ui/component/or-app/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import { type AppConfig, type Page, type RealmAppConfig, router } from "./types";import "@openremote/or-translate";@@ -80,7 +81,7 @@ const DEFAULT_MANAGER_CONFIG: ManagerConfig = {};@customElement("or-app")-export class OrApp<S extends AppStateKeyed> extends LitElement {+export class OrApp<S extends AppStateKeyed> extends OrElement {@property({ type: Object })public appConfig?: AppConfig<S>;diff --git a/ui/component/or-app/src/or-header.ts b/ui/component/or-app/src/or-header.tsindex fee894b81..e2cf321a7 100644--- a/ui/component/or-app/src/or-header.ts+++ b/ui/component/or-app/src/or-header.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import manager, {DefaultBoxShadowBottom,@@ -80,7 +81,7 @@ function getCurrentMenuItemRef(defaultRef?: string): string | undefined {}@customElement("or-header")-export class OrHeader extends LitElement {+export class OrHeader extends OrElement {// language=CSSstatic get styles() {return css`diff --git a/ui/component/or-app/src/types.ts b/ui/component/or-app/src/types.tsindex bc1da7112..5357f919e 100644--- a/ui/component/or-app/src/types.ts+++ b/ui/component/or-app/src/types.ts@@ -18,7 +18,8 @@*/import type { HeaderConfig, Languages } from "./or-header";import type { AppStateKeyed } from "./app";-import { LitElement, type TemplateResult } from "lit";+import type { TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { i18next, translate } from "@openremote/or-translate";import type { AnyAction, Store, Unsubscribe } from "@reduxjs/toolkit";import Navigo from "navigo";@@ -56,7 +57,7 @@ export interface PageProvider<S extends AppStateKeyed> {pageCreator: () => Page<S>;}-export abstract class Page<S extends AppStateKeyed> extends translate(i18next)(LitElement) {+export abstract class Page<S extends AppStateKeyed> extends translate(i18next)(OrElement) {abstract get name(): string;protected _store: Store<S, AnyAction>;diff --git a/ui/component/or-app/tsconfig.json b/ui/component/or-app/tsconfig.jsonindex a704c1182..89c9e3317 100644--- a/ui/component/or-app/tsconfig.json+++ b/ui/component/or-app/tsconfig.json@@ -7,6 +7,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../../component/core" },{ "path": "../../component/or-mwc-components" },{ "path": "../../component/or-icon" },diff --git a/ui/component/or-asset-tree/package.json b/ui/component/or-asset-tree/package.jsonindex 0ccc2b4f7..82dfd21fa 100644--- a/ui/component/or-asset-tree/package.json+++ b/ui/component/or-asset-tree/package.json@@ -24,6 +24,7 @@"@mdi/js": "^5.9.55","@openremote/core": "workspace:*","@openremote/model": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-mwc-components": "workspace:*","@openremote/or-translate": "workspace:*",diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex d3cb51fcb..43f685982 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import type { OrVaadinTextField } from "@openremote/or-vaadin-components/or-vaadin-text-field";import type { OrVaadinButton } from "@openremote/or-vaadin-components/or-vaadin-button";@@ -266,7 +267,7 @@ declare global {}@customElement("or-asset-tree")-export class OrAssetTree extends subscribe(manager)(LitElement) {+export class OrAssetTree extends subscribe(manager)(OrElement) {static get styles() {return [style];}diff --git a/ui/component/or-asset-tree/src/or-add-asset-dialog.ts b/ui/component/or-asset-tree/src/or-add-asset-dialog.tsindex 36bc168bd..29c241738 100644--- a/ui/component/or-asset-tree/src/or-add-asset-dialog.ts+++ b/ui/component/or-asset-tree/src/or-add-asset-dialog.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import {type AgentDescriptor,@@ -62,7 +63,7 @@ declare global {}@customElement("or-add-asset-dialog")-export class OrAddAssetDialog extends LitElement {+export class OrAddAssetDialog extends OrElement {@property({ attribute: false })public config!: AssetTreeConfig;diff --git a/ui/component/or-asset-tree/tsconfig.json b/ui/component/or-asset-tree/tsconfig.jsonindex 9e8f83b32..a15cc5de1 100644--- a/ui/component/or-asset-tree/tsconfig.json+++ b/ui/component/or-asset-tree/tsconfig.json@@ -6,6 +6,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../rest" },{ "path": "../model" },diff --git a/ui/component/or-asset-viewer/package.json b/ui/component/or-asset-viewer/package.jsonindex 00788ffc3..fb14e0673 100644--- a/ui/component/or-asset-viewer/package.json+++ b/ui/component/or-asset-viewer/package.json@@ -30,6 +30,7 @@"@openremote/or-attribute-input": "workspace:*","@openremote/or-chart": "workspace:*","@openremote/or-components": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-mwc-components": "workspace:*","@openremote/or-translate": "workspace:*",diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex c724c7cdf..f35a9c08b 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -18,7 +18,8 @@*/import type { OrVaadinButton } from "@openremote/or-vaadin-components/or-vaadin-button";-import { html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { html, type LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import "@openremote/or-icon";import "@openremote/or-mwc-components/or-mwc-input";@@ -1279,7 +1280,7 @@ export const DEFAULT_VIEWER_CONFIG: AssetViewerConfig = {};@customElement("or-asset-viewer")-export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElement)) {+export class OrAssetViewer extends subscribe(manager)(translate(i18next)(OrElement)) {static get styles() {return [unsafeCSS(tableStyle), progressCircular, panelStyles, style];}diff --git a/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts b/ui/component/or-asset-viewer/src/or-add-attribute-panel.tsindex 38de8884a..052d4e8c4 100644--- a/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts+++ b/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement, css, type PropertyValues } from "lit";+import { html, css, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import type { OrVaadinTextField } from "@openremote/or-vaadin-components/or-vaadin-text-field";import type { OrVaadinComboBox } from "@openremote/or-vaadin-components/or-vaadin-combo-box";@@ -44,7 +45,7 @@ declare global {}@customElement("or-add-attribute-panel")-export class OrAddAttributePanel extends LitElement {+export class OrAddAttributePanel extends OrElement {@property({ attribute: false })protected asset!: Asset;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 b53034332..afddc0df5 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@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { until } from "lit/directives/until.js";import { customElement, property } from "lit/decorators.js";import {@@ -205,7 +206,7 @@ interface TemplateAndValidator {}@customElement("or-edit-asset-panel")-export class OrEditAssetPanel extends LitElement {+export class OrEditAssetPanel extends OrElement {@property({ attribute: false })protected asset!: Asset;diff --git a/ui/component/or-asset-viewer/tsconfig.json b/ui/component/or-asset-viewer/tsconfig.jsonindex 1a2a44a6a..4a457c910 100644--- a/ui/component/or-asset-viewer/tsconfig.json+++ b/ui/component/or-asset-viewer/tsconfig.json@@ -6,6 +6,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../rest" },{ "path": "../model" },diff --git a/ui/component/or-attribute-barchart/package.json b/ui/component/or-attribute-barchart/package.jsonindex 759dc0e76..88e95e475 100644--- a/ui/component/or-attribute-barchart/package.json+++ b/ui/component/or-attribute-barchart/package.json@@ -20,6 +20,7 @@"dependencies": {"@openremote/core": "workspace:*","@openremote/model": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-mwc-components": "workspace:*","@openremote/or-translate": "workspace:*",diff --git a/ui/component/or-attribute-barchart/src/index.ts b/ui/component/or-attribute-barchart/src/index.tsindex 868cc66fd..240fb3523 100644--- a/ui/component/or-attribute-barchart/src/index.ts+++ b/ui/component/or-attribute-barchart/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state, query } from "lit/decorators.js";import { i18next } from "@openremote/or-translate";import {@@ -296,7 +297,7 @@ const style = css``;@customElement("or-attribute-barchart")-export class OrAttributeBarChart extends LitElement {+export class OrAttributeBarChart extends OrElement {public static readonly DEFAULT_COLORS = ["#3869B1","#DA7E30",diff --git a/ui/component/or-attribute-card/package.json b/ui/component/or-attribute-card/package.jsonindex 2203646e2..cf2d99efa 100644--- a/ui/component/or-attribute-card/package.json+++ b/ui/component/or-attribute-card/package.json@@ -26,6 +26,7 @@"@openremote/model": "workspace:*","@openremote/or-attribute-picker": "workspace:*","@openremote/or-chart": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-mwc-components": "workspace:*","@openremote/or-translate": "workspace:*",diff --git a/ui/component/or-attribute-card/src/index.ts b/ui/component/or-attribute-card/src/index.tsindex 41627e510..60e753320 100644--- a/ui/component/or-attribute-card/src/index.ts+++ b/ui/component/or-attribute-card/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, unsafeCSS } from "lit";+import { css, html, type PropertyValues, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state, query } from "lit/decorators.js";import { i18next } from "@openremote/or-translate";import {@@ -194,7 +195,7 @@ const style = css``;@customElement("or-attribute-card")-export class OrAttributeCard extends LitElement {+export class OrAttributeCard extends OrElement {@property()public panelName?: string;diff --git a/ui/component/or-attribute-card/tsconfig.json b/ui/component/or-attribute-card/tsconfig.jsonindex 31697ec28..4990e63d5 100644--- a/ui/component/or-attribute-card/tsconfig.json+++ b/ui/component/or-attribute-card/tsconfig.json@@ -6,6 +6,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../or-chart" },{ "path": "../or-mwc-components" },diff --git a/ui/component/or-attribute-history/package.json b/ui/component/or-attribute-history/package.jsonindex 48ef1a20f..9488d42fd 100644--- a/ui/component/or-attribute-history/package.json+++ b/ui/component/or-attribute-history/package.json@@ -26,6 +26,7 @@"@openremote/model": "workspace:*","@openremote/or-chart": "workspace:*","@openremote/or-components": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-translate": "workspace:*","@openremote/or-vaadin-components": "workspace:*","@openremote/rest": "workspace:*",diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.tsindex bbdfa81f5..10b8a64dc 100644--- a/ui/component/or-attribute-history/src/index.ts+++ b/ui/component/or-attribute-history/src/index.ts@@ -17,6 +17,7 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import * as echarts from "echarts/core";+import { OrElement } from "@openremote/or-element";import {GridComponent,type GridComponentOption,@@ -30,7 +31,7 @@ import { LineChart, type LineSeriesOption } from "echarts/charts";import { UniversalTransition } from "echarts/features";import { CanvasRenderer } from "echarts/renderers";import debounce from "lodash.debounce";-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";import { customElement, property, query } from "lit/decorators.js";import { i18next, translate } from "@openremote/or-translate";import {@@ -283,7 +284,7 @@ const style = css``;@customElement("or-attribute-history")-export class OrAttributeHistory extends translate(i18next)(LitElement) {+export class OrAttributeHistory extends translate(i18next)(OrElement) {public static DEFAULT_TIMESTAMP_FORMAT = "L HH:mm:ss";static get styles() {diff --git a/ui/component/or-attribute-history/tsconfig.json b/ui/component/or-attribute-history/tsconfig.jsonindex ea2b9e42f..ab24c27cc 100644--- a/ui/component/or-attribute-history/tsconfig.json+++ b/ui/component/or-attribute-history/tsconfig.json@@ -6,6 +6,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../or-components" },{ "path": "../or-mwc-components" },diff --git a/ui/component/or-attribute-input/package.json b/ui/component/or-attribute-input/package.jsonindex 6b130f503..2e6b37f13 100644--- a/ui/component/or-attribute-input/package.json+++ b/ui/component/or-attribute-input/package.json@@ -24,6 +24,7 @@"@openremote/core": "workspace:*","@openremote/model": "workspace:*","@openremote/or-components": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-json-forms": "workspace:*","@openremote/or-map": "workspace:*",diff --git a/ui/component/or-attribute-input/src/index.ts b/ui/component/or-attribute-input/src/index.tsindex ab6d850aa..e52012a06 100644--- a/ui/component/or-attribute-input/src/index.ts+++ b/ui/component/or-attribute-input/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { ifDefined } from "lit/directives/if-defined.js";import { until } from "lit/directives/until.js";@@ -325,7 +326,7 @@ const DEFAULT_TIMEOUT = 5000;// TODO: Add support for attribute not found and attribute deletion/addition@customElement("or-attribute-input")-export class OrAttributeInput extends subscribe(manager)(translate(i18next)(LitElement)) {+export class OrAttributeInput extends subscribe(manager)(translate(i18next)(OrElement)) {// language=CSSstatic get styles() {return [diff --git a/ui/component/or-attribute-input/tsconfig.json b/ui/component/or-attribute-input/tsconfig.jsonindex 42508dbdc..31e0a20bf 100644--- a/ui/component/or-attribute-input/tsconfig.json+++ b/ui/component/or-attribute-input/tsconfig.json@@ -6,6 +6,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../or-translate" },{ "path": "../or-map" },diff --git a/ui/component/or-chart/package.json b/ui/component/or-chart/package.jsonindex dec868011..483657b37 100644--- a/ui/component/or-chart/package.json+++ b/ui/component/or-chart/package.json@@ -29,6 +29,7 @@"@openremote/or-asset-tree": "workspace:*","@openremote/or-attribute-picker": "workspace:*","@openremote/or-components": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-mwc-components": "workspace:*","@openremote/or-translate": "workspace:*",diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.tsindex ca0e9190b..376c6abe7 100644--- a/ui/component/or-chart/src/index.ts+++ b/ui/component/or-chart/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state, query } from "lit/decorators.js";import { i18next, translate } from "@openremote/or-translate";import {@@ -381,7 +382,7 @@ const style = css``;@customElement("or-chart")-export class OrChart extends translate(i18next)(LitElement) {+export class OrChart extends translate(i18next)(OrElement) {public static readonly DEFAULT_COLORS = ["#3869B1","#DA7E30",diff --git a/ui/component/or-chart/tsconfig.json b/ui/component/or-chart/tsconfig.jsonindex 1db423065..4885b7b40 100644--- a/ui/component/or-chart/tsconfig.json+++ b/ui/component/or-chart/tsconfig.json@@ -7,6 +7,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../or-components" },{ "path": "../or-icon" },diff --git a/ui/component/or-components/package.json b/ui/component/or-components/package.jsonindex 5086408c9..0ec018314 100644--- a/ui/component/or-components/package.json+++ b/ui/component/or-components/package.json@@ -30,6 +30,7 @@"dependencies": {"@openremote/core": "workspace:*","@openremote/model": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-translate": "workspace:*","ace-builds": "^1.44.0",diff --git a/ui/component/or-components/src/or-ace-editor.ts b/ui/component/or-components/src/or-ace-editor.tsindex 0d95617e5..aba357067 100644--- a/ui/component/or-components/src/or-ace-editor.ts+++ b/ui/component/or-components/src/or-ace-editor.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import ace, { type Ace } from "ace-builds";import "ace-builds/src-noconflict/mode-javascript";@@ -57,7 +58,7 @@ declare global {}@customElement("or-ace-editor")-export class OrAceEditor extends LitElement {+export class OrAceEditor extends OrElement {// language=CSSstatic get styles() {return css`diff --git a/ui/component/or-components/src/or-collapsible-panel.ts b/ui/component/or-components/src/or-collapsible-panel.tsindex 4c6c295b8..0352b3e33 100644--- a/ui/component/or-components/src/or-collapsible-panel.ts+++ b/ui/component/or-components/src/or-collapsible-panel.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { i18next } from "@openremote/or-translate";import { DefaultColor5 } from "@openremote/core";@@ -119,7 +120,7 @@ const style = css``;@customElement("or-collapsible-panel")-export class OrCollapsiblePanel extends LitElement {+export class OrCollapsiblePanel extends OrElement {static get styles() {return [style];}diff --git a/ui/component/or-components/src/or-file-uploader.ts b/ui/component/or-components/src/or-file-uploader.tsindex 0b70ad762..cb13db66d 100644--- a/ui/component/or-components/src/or-file-uploader.ts+++ b/ui/component/or-components/src/or-file-uploader.ts@@ -16,14 +16,15 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues } from "lit";+import { css, html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { i18next } from "@openremote/or-translate";import type { FileInfo } from "@openremote/model";import "./or-loading-indicator";@customElement("or-file-uploader")-export class OrFileUploader extends LitElement {+export class OrFileUploader extends OrElement {// Contains the content that will be shown towards the user.@property({ attribute: false })public readonly src: string = "";diff --git a/ui/component/or-components/src/or-iframe.ts b/ui/component/or-components/src/or-iframe.tsindex 937683d2d..7a6bde085 100644--- a/ui/component/or-components/src/or-iframe.ts+++ b/ui/component/or-components/src/or-iframe.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues } from "lit";+import { css, html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import "./or-loading-indicator";import "@openremote/or-icon";@@ -94,7 +95,7 @@ const style = css`* @event {OrIFrameEvent} or-iframe-event - Fired when the iframe loading state changes, and dispatches the event detail containing type, src, and optional error.*/@customElement("or-iframe")-export class OrIframe extends LitElement {+export class OrIframe extends OrElement {static get styles() {return [style];}diff --git a/ui/component/or-components/src/or-loading-indicator.ts b/ui/component/or-components/src/or-loading-indicator.tsindex a3c6d906f..4d6d2cb0d 100644--- a/ui/component/or-components/src/or-loading-indicator.ts+++ b/ui/component/or-components/src/or-loading-indicator.ts@@ -16,11 +16,12 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement } from "lit";+import { css, html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";@customElement("or-loading-indicator")-export class OrLoadingIndicator extends LitElement {+export class OrLoadingIndicator extends OrElement {@property({ attribute: true })public overlay: boolean = false;diff --git a/ui/component/or-components/src/or-loading-wrapper.ts b/ui/component/or-components/src/or-loading-wrapper.tsindex 607cf70ed..9bf0a7383 100644--- a/ui/component/or-components/src/or-loading-wrapper.ts+++ b/ui/component/or-components/src/or-loading-wrapper.ts@@ -16,14 +16,15 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult } from "lit";+import { css, html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";/*** A simple loading wrapper around some other content that will hide the content whilst loading property is true*/@customElement("or-loading-wrapper")-export class OrLoadingWrapper extends LitElement {+export class OrLoadingWrapper extends OrElement {@property({ type: Number })public loadingHeight?: number;diff --git a/ui/component/or-components/src/or-panel.ts b/ui/component/or-components/src/or-panel.tsindex d1b5b6947..6a989bb11 100644--- a/ui/component/or-components/src/or-panel.ts+++ b/ui/component/or-components/src/or-panel.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { DefaultColor2, DefaultColor3 } from "@openremote/core";import { when } from "lit/directives/when.js";@@ -69,7 +70,7 @@ const style = css``;@customElement("or-panel")-export class OrPanel extends LitElement {+export class OrPanel extends OrElement {static get styles() {return [style];}diff --git a/ui/component/or-components/tsconfig.json b/ui/component/or-components/tsconfig.jsonindex e7fc83151..46a35a5a2 100644--- a/ui/component/or-components/tsconfig.json+++ b/ui/component/or-components/tsconfig.json@@ -5,5 +5,5 @@"rootDir": "src"},"include": ["./src"],- "references": [{ "path": "../core" }, { "path": "../rest" }, { "path": "../or-icon" }]+ "references": [{ "path": "../or-element" }, { "path": "../core" }, { "path": "../rest" }, { "path": "../or-icon" }]}diff --git a/ui/component/or-dashboard-builder/package.json b/ui/component/or-dashboard-builder/package.jsonindex c471b75d5..71f44105d 100644--- a/ui/component/or-dashboard-builder/package.json+++ b/ui/component/or-dashboard-builder/package.json@@ -32,6 +32,7 @@"@openremote/or-attribute-picker": "workspace:*","@openremote/or-chart": "workspace:*","@openremote/or-components": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-gauge": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-map": "workspace:*",diff --git a/ui/component/or-dashboard-builder/src/controls/dashboard-refresh-controls.ts b/ui/component/or-dashboard-builder/src/controls/dashboard-refresh-controls.tsindex c8658a0bf..24983fd0a 100644--- a/ui/component/or-dashboard-builder/src/controls/dashboard-refresh-controls.ts+++ b/ui/component/or-dashboard-builder/src/controls/dashboard-refresh-controls.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { when } from "lit/directives/when.js";import { DashboardRefreshInterval } from "@openremote/model";@@ -52,7 +53,7 @@ export class IntervalSelectEvent extends CustomEvent<DashboardRefreshInterval> {}@customElement("dashboard-refresh-controls")-export class DashboardRefreshControls extends LitElement {+export class DashboardRefreshControls extends OrElement {@property()protected interval: DashboardRefreshInterval = DashboardRefreshInterval.OFF;diff --git a/ui/component/or-dashboard-builder/src/index.ts b/ui/component/or-dashboard-builder/src/index.tsindex 33e8fc57a..c25cfa4d2 100644--- a/ui/component/or-dashboard-builder/src/index.ts+++ b/ui/component/or-dashboard-builder/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, unsafeCSS } from "lit";+import { css, html, type PropertyValues, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import { when } from "lit/directives/when.js";import { styleMap } from "lit/directives/style-map.js";@@ -259,7 +260,7 @@ export function registerWidgetTypes() {}@customElement("or-dashboard-builder")-export class OrDashboardBuilder extends translate(i18next)(LitElement) {+export class OrDashboardBuilder extends translate(i18next)(OrElement) {// Importing Styles; the unsafe GridStack css, and all custom cssstatic get styles() {return [styling, style];diff --git a/ui/component/or-dashboard-builder/src/or-dashboard-boardsettings.ts b/ui/component/or-dashboard-builder/src/or-dashboard-boardsettings.tsindex 5f98f579a..4138213f1 100644--- a/ui/component/or-dashboard-builder/src/or-dashboard-boardsettings.ts+++ b/ui/component/or-dashboard-builder/src/or-dashboard-boardsettings.ts@@ -23,7 +23,8 @@ import {DashboardScalingPreset,type DashboardScreenPreset,} from "@openremote/model";-import { css, html, LitElement } from "lit";+import { css, html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { style } from "./style";import { i18next, translate } from "@openremote/or-translate";@@ -41,7 +42,7 @@ const boardSettingsStyling = css``;@customElement("or-dashboard-boardsettings")-export class OrDashboardBoardsettings extends translate(i18next)(LitElement) {+export class OrDashboardBoardsettings extends translate(i18next)(OrElement) {@property({ type: Object })public readonly dashboard!: Dashboard;diff --git a/ui/component/or-dashboard-builder/src/or-dashboard-browser.ts b/ui/component/or-dashboard-builder/src/or-dashboard-browser.tsindex 208f09e44..dffbba7ff 100644--- a/ui/component/or-dashboard-builder/src/or-dashboard-browser.ts+++ b/ui/component/or-dashboard-builder/src/or-dashboard-browser.ts@@ -17,7 +17,8 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import { GridStack, type GridStackNode } from "gridstack";-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import { style } from "./style";import { widgetTypes } from "./index";@@ -62,7 +63,7 @@ const browserStyling = css``;@customElement("or-dashboard-browser")-export class OrDashboardBrowser extends LitElement {+export class OrDashboardBrowser extends OrElement {@property({ type: Number })public columns = 4;diff --git a/ui/component/or-dashboard-builder/src/or-dashboard-preview.ts b/ui/component/or-dashboard-builder/src/or-dashboard-preview.tsindex a38c0dabc..3d3ef7978 100644--- a/ui/component/or-dashboard-builder/src/or-dashboard-preview.ts+++ b/ui/component/or-dashboard-builder/src/or-dashboard-preview.ts@@ -17,7 +17,8 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import manager, { DefaultColor4, DefaultColor5 } from "@openremote/core";-import { css, html, LitElement, unsafeCSS } from "lit";+import { css, html, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { style } from "./style";import "./or-dashboard-widgetcontainer";@@ -154,7 +155,7 @@ export interface DashboardPreviewSize {/* ------------------------------------------------------------ */@customElement("or-dashboard-preview")-export class OrDashboardPreview extends translate(i18next)(LitElement) {+export class OrDashboardPreview extends translate(i18next)(OrElement) {// Monitoring the changes in the template, save the changes to this.latestChanges,// so we can check afterwards which changes are made. Used for@property({diff --git a/ui/component/or-dashboard-builder/src/or-dashboard-tree.ts b/ui/component/or-dashboard-builder/src/or-dashboard-tree.tsindex 09217497c..b61cb2a3c 100644--- a/ui/component/or-dashboard-builder/src/or-dashboard-tree.ts+++ b/ui/component/or-dashboard-builder/src/or-dashboard-tree.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues } from "lit";+import { css, html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import "@openremote/or-icon";import { style } from "./style";@@ -51,7 +52,7 @@ const treeStyling = css``;@customElement("or-dashboard-tree")-export class OrDashboardTree extends translate(i18next)(LitElement) {+export class OrDashboardTree extends translate(i18next)(OrElement) {static get styles() {return [style, treeStyling, OrAssetTreeStyle];}diff --git a/ui/component/or-dashboard-builder/src/or-dashboard-widgetcontainer.ts b/ui/component/or-dashboard-builder/src/or-dashboard-widgetcontainer.tsindex d5dc192d9..7099471b9 100644--- a/ui/component/or-dashboard-builder/src/or-dashboard-widgetcontainer.ts+++ b/ui/component/or-dashboard-builder/src/or-dashboard-widgetcontainer.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement, type PropertyValues } from "lit";+import { html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import { when } from "lit/directives/when.js";import throttle from "lodash.throttle";@@ -32,7 +33,7 @@ import { Util } from "@openremote/core";const elemTagName = "or-dashboard-widget-container";@customElement(elemTagName)-export class OrDashboardWidgetContainer extends LitElement {+export class OrDashboardWidgetContainer extends OrElement {static tagName = elemTagName;@property()diff --git a/ui/component/or-dashboard-builder/src/or-dashboard-widgetsettings.ts b/ui/component/or-dashboard-builder/src/or-dashboard-widgetsettings.tsindex 2ee033e06..d3fbd3b9f 100644--- a/ui/component/or-dashboard-builder/src/or-dashboard-widgetsettings.ts+++ b/ui/component/or-dashboard-builder/src/or-dashboard-widgetsettings.ts@@ -17,7 +17,8 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import type { DashboardWidget } from "@openremote/model";-import { html, LitElement, type TemplateResult, unsafeCSS } from "lit";+import { html, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { style } from "./style";import { until } from "lit/directives/until.js";@@ -33,7 +34,7 @@ const tableStyle = require("@material/data-table/dist/mdc.data-table.css");/* ------------------------------------ */@customElement("or-dashboard-widgetsettings")-export class OrDashboardWidgetsettings extends translate(i18next)(LitElement) {+export class OrDashboardWidgetsettings extends translate(i18next)(OrElement) {static get styles() {return [unsafeCSS(tableStyle), style];}diff --git a/ui/component/or-dashboard-builder/src/panels/assettypes-panel.ts b/ui/component/or-dashboard-builder/src/panels/assettypes-panel.tsindex e76145676..fb3e80b87 100644--- a/ui/component/or-dashboard-builder/src/panels/assettypes-panel.ts+++ b/ui/component/or-dashboard-builder/src/panels/assettypes-panel.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { type AssetDescriptor, AssetModelUtil, type AssetTypeInfo } from "@openremote/model";import { i18next } from "@openremote/or-translate";@@ -105,7 +106,7 @@ const styling = css``;@customElement("assettypes-panel")-export class AssettypesPanel extends LitElement {+export class AssettypesPanel extends OrElement {@property() // selected asset typeprotected assetType?: string;diff --git a/ui/component/or-dashboard-builder/src/panels/attributes-panel.ts b/ui/component/or-dashboard-builder/src/panels/attributes-panel.tsindex f0827c56a..0e277ae4f 100644--- a/ui/component/or-dashboard-builder/src/panels/attributes-panel.ts+++ b/ui/component/or-dashboard-builder/src/panels/attributes-panel.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, type CSSResult, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, type CSSResult, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { type Asset, type AssetDescriptor, AssetModelUtil, type Attribute, type AttributeRef } from "@openremote/model";import { style } from "../style";@@ -205,7 +206,7 @@ const styling = css``;@customElement("attributes-panel")-export class AttributesPanel extends LitElement {+export class AttributesPanel extends OrElement {@property({ type: Array })public attributeRefs: AttributeRef[] = [];diff --git a/ui/component/or-dashboard-builder/src/panels/thresholds-panel.ts b/ui/component/or-dashboard-builder/src/panels/thresholds-panel.tsindex a680d295e..f4ed4235f 100644--- a/ui/component/or-dashboard-builder/src/panels/thresholds-panel.ts+++ b/ui/component/or-dashboard-builder/src/panels/thresholds-panel.ts@@ -17,7 +17,8 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import { InputType, type OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";-import { css, type CSSResult, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, type CSSResult, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { ifDefined } from "lit/directives/if-defined.js";import { DefaultColor5 } from "@openremote/core";@@ -100,7 +101,7 @@ const styling = css``;@customElement("thresholds-panel")-export class ThresholdsPanel extends LitElement {+export class ThresholdsPanel extends OrElement {@property()protected thresholds: [number, string][] = [];diff --git a/ui/component/or-dashboard-builder/src/util/or-widget.ts b/ui/component/or-dashboard-builder/src/util/or-widget.tsindex d7535de25..d0b89858f 100644--- a/ui/component/or-dashboard-builder/src/util/or-widget.ts+++ b/ui/component/or-dashboard-builder/src/util/or-widget.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { type CSSResult, LitElement, type TemplateResult } from "lit";+import type { CSSResult, TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { property } from "lit/decorators.js";import type { WidgetConfig } from "./widget-config";import type { WidgetSettings } from "./widget-settings";@@ -35,7 +36,7 @@ export interface WidgetManifest {// Main OrWidget class where all widgets extend their functionality on.// It contains several methods used for rendering by the parent component; OrDashboardWidget-export abstract class OrWidget extends LitElement {+export abstract class OrWidget extends OrElement {protected static manifest: WidgetManifest;@property({ type: Object })diff --git a/ui/component/or-dashboard-builder/src/util/settings-panel.ts b/ui/component/or-dashboard-builder/src/util/settings-panel.tsindex 109a87625..b1e8aa269 100644--- a/ui/component/or-dashboard-builder/src/util/settings-panel.ts+++ b/ui/component/or-dashboard-builder/src/util/settings-panel.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult } from "lit";+import { css, html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { until } from "lit/directives/until.js";import { when } from "lit/directives/when.js";@@ -62,7 +63,7 @@ const styling = css``;@customElement("settings-panel")-export class SettingsPanel extends LitElement {+export class SettingsPanel extends OrElement {@property({ type: Boolean })public expanded = false;diff --git a/ui/component/or-dashboard-builder/src/util/widget-settings.ts b/ui/component/or-dashboard-builder/src/util/widget-settings.tsindex c13d1568b..fd94ee47e 100644--- a/ui/component/or-dashboard-builder/src/util/widget-settings.ts+++ b/ui/component/or-dashboard-builder/src/util/widget-settings.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, type PropertyValues, type TemplateResult } from "lit";+import type { PropertyValues, TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { property } from "lit/decorators.js";import type { WidgetConfig } from "./widget-config";import { style } from "../style";@@ -33,7 +34,7 @@ export class WidgetSettingsChangedEvent extends CustomEvent<WidgetConfig> {}}-export abstract class WidgetSettings extends LitElement {+export abstract class WidgetSettings extends OrElement {@property()protected readonly widgetConfig: WidgetConfig;diff --git a/ui/component/or-dashboard-builder/tsconfig.json b/ui/component/or-dashboard-builder/tsconfig.jsonindex 579b4f9ec..5bca850d6 100644--- a/ui/component/or-dashboard-builder/tsconfig.json+++ b/ui/component/or-dashboard-builder/tsconfig.json@@ -5,5 +5,5 @@"rootDir": "src"},"include": ["./src"],- "references": [{ "path": "../core" }, { "path": "../rest" }, { "path": "../model" }]+ "references": [{ "path": "../or-element" }, { "path": "../core" }, { "path": "../rest" }, { "path": "../model" }]}diff --git a/ui/component/or-gauge/package.json b/ui/component/or-gauge/package.jsonindex 0457b8e4b..98ffc8f0e 100644--- a/ui/component/or-gauge/package.json+++ b/ui/component/or-gauge/package.json@@ -23,6 +23,7 @@"dependencies": {"@openremote/core": "workspace:*","@openremote/model": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-translate": "workspace:*","gaugeJS": "1.3.9",diff --git a/ui/component/or-gauge/src/index.ts b/ui/component/or-gauge/src/index.tsindex 6db0cadc2..26894dfaf 100644--- a/ui/component/or-gauge/src/index.ts+++ b/ui/component/or-gauge/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement } from "lit";+import { css, html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import { type Asset, AssetModelUtil, type Attribute, type AttributeRef } from "@openremote/model";import { Gauge, type GaugeOptions } from "gaugeJS";@@ -113,7 +114,7 @@ export interface OrGaugeConfig {}@customElement("or-gauge")-export class OrGauge extends LitElement {+export class OrGauge extends OrElement {static get styles() {return [styling];}diff --git a/ui/component/or-gauge/tsconfig.json b/ui/component/or-gauge/tsconfig.jsonindex f9cee418c..d7c714141 100644--- a/ui/component/or-gauge/tsconfig.json+++ b/ui/component/or-gauge/tsconfig.json@@ -7,6 +7,7 @@},"include": ["./src", "./@types"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../or-components" },{ "path": "../or-icon" },diff --git a/ui/component/or-icon/package.json b/ui/component/or-icon/package.jsonindex 11b7ad488..80193cf69 100644--- a/ui/component/or-icon/package.json+++ b/ui/component/or-icon/package.json@@ -25,6 +25,7 @@"dependencies": {"@mdi/font": "latest","@openremote/model": "workspace:*",+ "@openremote/or-element": "workspace:*","lit": "^3.3.1"},"devDependencies": {diff --git a/ui/component/or-icon/src/index.ts b/ui/component/or-icon/src/index.tsindex d2e2bfec9..9bd57a6fe 100644--- a/ui/component/or-icon/src/index.ts+++ b/ui/component/or-icon/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { unsafeSVG } from "lit/directives/unsafe-svg.js";import { customElement, property, state } from "lit/decorators.js";import { type AssetDescriptor, AssetModelUtil, WellknownAssets } from "@openremote/model";@@ -167,7 +168,7 @@ export function getAssetDescriptorIconTemplate(}@customElement("or-icon")-export class OrIcon extends LitElement {+export class OrIcon extends OrElement {// language=CSSstatic get styles() {return [diff --git a/ui/component/or-icon/tsconfig.json b/ui/component/or-icon/tsconfig.jsonindex e83aafa2f..dd062e157 100644--- a/ui/component/or-icon/tsconfig.json+++ b/ui/component/or-icon/tsconfig.json@@ -6,5 +6,5 @@"typeRoots": ["./@types"]},"include": ["./src", "./@types"],- "references": [{ "path": "../model" }]+ "references": [{ "path": "../or-element" }, { "path": "../model" }]}diff --git a/ui/component/or-json-forms/package.json b/ui/component/or-json-forms/package.jsonindex 8d3521b6a..3830888df 100644--- a/ui/component/or-json-forms/package.json+++ b/ui/component/or-json-forms/package.json@@ -25,6 +25,7 @@"@jsonforms/core": "^3.5.1","@openremote/core": "workspace:*","@openremote/or-components": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-mwc-components": "workspace:*","@openremote/or-translate": "workspace:*","@openremote/or-vaadin-components": "workspace:*",diff --git a/ui/component/or-json-forms/src/base-element.ts b/ui/component/or-json-forms/src/base-element.tsindex 8b762a487..e8e58eac9 100644--- a/ui/component/or-json-forms/src/base-element.ts+++ b/ui/component/or-json-forms/src/base-element.ts@@ -16,8 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement } from "lit";import { property } from "lit/decorators.js";+import { OrElement } from "@openremote/or-element";import type {JsonFormsCellRendererRegistryEntry,JsonFormsRendererRegistryEntry,@@ -40,7 +40,7 @@ export interface AdditionalProps {}export abstract class BaseElement<T extends UISchemaElement, P extends OwnPropsOfRenderer>- extends LitElement+ extends OrElementimplements OwnPropsOfRenderer, AdditionalProps{@property({ type: Object })diff --git a/ui/component/or-json-forms/src/index.ts b/ui/component/or-json-forms/src/index.tsindex d5ab56b4c..4e5f8fcfb 100644--- a/ui/component/or-json-forms/src/index.ts+++ b/ui/component/or-json-forms/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues } from "lit";+import { css, html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { ErrorObject } from "ajv";import {@@ -74,10 +75,7 @@ const styles = css``;@customElement("or-json-forms")-export class OrJSONForms- extends translate(i18next)(LitElement)- implements OwnPropsOfJsonFormsRenderer, AdditionalProps-{+export class OrJSONForms extends translate(i18next)(OrElement) implements OwnPropsOfJsonFormsRenderer, AdditionalProps {@property({ type: Object })public uischema?: UISchemaElement;diff --git a/ui/component/or-json-forms/tsconfig.json b/ui/component/or-json-forms/tsconfig.jsonindex 30532c600..6a5bd66ae 100644--- a/ui/component/or-json-forms/tsconfig.json+++ b/ui/component/or-json-forms/tsconfig.json@@ -6,6 +6,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../rest" },{ "path": "../model" },diff --git a/ui/component/or-log-viewer/package.json b/ui/component/or-log-viewer/package.jsonindex aa060e408..930ea6ef2 100644--- a/ui/component/or-log-viewer/package.json+++ b/ui/component/or-log-viewer/package.json@@ -26,6 +26,7 @@"@openremote/core": "workspace:*","@openremote/model": "workspace:*","@openremote/or-components": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-mwc-components": "workspace:*","@openremote/or-translate": "workspace:*","@openremote/or-vaadin-components": "workspace:*",diff --git a/ui/component/or-log-viewer/src/index.ts b/ui/component/or-log-viewer/src/index.tsindex 6b70baddb..adfe2ec81 100644--- a/ui/component/or-log-viewer/src/index.ts+++ b/ui/component/or-log-viewer/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { i18next, translate } from "@openremote/or-translate";import * as Model from "@openremote/model";@@ -173,7 +174,7 @@ const style = css``;@customElement("or-log-viewer")-export class OrLogViewer extends translate(i18next)(LitElement) {+export class OrLogViewer extends translate(i18next)(OrElement) {public static DEFAULT_TIMESTAMP_FORMAT = "L HH:mm:ss";public static DEFAULT_LIMIT = 50;public static DEFAULT_LEVEL = Model.SyslogLevel.INFO;diff --git a/ui/component/or-log-viewer/tsconfig.json b/ui/component/or-log-viewer/tsconfig.jsonindex 6f2eeb840..56aa4e5e3 100644--- a/ui/component/or-log-viewer/tsconfig.json+++ b/ui/component/or-log-viewer/tsconfig.json@@ -5,5 +5,10 @@"rootDir": "src"},"include": ["./src"],- "references": [{ "path": "../core" }, { "path": "../or-mwc-components" }, { "path": "../or-translate" }]+ "references": [+ { "path": "../or-element" },+ { "path": "../core" },+ { "path": "../or-mwc-components" },+ { "path": "../or-translate" }+ ]}diff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.jsonindex e76d52a9c..3be565a20 100644--- a/ui/component/or-map/package.json+++ b/ui/component/or-map/package.json@@ -25,6 +25,7 @@"dependencies": {"@openremote/core": "workspace:*","@openremote/model": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-mwc-components": "workspace:*","@openremote/or-translate": "workspace:*",diff --git a/ui/component/or-map/src/controls/geocoder.ts b/ui/component/or-map/src/controls/geocoder.tsindex 076d6dcab..cd56f816c 100644--- a/ui/component/or-map/src/controls/geocoder.ts+++ b/ui/component/or-map/src/controls/geocoder.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement } from "lit";+import { css, html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import type { Map as MapGL } from "maplibre-gl";import { OrMapBaseControl } from "./base";@@ -56,7 +57,7 @@ declare global {* mapsettings.json.*/@customElement("or-map-geocoder")-export class OrMapGeocoder extends LitElement {+export class OrMapGeocoder extends OrElement {static get styles() {return css`:host {diff --git a/ui/component/or-map/src/controls/legend.ts b/ui/component/or-map/src/controls/legend.tsindex 231de2b25..7eaf3be99 100644--- a/ui/component/or-map/src/controls/legend.ts+++ b/ui/component/or-map/src/controls/legend.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, type CSSResultGroup, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, type CSSResultGroup, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { countBadgeStyle } from "./styles";import { customElement, property, state } from "lit/decorators.js";import { AssetModelUtil } from "@openremote/model";@@ -49,7 +50,7 @@ declare global {}@customElement("or-map-legend")-export class OrMapLegend extends LitElement {+export class OrMapLegend extends OrElement {static get styles(): CSSResultGroup {return [countBadgeStyle,diff --git a/ui/component/or-map/src/controls/navigation.ts b/ui/component/or-map/src/controls/navigation.tsindex 033109071..f55525780 100644--- a/ui/component/or-map/src/controls/navigation.ts+++ b/ui/component/or-map/src/controls/navigation.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement } from "lit";+import { css, html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, state } from "lit/decorators.js";import type { Map as MapGL } from "maplibre-gl";import { OrMapBaseControl } from "./base";@@ -25,7 +26,7 @@ import "@openremote/or-vaadin-components/or-vaadin-button";import "@openremote/or-icon";@customElement("or-map-navigation")-export class OrMapNavigation extends LitElement {+export class OrMapNavigation extends OrElement {static get styles() {return css`:host {diff --git a/ui/component/or-map/src/controls/preset-filter.ts b/ui/component/or-map/src/controls/preset-filter.tsindex a221ce786..82d56bcce 100644--- a/ui/component/or-map/src/controls/preset-filter.ts+++ b/ui/component/or-map/src/controls/preset-filter.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, nothing, type PropertyValues, type TemplateResult } from "lit";+import { css, html, nothing, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { countBadgeStyle } from "./styles";import { customElement, property, state } from "lit/decorators.js";import manager, { OREvent, Util } from "@openremote/core";@@ -62,7 +63,7 @@ manager.addListener((event) => {});@customElement("or-map-preset-filter")-export class OrMapPresetFilter extends LitElement {+export class OrMapPresetFilter extends OrElement {static get styles() {return [countBadgeStyle,diff --git a/ui/component/or-map/src/index.ts b/ui/component/or-map/src/index.tsindex 66e158344..e35953450 100644--- a/ui/component/or-map/src/index.ts+++ b/ui/component/or-map/src/index.ts@@ -17,7 +17,8 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import manager, { type EventCallback } from "@openremote/core";-import { html, LitElement, type PropertyValues } from "lit";+import { html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { type IControl, LngLat, LngLatLike } from "maplibre-gl";import { style } from "./style";@@ -312,7 +313,7 @@ export const geoJsonPointInputTemplateProvider: ValueInputProviderGenerator = (};@customElement("or-map")-export class OrMap extends LitElement {+export class OrMap extends OrElement {public static styles = style;@property({ type: Object })diff --git a/ui/component/or-map/src/markers/or-cluster-marker.ts b/ui/component/or-map/src/markers/or-cluster-marker.tsindex 60de11431..153a4e2b0 100644--- a/ui/component/or-map/src/markers/or-cluster-marker.ts+++ b/ui/component/or-map/src/markers/or-cluster-marker.ts@@ -16,12 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import {- svg as html /** Aliased for syntax highlighting */,- LitElement,- type TemplateResult,- type SVGTemplateResult,-} from "lit";+import { svg as html /** Aliased for syntax highlighting */, type TemplateResult, type SVGTemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { formatCount } from "../util";import { customElement } from "lit/decorators.js";import type { GeoJSONSource, Map } from "maplibre-gl";@@ -34,7 +30,7 @@ export type Slice = [type: string, color: string, count: number];type SliceWithOffset = [...Slice, offset: number];@customElement("or-cluster-marker")-export class OrClusterMarker extends LitElement {+export class OrClusterMarker extends OrElement {public lng?: number;public lat?: number;diff --git a/ui/component/or-map/src/markers/or-map-marker.ts b/ui/component/or-map/src/markers/or-map-marker.tsindex 3263a9f18..feb4799a8 100644--- a/ui/component/or-map/src/markers/or-map-marker.ts+++ b/ui/component/or-map/src/markers/or-map-marker.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, type CSSResult, type CSSResultGroup, html, LitElement, type PropertyValues, unsafeCSS } from "lit";+import { css, type CSSResult, type CSSResultGroup, html, type PropertyValues, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { markerActiveColorVar, markerColorVar } from "../style";import { DefaultBoxShadow } from "@openremote/core";@@ -77,7 +78,7 @@ declare global {* This component doesn't directly render anything instead it generates DOM that can be added to the map component*/@customElement("or-map-marker")-export class OrMapMarker extends LitElement {+export class OrMapMarker extends OrElement {static get styles(): CSSResultGroup {return css`.label {diff --git a/ui/component/or-map/src/or-map-asset-card.ts b/ui/component/or-map/src/or-map-asset-card.tsindex 1d165521f..744b9023d 100644--- a/ui/component/or-map/src/or-map-asset-card.ts+++ b/ui/component/or-map/src/or-map-asset-card.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { type CSSResultGroup, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { type CSSResultGroup, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { classMap } from "lit-html/directives/class-map.js";import {@@ -72,7 +73,7 @@ export const DefaultConfig: MapAssetCardConfig = {};@customElement("or-map-asset-card")-export class OrMapAssetCard extends subscribe(manager)(LitElement) {+export class OrMapAssetCard extends subscribe(manager)(OrElement) {@property({ type: String, reflect: true, attribute: true })public assetId?: string;diff --git a/ui/component/or-map/tsconfig.json b/ui/component/or-map/tsconfig.jsonindex b4662d1c4..83cb88133 100644--- a/ui/component/or-map/tsconfig.json+++ b/ui/component/or-map/tsconfig.json@@ -6,6 +6,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../rest" },{ "path": "../model" },diff --git a/ui/component/or-mwc-components/package.json b/ui/component/or-mwc-components/package.jsonindex 7c0685239..068e61d57 100644--- a/ui/component/or-mwc-components/package.json+++ b/ui/component/or-mwc-components/package.json@@ -56,6 +56,7 @@"@material/textfield": "^9.0.0","@openremote/core": "workspace:*","@openremote/model": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-translate": "workspace:*","lit": "^3.3.1",diff --git a/ui/component/or-mwc-components/src/or-mwc-dialog.ts b/ui/component/or-mwc-components/src/or-mwc-dialog.tsindex ada6abab5..562cb894b 100644--- a/ui/component/or-mwc-components/src/or-mwc-dialog.ts+++ b/ui/component/or-mwc-components/src/or-mwc-dialog.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { MDCDialog } from "@material/dialog";import "@openremote/or-translate";@@ -208,7 +209,7 @@ const style = css``;@customElement("or-mwc-dialog")-export class OrMwcDialog extends LitElement {+export class OrMwcDialog extends OrElement {/*** Can be set by apps to control where in the DOM dialogs are added*/diff --git a/ui/component/or-mwc-components/src/or-mwc-drawer.ts b/ui/component/or-mwc-components/src/or-mwc-drawer.tsindex a8c60d5bb..2349ffc30 100644--- a/ui/component/or-mwc-components/src/or-mwc-drawer.ts+++ b/ui/component/or-mwc-components/src/or-mwc-drawer.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { MDCDrawer } from "@material/drawer";import { classMap } from "lit/directives/class-map.js";@@ -36,7 +37,7 @@ export class OrMwcDrawerChangedEvent extends CustomEvent<boolean> {}@customElement("or-mwc-drawer")-export class OrMwcDrawer extends LitElement {+export class OrMwcDrawer extends OrElement {public static get styles() {return [css`diff --git a/ui/component/or-mwc-components/src/or-mwc-input.ts b/ui/component/or-mwc-components/src/or-mwc-input.tsindex 2ef90de8f..f65b16b4c 100644--- a/ui/component/or-mwc-components/src/or-mwc-input.ts+++ b/ui/component/or-mwc-components/src/or-mwc-input.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { classMap } from "lit/directives/class-map.js";import { ifDefined } from "lit/directives/if-defined.js";@@ -484,7 +485,7 @@ const style = css`* @deprecated Not actively maintained anymore. We're slowly migrating towards `or-vaadin-input` instead.*/@customElement("or-mwc-input")-export class OrMwcInput extends LitElement {+export class OrMwcInput extends OrElement {static get styles() {return [css`diff --git a/ui/component/or-mwc-components/src/or-mwc-list.ts b/ui/component/or-mwc-components/src/or-mwc-list.tsindex 9048783e3..bc5caa7ae 100644--- a/ui/component/or-mwc-components/src/or-mwc-list.ts+++ b/ui/component/or-mwc-components/src/or-mwc-list.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";import { customElement, property, query } from "lit/decorators.js";import { styleMap } from "lit/directives/style-map.js";import { ifDefined } from "lit/directives/if-defined.js";@@ -278,7 +279,7 @@ const style = css``;@customElement("or-mwc-list")-export class OrMwcList extends LitElement {+export class OrMwcList extends OrElement {static get styles() {return [css`diff --git a/ui/component/or-mwc-components/src/or-mwc-menu.ts b/ui/component/or-mwc-components/src/or-mwc-menu.tsindex 875604933..a8254d756 100644--- a/ui/component/or-mwc-components/src/or-mwc-menu.ts+++ b/ui/component/or-mwc-components/src/or-mwc-menu.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";+import { css, html, type PropertyValues, type TemplateResult, unsafeCSS } from "lit";import { customElement, property, query } from "lit/decorators.js";import { classMap } from "lit/directives/class-map.js";import { MDCMenu } from "@material/menu";@@ -176,7 +177,7 @@ const style = css``;@customElement("or-mwc-menu")-export class OrMwcMenu extends LitElement {+export class OrMwcMenu extends OrElement {static get styles() {return [css`diff --git a/ui/component/or-mwc-components/src/or-mwc-snackbar.ts b/ui/component/or-mwc-components/src/or-mwc-snackbar.tsindex ba53fbe5b..78e373e43 100644--- a/ui/component/or-mwc-components/src/or-mwc-snackbar.ts+++ b/ui/component/or-mwc-components/src/or-mwc-snackbar.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, unsafeCSS } from "lit";+import { css, html, type PropertyValues, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { MDCSnackbar, type MDCSnackbarCloseEvent } from "@material/snackbar";@@ -75,7 +76,7 @@ export function showSnackbar(}@customElement("or-mwc-snackbar")-export class OrMwcSnackbar extends LitElement {+export class OrMwcSnackbar extends OrElement {/*** Can be set by apps to control where in the DOM snackbars are added*/diff --git a/ui/component/or-mwc-components/src/or-mwc-table.ts b/ui/component/or-mwc-components/src/or-mwc-table.tsindex 85943ae26..4e780902e 100644--- a/ui/component/or-mwc-components/src/or-mwc-table.ts+++ b/ui/component/or-mwc-components/src/or-mwc-table.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { classMap } from "lit/directives/class-map.js";import { until } from "lit/directives/until.js";@@ -241,7 +242,7 @@ export class OrMwcTableRowSelectEvent extends CustomEvent<OrMwcTableRowSelectDet}@customElement("or-mwc-table")-export class OrMwcTable extends LitElement {+export class OrMwcTable extends OrElement {static get styles() {return [css`diff --git a/ui/component/or-mwc-components/src/or-mwc-tabs.ts b/ui/component/or-mwc-components/src/or-mwc-tabs.tsindex 1702fad81..dc2519d1f 100644--- a/ui/component/or-mwc-components/src/or-mwc-tabs.ts+++ b/ui/component/or-mwc-components/src/or-mwc-tabs.ts@@ -17,7 +17,8 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import { MDCTabBar } from "@material/tab-bar";-import { css, type CSSResult, html, LitElement, type TemplateResult, unsafeCSS } from "lit";+import { css, type CSSResult, html, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { DefaultColor4, DefaultColor8 } from "@openremote/core";import { unsafeHTML } from "lit/directives/unsafe-html.js";@@ -67,7 +68,7 @@ const tabStyling = css`/* ----------------- */@customElement("or-mwc-tabs")-export class OrMwcTabs extends LitElement {+export class OrMwcTabs extends OrElement {static get styles() {return [unsafeCSS(tabStyle),diff --git a/ui/component/or-mwc-components/tsconfig.json b/ui/component/or-mwc-components/tsconfig.jsonindex 6dc718c08..7c5443e7e 100644--- a/ui/component/or-mwc-components/tsconfig.json+++ b/ui/component/or-mwc-components/tsconfig.json@@ -5,5 +5,10 @@"rootDir": "src"},"include": ["./src"],- "references": [{ "path": "../core" }, { "path": "../or-translate" }, { "path": "../or-icon" }]+ "references": [+ { "path": "../or-element" },+ { "path": "../core" },+ { "path": "../or-translate" },+ { "path": "../or-icon" }+ ]}diff --git a/ui/component/or-rive-renderer/package.json b/ui/component/or-rive-renderer/package.jsonindex ccf9188c9..bb789c143 100644--- a/ui/component/or-rive-renderer/package.json+++ b/ui/component/or-rive-renderer/package.json@@ -21,6 +21,7 @@"repository": "https://github.com/openremote/openremote","license": "AGPL-3.0-or-later","dependencies": {+ "@openremote/or-element": "workspace:*","@rive-app/webgl2": "^2.38.1","lit": "^3.3.1","lodash.debounce": "^4.0.8"diff --git a/ui/component/or-rive-renderer/src/index.ts b/ui/component/or-rive-renderer/src/index.tsindex 416607615..7696df506 100644--- a/ui/component/or-rive-renderer/src/index.ts+++ b/ui/component/or-rive-renderer/src/index.ts@@ -17,7 +17,8 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import { customElement, property, query } from "lit/decorators.js";-import { LitElement, type PropertyValues, css, html } from "lit";+import { type PropertyValues, css, html } from "lit";+import { OrElement } from "@openremote/or-element";import { Rive, RuntimeLoader, type ViewModelInstance } from "@rive-app/webgl2";import debounce from "lodash.debounce";@@ -28,7 +29,7 @@ import riveWASMResource from "@rive-app/webgl2/rive.wasm";RuntimeLoader.setWasmUrl(riveWASMResource);@customElement("or-rive-renderer")-export class OrRiveRenderer extends LitElement {+export class OrRiveRenderer extends OrElement {static get styles() {return [css`diff --git a/ui/component/or-rules/package.json b/ui/component/or-rules/package.jsonindex 6b4514f18..e28c373fb 100644--- a/ui/component/or-rules/package.json+++ b/ui/component/or-rules/package.json@@ -27,6 +27,7 @@"@openremote/or-attribute-input": "workspace:*","@openremote/or-attribute-picker": "workspace:*","@openremote/or-components": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-map": "workspace:*","@openremote/or-mwc-components": "workspace:*",diff --git a/ui/component/or-rules/src/flow-viewer/components/confirmation-dialog.ts b/ui/component/or-rules/src/flow-viewer/components/confirmation-dialog.tsindex f04f7f9e8..a34e36bdc 100644--- a/ui/component/or-rules/src/flow-viewer/components/confirmation-dialog.ts+++ b/ui/component/or-rules/src/flow-viewer/components/confirmation-dialog.ts@@ -16,13 +16,14 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { i18next, translate } from "@openremote/or-translate";import { InputType } from "@openremote/or-mwc-components/or-mwc-input";@customElement("confirmation-dialog")-export class ConfirmationDialog extends translate(i18next)(LitElement) {+export class ConfirmationDialog extends translate(i18next)(OrElement) {@property({ type: String }) public agreeText = i18next.t("ok");@property({ type: String }) public disagreeText = i18next.t("cancel");@property({ type: String }) public question = i18next.t("areYouSure", "Are you sure?");diff --git a/ui/component/or-rules/src/flow-viewer/components/connection-container.ts b/ui/component/or-rules/src/flow-viewer/components/connection-container.tsindex b7e30ccec..211fc1873 100644--- a/ui/component/or-rules/src/flow-viewer/components/connection-container.ts+++ b/ui/component/or-rules/src/flow-viewer/components/connection-container.ts@@ -16,14 +16,15 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html } from "lit";+import { html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { repeat } from "lit/directives/repeat.js";import type { EditorWorkspace } from "./editor-workspace";import { project } from "./flow-editor";@customElement("connection-container")-export class ConnectionContainer extends LitElement {+export class ConnectionContainer extends OrElement {@property({ attribute: false }) private workspace!: EditorWorkspace;constructor() {diff --git a/ui/component/or-rules/src/flow-viewer/components/context-menu.ts b/ui/component/or-rules/src/flow-viewer/components/context-menu.tsindex f7eea5781..ca6cc2390 100644--- a/ui/component/or-rules/src/flow-viewer/components/context-menu.ts+++ b/ui/component/or-rules/src/flow-viewer/components/context-menu.ts@@ -16,13 +16,14 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import type { ContextMenuEntry, ContextMenuButton } from "../models/context-menu-button";import { translate, i18next } from "@openremote/or-translate";@customElement("context-menu")-export class ContextMenu extends translate(i18next)(LitElement) {+export class ContextMenu extends translate(i18next)(OrElement) {public static get opened() {return ContextMenu.main.isOpen;}diff --git a/ui/component/or-rules/src/flow-viewer/components/editor-workspace.ts b/ui/component/or-rules/src/flow-viewer/components/editor-workspace.tsindex 2da2e263f..65fc362e3 100644--- a/ui/component/or-rules/src/flow-viewer/components/editor-workspace.ts+++ b/ui/component/or-rules/src/flow-viewer/components/editor-workspace.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html } from "lit";+import { html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { repeat } from "lit/directives/repeat.js";import type { Node, NodeSocket } from "@openremote/model";@@ -34,7 +35,7 @@ import { createContextMenuButtons } from "./workspace-contextmenu-options";import { InputType } from "@openremote/or-mwc-components/or-mwc-input";@customElement("editor-workspace")-export class EditorWorkspace extends translate(i18next)(LitElement) {+export class EditorWorkspace extends translate(i18next)(OrElement) {public get clientRect() {return this.cachedClientRect;}diff --git a/ui/component/or-rules/src/flow-viewer/components/flow-editor.ts b/ui/component/or-rules/src/flow-viewer/components/flow-editor.tsindex 82fb95082..4f8e4775b 100644--- a/ui/component/or-rules/src/flow-viewer/components/flow-editor.ts+++ b/ui/component/or-rules/src/flow-viewer/components/flow-editor.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { Integration } from "../services/integration";import { CopyPasteManager } from "../services/copy-paste-manager";@@ -43,7 +44,7 @@ export const shortcuts = new Shortcuts();export const newIds: Set<string> = new Set<string>();@customElement("flow-editor")-export class FlowEditor extends translate(i18next)(LitElement) implements RuleView {+export class FlowEditor extends translate(i18next)(OrElement) implements RuleView {@query("node-panel") public nodePanel!: NodePanel;@query("top-bar") public topBar!: TopBar;@query("editor-workspace") public editorWorkspace!: EditorWorkspace;diff --git a/ui/component/or-rules/src/flow-viewer/components/flow-node-socket.ts b/ui/component/or-rules/src/flow-viewer/components/flow-node-socket.tsindex 9de3b6982..22a7bfad5 100644--- a/ui/component/or-rules/src/flow-viewer/components/flow-node-socket.ts+++ b/ui/component/or-rules/src/flow-viewer/components/flow-node-socket.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import type { NodeSocket } from "@openremote/model";import { IdentityDomLink } from "../node-structure";@@ -26,7 +27,7 @@ import { project } from "./flow-editor";import type { FlowNode } from "./flow-node";@customElement("flow-node-socket")-export class FlowNodeSocket extends translate(i18next)(LitElement) {+export class FlowNodeSocket extends translate(i18next)(OrElement) {public get connectionPosition() {return Utilities.getCenter(this.circleElem.getBoundingClientRect());}diff --git a/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts b/ui/component/or-rules/src/flow-viewer/components/internal-picker.tsindex b587df94f..b7d0613be 100644--- a/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts+++ b/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, css, type TemplateResult } from "lit";+import { html, css, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import {type Node,@@ -42,7 +43,7 @@ import { getAssetDescriptorIconTemplate } from "@openremote/or-icon";import { ifDefined } from "lit/directives/if-defined.js";@customElement("internal-picker")-export class InternalPicker extends translate(i18next)(LitElement) {+export class InternalPicker extends translate(i18next)(OrElement) {@property({ converter: nodeConverter, reflect: true }) public node!: Node;@property({ type: Number, reflect: true }) public internalIndex!: number;diff --git a/ui/component/or-rules/src/flow-viewer/components/node-menu-item.ts b/ui/component/or-rules/src/flow-viewer/components/node-menu-item.tsindex c7509efc3..40696ad5e 100644--- a/ui/component/or-rules/src/flow-viewer/components/node-menu-item.ts+++ b/ui/component/or-rules/src/flow-viewer/components/node-menu-item.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { type Node, NodeType } from "@openremote/model";import type { EditorWorkspace } from "./editor-workspace";@@ -26,7 +27,7 @@ import { newIds, project } from "./flow-editor";import { CopyMachine } from "../node-structure";@customElement("node-menu-item")-export class NodeMenuItem extends translate(i18next)(LitElement) {+export class NodeMenuItem extends translate(i18next)(OrElement) {@property({ attribute: false }) public node!: Node;@property({ attribute: false }) private isDragging = false;diff --git a/ui/component/or-rules/src/flow-viewer/components/node-panel.ts b/ui/component/or-rules/src/flow-viewer/components/node-panel.tsindex aa21c7e65..8224c514e 100644--- a/ui/component/or-rules/src/flow-viewer/components/node-panel.ts+++ b/ui/component/or-rules/src/flow-viewer/components/node-panel.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { NodeType, type Node } from "@openremote/model";import { i18next, translate } from "@openremote/or-translate";@@ -25,7 +26,7 @@ import type { FlowEditor } from "./flow-editor";import { OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";@customElement("node-panel")-export class NodePanel extends translate(i18next)(LitElement) {+export class NodePanel extends translate(i18next)(OrElement) {@property({ type: Array }) public nodes: Node[] = [];static get styles() {return css`diff --git a/ui/component/or-rules/src/flow-viewer/components/notification-dialog.ts b/ui/component/or-rules/src/flow-viewer/components/notification-dialog.tsindex 1da43af77..e8a5cc557 100644--- a/ui/component/or-rules/src/flow-viewer/components/notification-dialog.ts+++ b/ui/component/or-rules/src/flow-viewer/components/notification-dialog.ts@@ -16,13 +16,14 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { i18next, translate } from "@openremote/or-translate";import { InputType } from "@openremote/or-mwc-components/or-mwc-input";@customElement("notification-dialog")-export class NotificationDialog extends translate(i18next)(LitElement) {+export class NotificationDialog extends translate(i18next)(OrElement) {@property({ type: String }) public buttonText = i18next.t("ok");@property({ type: String }) public message = " ";diff --git a/ui/component/or-rules/src/flow-viewer/components/popup-modal.ts b/ui/component/or-rules/src/flow-viewer/components/popup-modal.tsindex c6b050a2c..27aa455da 100644--- a/ui/component/or-rules/src/flow-viewer/components/popup-modal.ts+++ b/ui/component/or-rules/src/flow-viewer/components/popup-modal.ts@@ -16,13 +16,14 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, css, html, type TemplateResult } from "lit";+import { css, html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { modal } from "./flow-editor";import { translate, i18next } from "@openremote/or-translate";@customElement("popup-modal")-export class PopupModal extends translate(i18next)(LitElement) {+export class PopupModal extends translate(i18next)(OrElement) {@property({ type: Boolean }) public closeButton = true;@property({ type: String }) public header?: string;@property({ attribute: false }) public content?: TemplateResult;diff --git a/ui/component/or-rules/src/flow-viewer/components/rule-browser.ts b/ui/component/or-rules/src/flow-viewer/components/rule-browser.tsindex af91a6ac7..972fd8ed5 100644--- a/ui/component/or-rules/src/flow-viewer/components/rule-browser.ts+++ b/ui/component/or-rules/src/flow-viewer/components/rule-browser.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, css, html } from "lit";+import { css, html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import type { GlobalRuleset } from "@openremote/model";import rest from "@openremote/rest";@@ -26,7 +27,7 @@ import { Status } from "../models/status";import { exporter, project, modal } from "./flow-editor";@customElement("rule-browser")-export class RuleBrowser extends translate(i18next)(LitElement) {+export class RuleBrowser extends translate(i18next)(OrElement) {@property({ type: Number }) private status = Status.Idle;private retrievedRules: GlobalRuleset[] = [];diff --git a/ui/component/or-rules/src/flow-viewer/components/selectable-element.ts b/ui/component/or-rules/src/flow-viewer/components/selectable-element.tsindex 5d0aaef6a..dfb28531e 100644--- a/ui/component/or-rules/src/flow-viewer/components/selectable-element.ts+++ b/ui/component/or-rules/src/flow-viewer/components/selectable-element.ts@@ -16,12 +16,12 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement } from "lit";import { property } from "lit/decorators.js";+import { OrElement } from "@openremote/or-element";import { input } from "./flow-editor";import { i18next, translate } from "@openremote/or-translate";-export class SelectableElement extends translate(i18next)(LitElement) {+export class SelectableElement extends translate(i18next)(OrElement) {public get selected() {return this.isSelected;}diff --git a/ui/component/or-rules/src/flow-viewer/components/selection-box.ts b/ui/component/or-rules/src/flow-viewer/components/selection-box.tsindex 37c0f722e..5286d77af 100644--- a/ui/component/or-rules/src/flow-viewer/components/selection-box.ts+++ b/ui/component/or-rules/src/flow-viewer/components/selection-box.ts@@ -16,14 +16,15 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { Utilities } from "../utils";import type { EditorWorkspace } from "./editor-workspace";import { input } from "./flow-editor";@customElement("selection-box")-export class SelectionBox extends LitElement {+export class SelectionBox extends OrElement {public static get styles() {return css`svg {diff --git a/ui/component/or-rules/src/flow-viewer/components/top-bar.ts b/ui/component/or-rules/src/flow-viewer/components/top-bar.tsindex 23a8f2061..f529ae215 100644--- a/ui/component/or-rules/src/flow-viewer/components/top-bar.ts+++ b/ui/component/or-rules/src/flow-viewer/components/top-bar.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { IdentityDomLink } from "../node-structure";import { InputType, type OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";@@ -26,7 +27,7 @@ import { project, modal, input, exporter, type FlowEditor } from "./flow-editor"import { NodePanel } from "./node-panel";@customElement("top-bar")-export class TopBar extends translate(i18next)(LitElement) {+export class TopBar extends translate(i18next)(OrElement) {static get styles() {return css`:host {diff --git a/ui/component/or-rules/src/flow-viewer/components/writable-dropdown.ts b/ui/component/or-rules/src/flow-viewer/components/writable-dropdown.tsindex 83c2271e0..7fa586b64 100644--- a/ui/component/or-rules/src/flow-viewer/components/writable-dropdown.ts+++ b/ui/component/or-rules/src/flow-viewer/components/writable-dropdown.ts@@ -16,12 +16,13 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { LitElement, html, type PropertyValues } from "lit";+import { html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { PickerStyle } from "../styles/picker-styles";@customElement("writable-dropdown")-export class WritableDropdown extends LitElement {+export class WritableDropdown extends OrElement {@property({ type: Object, reflect: true }) public value?: any;@property({ type: Array }) public options: { value: any; name: string }[] = [];diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.tsindex 86914b7e2..fa61fa63e 100644--- a/ui/component/or-rules/src/index.ts+++ b/ui/component/or-rules/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult, unsafeCSS } from "lit";+import { css, html, type TemplateResult, unsafeCSS } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import manager, {DefaultBoxShadow,@@ -874,7 +875,7 @@ export const style = css``;@customElement("or-rules")-export class OrRules extends translate(i18next)(LitElement) {+export class OrRules extends translate(i18next)(OrElement) {public static DEFAULT_RULESET_NAME = "";static get styles() {diff --git a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-alarm.ts b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-alarm.tsindex 7be28f7a1..3512ea5f7 100644--- a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-alarm.ts+++ b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-alarm.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import "@openremote/or-mwc-components/or-mwc-input";import type { RuleActionAlarm, Alarm, User } from "@openremote/model";@@ -25,7 +26,7 @@ import { i18next } from "@openremote/or-translate";import type { OrVaadinSelect } from "@openremote/or-vaadin-components/or-vaadin-select";@customElement("or-rule-form-alarm")-export class OrRuleFormAlarm extends LitElement {+export class OrRuleFormAlarm extends OrElement {@property({ type: Object, attribute: false })public action!: RuleActionAlarm;diff --git a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.ts b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.tsindex 348754a50..06bf6a75c 100644--- a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.ts+++ b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { i18next, translate } from "@openremote/or-translate";import type { EmailNotificationMessage } from "@openremote/model";@@ -25,7 +26,7 @@ import "@openremote/or-mwc-components/or-mwc-input";import { OrVaadinTextField } from "@openremote/or-vaadin-components/or-vaadin-text-field";@customElement("or-rule-form-email-message")-export class OrRuleFormEmailMessage extends translate(i18next)(LitElement) {+export class OrRuleFormEmailMessage extends translate(i18next)(OrElement) {@property({ type: Object })public message?: EmailNotificationMessage;diff --git a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-localized.ts b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-localized.tsindex 1a178585f..b600108b2 100644--- a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-localized.ts+++ b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-localized.ts@@ -17,7 +17,8 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import { i18next, translate } from "@openremote/or-translate";-import { LitElement, type TemplateResult, css, html } from "lit";+import { type TemplateResult, css, html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import type { AbstractNotificationMessageUnion, LocalizedNotificationMessage } from "@openremote/model";import { showSnackbar } from "@openremote/or-mwc-components/or-mwc-snackbar";@@ -32,7 +33,7 @@ import { DefaultColor6 } from "@openremote/core";import type { SelectItem } from "@openremote/or-vaadin-components/or-vaadin-select";@customElement("or-rule-form-localized")-export class OrRuleFormLocalized extends translate(i18next)(LitElement) {+export class OrRuleFormLocalized extends translate(i18next)(OrElement) {@property({ type: Object })public message?: LocalizedNotificationMessage;diff --git a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.ts b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.tsindex 774f97297..a44d92ffb 100644--- a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.ts+++ b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement, css, type TemplateResult } from "lit";+import { html, css, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import "@openremote/or-mwc-components/or-mwc-input";import { i18next, translate } from "@openremote/or-translate";@@ -27,7 +28,7 @@ import { until } from "lit/directives/until.js";import { when } from "lit/directives/when.js";@customElement("or-rule-form-push-notification")-export class OrRuleFormPushNotification extends translate(i18next)(LitElement) {+export class OrRuleFormPushNotification extends translate(i18next)(OrElement) {@property({ type: Object })public message?: PushNotificationMessage;diff --git a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-webhook.ts b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-webhook.tsindex 7a7294d0e..202fcf62d 100644--- a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-webhook.ts+++ b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-webhook.ts@@ -25,7 +25,8 @@ import {} from "@openremote/model";import { InputType, type OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";import { i18next } from "@openremote/or-translate";-import { css, html, LitElement, type TemplateResult } from "lit";+import { css, html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { when } from "lit/directives/when.js";import { OrRulesJsonRuleChangedEvent } from "../or-rule-json-viewer";@@ -40,7 +41,7 @@ const styling = css``;@customElement("or-rule-form-webhook")-export class OrRuleFormWebhook extends LitElement {+export class OrRuleFormWebhook extends OrElement {@property({ type: Object })protected webhook!: Webhook;diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.tsindex 022eb3fe5..0b87dae4d 100644--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.ts+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues } from "lit";+import { css, html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { type RuleActionAlarm, type AssetQuery, AlarmSeverity } from "@openremote/model";@@ -77,7 +78,7 @@ const style = css``;@customElement("or-rule-alarm-modal")-export class OrRuleAlarmModal extends translate(i18next)(LitElement) {+export class OrRuleAlarmModal extends translate(i18next)(OrElement) {static get styles() {return style;}diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.tsindex 8e9574e7e..f7ac5678c 100644--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement, type PropertyValues } from "lit";+import { html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import type { RuleActionNotification, AssetQuery } from "@openremote/model";@@ -82,7 +83,7 @@ export class OrRulesNotificationModalOkEvent extends CustomEvent<void> {}@customElement("or-rule-notification-modal")-export class OrRuleNotificationModal extends translate(i18next)(LitElement) {+export class OrRuleNotificationModal extends translate(i18next)(OrElement) {@property({ type: Object })public action!: RuleActionNotification;diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.tsindex 7c3603ba4..2ee9629cd 100644--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement } from "lit";+import { html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import type { AssetDescriptor, AttributePredicate, AssetQuery, RadialGeofencePredicate } from "@openremote/model";import { getAssetTypeFromQuery } from "../../index";@@ -34,7 +35,7 @@ import { type OrMap, OrMapClickedEvent, type LngLatLike } from "@openremote/or-mimport "@openremote/or-map";@customElement("or-rule-radial-modal")-export class OrRuleRadialModal extends translate(i18next)(LitElement) {+export class OrRuleRadialModal extends translate(i18next)(OrElement) {@property({ type: Object })public assetDescriptor?: AssetDescriptor;diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-webhook-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-webhook-modal.tsindex aae6d0d76..d588c2ea7 100644--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-webhook-modal.ts+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-webhook-modal.ts@@ -20,11 +20,12 @@ import type { RuleActionWebhook } from "@openremote/model";import { InputType, type OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";import type { DialogAction, OrMwcDialog } from "@openremote/or-mwc-components/or-mwc-dialog";import { i18next } from "@openremote/or-translate";-import { html, LitElement, type PropertyValues } from "lit";+import { html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";@customElement("or-rule-webhook-modal")-export class OrRuleWebhookModal extends LitElement {+export class OrRuleWebhookModal extends OrElement {@property({ type: Object })protected action!: RuleActionWebhook;diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-alarm.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-alarm.tsindex 4f2cc2730..37be45564 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-action-alarm.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-alarm.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { html, LitElement, type TemplateResult } from "lit";+import { html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import type { ActionType, RulesConfig } from "../index";import type { JsonRule, RuleActionAlarm, User, UserQuery } from "@openremote/model";@@ -25,7 +26,7 @@ import "./forms/or-rule-form-alarm";import manager from "@openremote/core";@customElement("or-rule-action-alarm")-export class OrRuleActionAlarm extends LitElement {+export class OrRuleActionAlarm extends OrElement {@property({ type: Object, attribute: false })public rule!: JsonRule;diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.tsindex aadfa8081..871c71305 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { getAssetIdsFromQuery, getAssetTypeFromQuery, type RulesConfig } from "../index";import {@@ -63,7 +64,7 @@ const style = css``;@customElement("or-rule-action-attribute")-export class OrRuleActionAttribute extends translate(i18next)(LitElement) {+export class OrRuleActionAttribute extends translate(i18next)(OrElement) {static get styles() {return style;}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-notification.tsindex a96e408a0..e952ad332 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { until } from "lit/directives/until.js";import { ActionType, OrRulesRuleUnsupportedEvent, type RulesConfig } from "../index";@@ -65,7 +66,7 @@ const style = css``;@customElement("or-rule-action-notification")-export class OrRuleActionNotification extends LitElement {+export class OrRuleActionNotification extends OrElement {static get styles() {return style;}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-webhook.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-webhook.tsindex ea3d25e8c..c6e1ca54f 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-action-webhook.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-webhook.ts@@ -17,7 +17,8 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import type { JsonRule, RuleActionWebhook } from "@openremote/model";-import { css, html, LitElement } from "lit";+import { css, html } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import "./modals/or-rule-webhook-modal";import "./forms/or-rule-form-webhook";@@ -39,7 +40,7 @@ const style = css``;@customElement("or-rule-action-webhook")-export class OrRuleActionWebhook extends LitElement {+export class OrRuleActionWebhook extends OrElement {static get styles() {return style;}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.tsindex d8277af02..6a2d643cc 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues } from "lit";+import { css, html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import {type Asset,@@ -131,7 +132,7 @@ const style = css``;@customElement("or-rule-asset-query")-export class OrRuleAssetQuery extends translate(i18next)(LitElement) {+export class OrRuleAssetQuery extends translate(i18next)(OrElement) {@property({ type: Object, attribute: false })public condition!: RuleCondition;diff --git a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts b/ui/component/or-rules/src/json-viewer/or-rule-condition.tsindex f7e75296b..37cc3aeb8 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-condition.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult } from "lit";+import { css, html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import {type AssetTypeInfo,@@ -165,7 +166,7 @@ const style = css``;@customElement("or-rule-condition")-class OrRuleCondition extends translate(i18next)(LitElement) {+class OrRuleCondition extends translate(i18next)(OrElement) {@property({ type: Object, attribute: false })public ruleCondition!: RuleCondition;diff --git a/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts b/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.tsindex eb8042de3..500baf27b 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import {getAssetInfos,@@ -123,7 +124,7 @@ const style = css``;@customElement("or-rule-json-viewer")-export class OrRuleJsonViewer extends translate(i18next)(LitElement) implements RuleView {+export class OrRuleJsonViewer extends translate(i18next)(OrElement) implements RuleView {static get styles() {return style;}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.tsindex d51341331..c6732f977 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult } from "lit";+import { css, html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { when } from "lit/directives/when.js";import { buttonStyle } from "../style";@@ -274,7 +275,7 @@ const style = css``;@customElement("or-rule-then-otherwise")-class OrRuleThenOtherwise extends translate(i18next)(LitElement) {+class OrRuleThenOtherwise extends translate(i18next)(OrElement) {static get styles() {return style;}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-trigger-query.ts b/ui/component/or-rules/src/json-viewer/or-rule-trigger-query.tsindex 525b17517..b15790469 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-trigger-query.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-trigger-query.ts@@ -18,7 +18,8 @@*/import { type GeoJSONPoint, type RuleCondition, SunPositionTriggerPosition } from "@openremote/model";import { InputType, OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";-import { css, html, LitElement, type PropertyValues } from "lit";+import { css, html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import moment from "moment";import { buttonStyle } from "../style";@@ -70,7 +71,7 @@ interface TimeTrigger {}@customElement("or-rule-trigger-query")-export class OrRuleTriggerQuery extends LitElement {+export class OrRuleTriggerQuery extends OrElement {static get styles() {return style;}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-when.ts b/ui/component/or-rules/src/json-viewer/or-rule-when.tsindex 1e46d2deb..32d535ca3 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-when.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-when.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import {type JsonRule,@@ -124,7 +125,7 @@ const style = css``;@customElement("or-rule-when")-class OrRuleWhen extends translate(i18next)(LitElement) {+class OrRuleWhen extends translate(i18next)(OrElement) {static get styles() {return style;}diff --git a/ui/component/or-rules/src/or-rule-group-viewer.ts b/ui/component/or-rules/src/or-rule-group-viewer.tsindex 9305fa385..bbfc08d56 100644--- a/ui/component/or-rules/src/or-rule-group-viewer.ts+++ b/ui/component/or-rules/src/or-rule-group-viewer.ts@@ -17,14 +17,15 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import { i18next, translate } from "@openremote/or-translate";-import { html, LitElement, type PropertyValues } from "lit";+import { html, type PropertyValues } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, state } from "lit/decorators.js";import { style } from "./or-rule-viewer";import { OrRulesGroupNameChangeEvent } from "./index";import { showSnackbar } from "@openremote/or-mwc-components/or-mwc-snackbar";@customElement("or-rule-group-viewer")-export class OrRuleGroupViewer extends translate(i18next)(LitElement) {+export class OrRuleGroupViewer extends translate(i18next)(OrElement) {/*** Name of the group*/diff --git a/ui/component/or-rules/src/or-rule-text-viewer.ts b/ui/component/or-rules/src/or-rule-text-viewer.tsindex 8ab7f08d0..cf6a22dd1 100644--- a/ui/component/or-rules/src/or-rule-text-viewer.ts+++ b/ui/component/or-rules/src/or-rule-text-viewer.ts@@ -17,7 +17,8 @@* SPDX-License-Identifier: AGPL-3.0-or-later*/import { OrRulesRuleChangedEvent, type RulesConfig, type RuleView } from "./index";-import { css, html, LitElement, type TemplateResult } from "lit";+import { css, html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";import { RulesetLang, type RulesetUnion } from "@openremote/model";import "ace-builds/src-noconflict/mode-javascript";@@ -53,7 +54,7 @@ const style = css``;@customElement("or-rule-text-viewer")-export class OrRuleTextViewer extends LitElement implements RuleView {+export class OrRuleTextViewer extends OrElement implements RuleView {static get styles() {return style;}diff --git a/ui/component/or-rules/src/or-rule-viewer.ts b/ui/component/or-rules/src/or-rule-viewer.tsindex ee26b17ff..15407302b 100644--- a/ui/component/or-rules/src/or-rule-viewer.ts+++ b/ui/component/or-rules/src/or-rule-viewer.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import {OrRulesRequestSaveEvent,@@ -140,7 +141,7 @@ export const style = css``;@customElement("or-rule-viewer")-export class OrRuleViewer extends translate(i18next)(LitElement) {+export class OrRuleViewer extends translate(i18next)(OrElement) {static get styles() {return [style];}diff --git a/ui/component/or-rules/tsconfig.json b/ui/component/or-rules/tsconfig.jsonindex 261cb8bae..5753fddfe 100644--- a/ui/component/or-rules/tsconfig.json+++ b/ui/component/or-rules/tsconfig.json@@ -6,6 +6,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../or-translate" },{ "path": "../or-icon" },diff --git a/ui/component/or-services/package.json b/ui/component/or-services/package.jsonindex 01869f19d..3485ed340 100644--- a/ui/component/or-services/package.json+++ b/ui/component/or-services/package.json@@ -24,6 +24,7 @@"@openremote/core": "workspace:*","@openremote/model": "workspace:*","@openremote/or-components": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-icon": "workspace:*","@openremote/or-translate": "workspace:*","@openremote/or-tree-menu": "workspace:*",diff --git a/ui/component/or-services/src/index.ts b/ui/component/or-services/src/index.tsindex d1d5fcfec..daee3c372 100644--- a/ui/component/or-services/src/index.ts+++ b/ui/component/or-services/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult } from "lit";+import { css, html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, state } from "lit/decorators.js";import { manager } from "@openremote/core";import type { ExternalService } from "@openremote/model";@@ -148,7 +149,7 @@ const serviceStyles = css``;@customElement("or-services")-export class OrServices extends LitElement {+export class OrServices extends OrElement {static get styles() {return [serviceStyles];}diff --git a/ui/component/or-services/tsconfig.json b/ui/component/or-services/tsconfig.jsonindex 261cb8bae..5753fddfe 100644--- a/ui/component/or-services/tsconfig.json+++ b/ui/component/or-services/tsconfig.json@@ -6,6 +6,7 @@},"include": ["./src"],"references": [+ { "path": "../or-element" },{ "path": "../core" },{ "path": "../or-translate" },{ "path": "../or-icon" },diff --git a/ui/component/or-translate/package.json b/ui/component/or-translate/package.jsonindex fb7a4d11f..6f9c9a334 100644--- a/ui/component/or-translate/package.json+++ b/ui/component/or-translate/package.json@@ -23,6 +23,7 @@"repository": "https://github.com/openremote/openremote","license": "AGPL-3.0-or-later","dependencies": {+ "@openremote/or-element": "workspace:*","i18next": "^21.5.3","lit": "^3.3.1"},diff --git a/ui/component/or-translate/src/index.ts b/ui/component/or-translate/src/index.tsindex d7ae8db46..a5e58c4b3 100644--- a/ui/component/or-translate/src/index.ts+++ b/ui/component/or-translate/src/index.ts@@ -18,7 +18,8 @@*/import { translate } from "./translate-mixin";import i18next, { type InitOptions, type TOptions } from "i18next";-import { LitElement, html, css } from "lit";+import { html, css } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";export { i18next };@@ -26,7 +27,7 @@ export { i18next };export { translate };@customElement("or-translate")-export class OrTranslate extends translate(i18next)(LitElement) {+export class OrTranslate extends translate(i18next)(OrElement) {public static styles = css`:host {display: inline-block;diff --git a/ui/component/or-tree-menu/package.json b/ui/component/or-tree-menu/package.jsonindex 57ecceeca..6e855ed0d 100644--- a/ui/component/or-tree-menu/package.json+++ b/ui/component/or-tree-menu/package.json@@ -23,6 +23,7 @@"license": "AGPL-3.0-or-later","dependencies": {"@openremote/core": "workspace:*",+ "@openremote/or-element": "workspace:*","@openremote/or-translate": "workspace:*","@openremote/or-vaadin-components": "workspace:*","lit": "^3.3.1"diff --git a/ui/component/or-tree-menu/src/index.ts b/ui/component/or-tree-menu/src/index.tsindex 744e6d5f5..5848a5436 100644--- a/ui/component/or-tree-menu/src/index.ts+++ b/ui/component/or-tree-menu/src/index.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, queryAll } from "lit/decorators.js";import { map } from "lit/directives/map.js";import { when } from "lit/directives/when.js";@@ -101,7 +102,7 @@ const styles = css`* @event {OrTreeDragEvent} or-tree-drag - Triggers upon dragging a node to a new group, and dispatches a list of dragged nodes, the group node, and the updated list of all nodes.*/@customElement("or-tree-menu")-export class OrTreeMenu extends LitElement {+export class OrTreeMenu extends OrElement {/*** List of node items in the menu.* Uses the TreeNode format for rendering the OrTreeNode elements.diff --git a/ui/component/or-tree-menu/src/or-tree-group.ts b/ui/component/or-tree-menu/src/or-tree-group.tsindex 91e95f65c..cac1c9965 100644--- a/ui/component/or-tree-menu/src/or-tree-group.ts+++ b/ui/component/or-tree-menu/src/or-tree-group.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query, queryAssignedElements } from "lit/decorators.js";import { when } from "lit/directives/when.js";import type { OrTreeNode } from "./or-tree-node";@@ -67,7 +68,7 @@ const getStyles = () => css`* @csspart chevron - The chevron icon element for expanding/collapsing the group.*/@customElement("or-tree-group")-export class OrTreeGroup extends LitElement {+export class OrTreeGroup extends OrElement {/*** Determines the visibility of child nodes.* Setting this to `false` hides them, and acts as a 'collapsed' state.diff --git a/ui/component/or-tree-menu/src/or-tree-node.ts b/ui/component/or-tree-menu/src/or-tree-node.tsindex 30b3ed292..c3eec2909 100644--- a/ui/component/or-tree-menu/src/or-tree-node.ts+++ b/ui/component/or-tree-menu/src/or-tree-node.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type TemplateResult } from "lit";+import { css, html, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property } from "lit/decorators.js";const styles = css`@@ -74,7 +75,7 @@ const styles = css`* @cssprop --or-tree-node-color--selected - Sets the primary color of the node when selected*/@customElement("or-tree-node")-export class OrTreeNode extends LitElement {+export class OrTreeNode extends OrElement {/*** HTML attribute that only applies CSS, showing this node cannot be interacted with.*/diff --git a/ui/component/or-tree-menu/tsconfig.json b/ui/component/or-tree-menu/tsconfig.jsonindex 64da4efff..52146ee81 100644--- a/ui/component/or-tree-menu/tsconfig.json+++ b/ui/component/or-tree-menu/tsconfig.json@@ -5,5 +5,10 @@"rootDir": "src"},"include": ["./src"],- "references": [{ "path": "../core" }, { "path": "../or-translate" }, { "path": "../or-vaadin-components" }]+ "references": [+ { "path": "../or-element" },+ { "path": "../core" },+ { "path": "../or-translate" },+ { "path": "../or-vaadin-components" }+ ]}diff --git a/ui/component/or-vaadin-components/package.json b/ui/component/or-vaadin-components/package.jsonindex e9dc76f46..f47153e33 100644--- a/ui/component/or-vaadin-components/package.json+++ b/ui/component/or-vaadin-components/package.json@@ -31,6 +31,7 @@"dependencies": {"@openremote/core": "workspace:*","@openremote/model": "workspace:*",+ "@openremote/or-element": "workspace:*","@vaadin/badge": "~25.2.4","@vaadin/button": "~25.2.4","@vaadin/checkbox": "~25.2.4",diff --git a/ui/component/or-vaadin-components/src/or-vaadin-input.ts b/ui/component/or-vaadin-components/src/or-vaadin-input.tsindex 7593563b9..e9e7cfce0 100644--- a/ui/component/or-vaadin-components/src/or-vaadin-input.ts+++ b/ui/component/or-vaadin-components/src/or-vaadin-input.ts@@ -16,7 +16,8 @@** SPDX-License-Identifier: AGPL-3.0-or-later*/-import { css, html, LitElement, type PropertyValues, type TemplateResult } from "lit";+import { css, html, type LitElement, type PropertyValues, type TemplateResult } from "lit";+import { OrElement } from "@openremote/or-element";import { customElement, property, query } from "lit/decorators.js";import { InputType } from "./util";import "./or-vaadin-checkbox";@@ -51,7 +52,7 @@ function registerProperties(constructors: (CustomElementConstructor | undefined)* @customElement "or-vaadin-input"*/@customElement("or-vaadin-input")-export class OrVaadinInput extends LitElement {+export class OrVaadinInput extends OrElement {/*** Static list of Vaadin component classes to scan through during attribute changes.* It's important that the complete list of CustomElements is defined here.diff --git a/ui/component/or-vaadin-components/tsconfig.json b/ui/component/or-vaadin-components/tsconfig.jsonindex 3a58215ea..3bee21d89 100644--- a/ui/component/or-vaadin-components/tsconfig.json+++ b/ui/component/or-vaadin-components/tsconfig.json@@ -5,5 +5,5 @@"rootDir": "src"},"include": ["./src"],- "references": [{ "path": "../core" }]+ "references": [{ "path": "../or-element" }, { "path": "../core" }]}diff --git a/yarn.lock b/yarn.lockindex 536ec727d..9f9b010d8 100644--- a/yarn.lock+++ b/yarn.lock@@ -1867,6 +1867,7 @@ __metadata:"@openremote/model": "workspace:*""@openremote/or-app": "workspace:*""@openremote/or-dashboard-builder": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-mwc-components": "workspace:*""@openremote/or-translate": "workspace:*""@openremote/rest": "workspace:*"@@ -1927,6 +1928,7 @@ __metadata:dependencies:"@openremote/core": "workspace:*""@openremote/model": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-mwc-components": "workspace:*""@openremote/or-translate": "workspace:*"@@ -1947,6 +1949,7 @@ __metadata:"@mdi/js": "npm:^5.9.55""@openremote/core": "workspace:*""@openremote/model": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-mwc-components": "workspace:*""@openremote/or-translate": "workspace:*"@@ -1971,6 +1974,7 @@ __metadata:"@openremote/or-attribute-input": "workspace:*""@openremote/or-chart": "workspace:*""@openremote/or-components": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-mwc-components": "workspace:*""@openremote/or-translate": "workspace:*"@@ -1988,6 +1992,7 @@ __metadata:dependencies:"@openremote/core": "workspace:*""@openremote/model": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-mwc-components": "workspace:*""@openremote/or-translate": "workspace:*"@@ -2008,6 +2013,7 @@ __metadata:"@openremote/model": "workspace:*""@openremote/or-attribute-picker": "workspace:*""@openremote/or-chart": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-mwc-components": "workspace:*""@openremote/or-translate": "workspace:*"@@ -2032,6 +2038,7 @@ __metadata:"@openremote/model": "workspace:*""@openremote/or-chart": "workspace:*""@openremote/or-components": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-translate": "workspace:*""@openremote/or-vaadin-components": "workspace:*""@openremote/rest": "workspace:*"@@ -2052,6 +2059,7 @@ __metadata:"@openremote/core": "workspace:*""@openremote/model": "workspace:*""@openremote/or-components": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-json-forms": "workspace:*""@openremote/or-map": "workspace:*"@@ -2090,6 +2098,7 @@ __metadata:"@openremote/or-asset-tree": "workspace:*""@openremote/or-attribute-picker": "workspace:*""@openremote/or-components": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-mwc-components": "workspace:*""@openremote/or-translate": "workspace:*"@@ -2111,6 +2120,7 @@ __metadata:dependencies:"@openremote/core": "workspace:*""@openremote/model": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-translate": "workspace:*""@openremote/util": "workspace:*"@@ -2134,6 +2144,7 @@ __metadata:"@openremote/or-attribute-picker": "workspace:*""@openremote/or-chart": "workspace:*""@openremote/or-components": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-gauge": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-map": "workspace:*"@@ -2166,6 +2177,7 @@ __metadata:dependencies:"@openremote/core": "workspace:*""@openremote/model": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-translate": "workspace:*""@openremote/util": "workspace:*"@@ -2183,6 +2195,7 @@ __metadata:dependencies:"@mdi/font": "npm:latest""@openremote/model": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/util": "workspace:*"lit: "npm:^3.3.1"languageName: unknown@@ -2195,6 +2208,7 @@ __metadata:"@jsonforms/core": "npm:^3.5.1""@openremote/core": "workspace:*""@openremote/or-components": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-mwc-components": "workspace:*""@openremote/or-translate": "workspace:*""@openremote/or-vaadin-components": "workspace:*"@@ -2212,6 +2226,7 @@ __metadata:"@openremote/core": "workspace:*""@openremote/model": "workspace:*""@openremote/or-components": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-mwc-components": "workspace:*""@openremote/or-translate": "workspace:*""@openremote/or-vaadin-components": "workspace:*"@@ -2230,6 +2245,7 @@ __metadata:dependencies:"@openremote/core": "workspace:*""@openremote/model": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-mwc-components": "workspace:*""@openremote/or-translate": "workspace:*"@@ -2275,6 +2291,7 @@ __metadata:"@material/textfield": "npm:^9.0.0""@openremote/core": "workspace:*""@openremote/model": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-translate": "workspace:*""@openremote/util": "workspace:*"@@ -2287,6 +2304,7 @@ __metadata:version: 0.0.0-use.localresolution: "@openremote/or-rive-renderer@workspace:ui/component/or-rive-renderer"dependencies:+ "@openremote/or-element": "workspace:*""@openremote/util": "workspace:*""@rive-app/webgl2": "npm:^2.38.1"lit: "npm:^3.3.1"@@ -2304,6 +2322,7 @@ __metadata:"@openremote/or-attribute-input": "workspace:*""@openremote/or-attribute-picker": "workspace:*""@openremote/or-components": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-map": "workspace:*""@openremote/or-mwc-components": "workspace:*"@@ -2350,6 +2369,7 @@ __metadata:"@openremote/core": "workspace:*""@openremote/model": "workspace:*""@openremote/or-components": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-icon": "workspace:*""@openremote/or-translate": "workspace:*""@openremote/or-tree-menu": "workspace:*"@@ -2362,6 +2382,7 @@ __metadata:version: 0.0.0-use.localresolution: "@openremote/or-translate@workspace:ui/component/or-translate"dependencies:+ "@openremote/or-element": "workspace:*""@openremote/util": "workspace:*"i18next: "npm:^21.5.3"lit: "npm:^3.3.1"@@ -2373,6 +2394,7 @@ __metadata:resolution: "@openremote/or-tree-menu@workspace:ui/component/or-tree-menu"dependencies:"@openremote/core": "workspace:*"+ "@openremote/or-element": "workspace:*""@openremote/or-translate": "workspace:*""@openremote/or-vaadin-components": "workspace:*""@openremote/util": "workspace:*"@@ -2386,6 +2408,7 @@ __metadata:dependencies:"@openremote/core": "workspace:*""@openremote/model": "workspace:*"+ "@openremote/or-element": "workspace:*""@vaadin/badge": "npm:~25.2.4""@vaadin/button": "npm:~25.2.4""@vaadin/checkbox": "npm:~25.2.4"