Skip to content

armgit / core

Public Imported from GitHub
0

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

UI updates: package cleanup

Rich Turner0256e9815bcd
diff --git a/ui/app/manager/src/pages/page-account.ts b/ui/app/manager/src/pages/page-account.ts
index 6c482c40b..53113798f 100644
--- a/ui/app/manager/src/pages/page-account.ts
+++ b/ui/app/manager/src/pages/page-account.ts
@@ -1,7 +1,7 @@
import {css, html, TemplateResult} from "lit";
import {customElement} from "lit/decorators.js";
import manager from "@openremote/core";
-import "@openremote/or-panel";
+import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
import {EnhancedStore} from "@reduxjs/toolkit";
import {Page, PageProvider} from "@openremote/or-app";
diff --git a/ui/app/manager/src/pages/page-gateway.ts b/ui/app/manager/src/pages/page-gateway.ts
index c06f64eba..7cb4d7c19 100644
--- a/ui/app/manager/src/pages/page-gateway.ts
+++ b/ui/app/manager/src/pages/page-gateway.ts
@@ -1,7 +1,7 @@
import {css, html, PropertyValues, TemplateResult, unsafeCSS} from "lit";
import {customElement, property} from "lit/decorators.js";
import i18next from "i18next";
-import "@openremote/or-panel";
+import "@openremote/or-components/or-panel";
import {ConnectionStatus, GatewayConnection, GatewayConnectionStatusEvent} from "@openremote/model";
import manager, {DefaultColor1, OREvent} from "@openremote/core";
import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";
diff --git a/ui/app/manager/src/pages/page-realms.ts b/ui/app/manager/src/pages/page-realms.ts
index 01f79056d..17af26736 100644
--- a/ui/app/manager/src/pages/page-realms.ts
+++ b/ui/app/manager/src/pages/page-realms.ts
@@ -7,7 +7,7 @@ import {
} from "lit";
import {customElement, property} from "lit/decorators.js";
import manager, { OREvent, DefaultColor3 } from "@openremote/core";
-import "@openremote/or-panel";
+import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
import { EnhancedStore } from "@reduxjs/toolkit";
import {Page, PageProvider} from "@openremote/or-app";
diff --git a/ui/app/manager/src/pages/page-roles.ts b/ui/app/manager/src/pages/page-roles.ts
index 2899027e9..50eb10cf4 100644
--- a/ui/app/manager/src/pages/page-roles.ts
+++ b/ui/app/manager/src/pages/page-roles.ts
@@ -7,7 +7,7 @@ import {
} from "lit";
import {customElement, property, state} from "lit/decorators.js";
import manager, { OREvent, DefaultColor3 } from "@openremote/core";
-import "@openremote/or-panel";
+import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
import { EnhancedStore } from "@reduxjs/toolkit";
import {Page, PageProvider} from "@openremote/or-app";
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index 3c8955c88..0d059d970 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -1,7 +1,7 @@
import {css, html, PropertyValues, TemplateResult, unsafeCSS} from "lit";
import {customElement, property, state} from "lit/decorators.js";
import manager, {DefaultColor3, Util} from "@openremote/core";
-import "@openremote/or-panel";
+import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
import {EnhancedStore} from "@reduxjs/toolkit";
import {AppStateKeyed, Page, PageProvider} from "@openremote/or-app";
diff --git a/ui/component/or-app/tsconfig.json b/ui/component/or-app/tsconfig.json
index 9c4bcfeeb..c7bd354b0 100644
--- a/ui/component/or-app/tsconfig.json
+++ b/ui/component/or-app/tsconfig.json
@@ -20,7 +20,6 @@
{ "path": "../../component/or-data-viewer" },
{ "path": "../../component/or-log-viewer" },
{ "path": "../../component/or-chart" },
- { "path": "../../component/or-table" },
{ "path": "../../component/or-rules" }
]
}
diff --git a/ui/component/or-asset-viewer/package.json b/ui/component/or-asset-viewer/package.json
index 6c275ecd2..b9205eb04 100644
--- a/ui/component/or-asset-viewer/package.json
+++ b/ui/component/or-asset-viewer/package.json
@@ -21,10 +21,9 @@
"@openremote/or-chart": "^1.0.4",
"@openremote/or-icon": "^1.0.3",
"@openremote/or-mwc-components": "^1.0.3",
- "@openremote/or-panel": "^1.0.3",
+ "@openremote/or-components": "^1.0.3",
"@openremote/or-survey": "^1.0.3",
"@openremote/or-survey-results": "^1.0.3",
- "@openremote/or-table": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
"@openremote/rest": "^1.0.3",
"lit": "^2.0.0-rc.2"
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.ts
index f536298a3..2297d0bd9 100644
--- a/ui/component/or-asset-viewer/src/index.ts
+++ b/ui/component/or-asset-viewer/src/index.ts
@@ -10,15 +10,15 @@ import "@openremote/or-attribute-history";
import "@openremote/or-chart";
import "@openremote/or-survey";
import "@openremote/or-survey-results";
-import "@openremote/or-table";
-import "@openremote/or-panel";
+import "@openremote/or-mwc-components/or-mwc-table";
+import "@openremote/or-components/or-panel";
import "@openremote/or-mwc-components/or-mwc-dialog";
import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
import "@openremote/or-mwc-components/or-mwc-list";
import {OrTranslate, translate} from "@openremote/or-translate";
import {InputType, OrMwcInput, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";
import manager, {AssetModelUtil, subscribe, Util} from "@openremote/core";
-import {OrTable} from "@openremote/or-table";
+import {OrMwcTable} from "@openremote/or-mwc-components/or-mwc-table";
import {OrChartConfig, OrChartEvent} from "@openremote/or-chart";
import {HistoryConfig, OrAttributeHistory, OrAttributeHistoryEvent} from "@openremote/or-attribute-history";
import {
@@ -680,7 +680,7 @@ export function getPanelContent(panelName: string, asset: Asset, attributes: { [
const updateTable = () => {
const loadingMsg: OrTranslate = hostElement.shadowRoot!.getElementById(panelName + "-attribute-table-msg") as OrTranslate;
- const attributeTable: OrTable = hostElement.shadowRoot!.getElementById(panelName + "-attribute-table") as OrTable;
+ const attributeTable: OrMwcTable = hostElement.shadowRoot!.getElementById(panelName + "-attribute-table") as OrMwcTable;
const addRemoveButton: OrIcon = hostElement.shadowRoot!.getElementById(panelName + "-add-remove-columns") as OrIcon;
if (!loadingMsg || !attributeTable || !addRemoveButton) {
@@ -763,7 +763,7 @@ export function getPanelContent(panelName: string, asset: Asset, attributes: { [
}
</style>
<or-icon class="asset-group-add-remove-button" .id="${panelName}-add-remove-columns" icon="pencil" @click="${() => attributePickerModalOpen()}"></or-icon>
- <or-table hidden .id="${panelName}-attribute-table" .options="{stickyFirstColumn:true}"></or-table>
+ <or-mwc-table hidden .id="${panelName}-attribute-table" .options="{stickyFirstColumn:true}"></or-mwc-table>
<span><or-translate id="${panelName}-attribute-table-msg" value="loading"></or-translate></span>
`;
}
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.ts
index 2f07c2773..ebb354de6 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
@@ -83,36 +83,14 @@ const style = css`
padding-right: 5px;
}
.meta-item-container {
- display: flex;
- overflow: hidden;
padding: 0 16px 0 36px;
- }
- .meta-item-container:after {
- content: '';
- height: 50px;
- transition: height 1s linear, max-height 0s 1s linear;
- max-height: 0;
- }
- .meta-item-container .collapsible {
- flex: 1;
- transition: margin-bottom 1s cubic-bezier(0, 0, 0, 1);
- margin-bottom: 0;
- max-height: 1000000px;
- }
- .meta-item-container.collapsed > .collapsible {
- margin-bottom: -2000px;
- transition: margin-bottom 1s cubic-bezier(1, 0, 1, 1),
- visibility 0s 1s, max-height 0s 1s;
- visibility: hidden;
+ overflow: hidden;
max-height: 0;
+ transition: max-height 0.25s ease-out;
}
- .meta-item-container.collapsed:after
- {
- height: 0;
- transition: height 1s linear;
- max-height: 50px;
+ .attribute-meta-row.expanded .meta-item-container {
+ transition: max-height 1s ease-in;
}
-
.meta-item-container or-mwc-input {
width: 100%;
}
@@ -208,18 +186,34 @@ export class OrEditAssetPanel extends LitElement {
const expanderToggle = (ev: MouseEvent) => {
const tdElem = ev.target as HTMLElement;
- if (tdElem.className.indexOf("expander-cell") < 0) {
+ if (tdElem.className.indexOf("expander-cell") < 0 || tdElem.className.indexOf("expanding") >= 0) {
return;
}
const expanderIcon = tdElem.getElementsByTagName("or-icon")[0] as OrIcon;
- const metaExpander = this.shadowRoot!.getElementById("attribute-meta-"+tdElem.getAttribute("data-name")) as HTMLElement;
+ const headerRow = tdElem.parentElement! as HTMLTableRowElement;
+ const metaRow = (headerRow.parentElement! as HTMLTableElement).rows[headerRow.rowIndex];
+ const metaContainer = metaRow.firstElementChild!.firstElementChild as HTMLElement;
+ const contentHeight = Math.max(500, metaContainer.firstElementChild!.getBoundingClientRect().height);
if (expanderIcon.icon === "chevron-right") {
expanderIcon.icon = "chevron-down";
- metaExpander.classList.remove("collapsed");
+ metaRow.classList.add("expanded");
+ metaContainer.style.maxHeight = contentHeight + "px";
+ tdElem.classList.add("expanding");
+ // Allow container to grow when expanded once animation has finished
+ window.setTimeout(() => {
+ tdElem.classList.remove("expanding");
+ metaContainer.style.maxHeight = "unset";
+ }, 1100);
} else {
expanderIcon.icon = "chevron-right";
- metaExpander.classList.add("collapsed");
+ metaRow.classList.remove("expanded");
+ metaContainer.style.transition = "none";
+ metaContainer.style.maxHeight = Math.max(500, metaContainer.firstElementChild!.getBoundingClientRect().height) + "px";
+ window.setTimeout(() => {
+ metaContainer.style.transition = "";
+ metaContainer.style.maxHeight = "";
+ });
}
};
@@ -268,7 +262,7 @@ export class OrEditAssetPanel extends LitElement {
return html`
<tr class="mdc-data-table__row">
- <td class="padded-cell mdc-data-table__cell expander-cell" data-name="${attribute.name}"><or-icon icon="chevron-right"></or-icon><span>${attribute.name}</span></td>
+ <td class="padded-cell mdc-data-table__cell expander-cell"><or-icon icon="chevron-right"></or-icon><span>${attribute.name}</span></td>
<td class="padded-cell mdc-data-table__cell">${Util.getValueDescriptorLabel(attribute.type!)}</td>
<td class="padded-cell overflow-visible mdc-data-table__cell">
<or-attribute-input compact .comfortable="${true}" .assetType="${assetType}" .label=${null} .readonly="${false}" .attribute="${attribute}" .assetId="${this.asset.id!}" disableWrite disableSubscribe disableButton @or-attribute-input-changed="${(e: OrAttributeInputChangedEvent) => this._onAttributeModified(attribute, e.detail.value)}"></or-attribute-input>
@@ -277,8 +271,8 @@ export class OrEditAssetPanel extends LitElement {
</tr>
<tr class="attribute-meta-row">
<td colspan="4">
- <div id="attribute-meta-${attribute.name!}" class="meta-item-container collapsed">
- <div class="collapsible">
+ <div class="meta-item-container">
+ <div>
<div>
${!attribute.meta ? `` : Object.entries(attribute.meta).sort(Util.sortByString(([name, value]) => name!)).map(([name, value]) => this._getMetaItemTemplate(attribute, Util.getMetaItemNameValueHolder(name, value)))}
</div>
diff --git a/ui/component/or-asset-viewer/tsconfig.json b/ui/component/or-asset-viewer/tsconfig.json
index 356f2f58e..025d80b79 100644
--- a/ui/component/or-asset-viewer/tsconfig.json
+++ b/ui/component/or-asset-viewer/tsconfig.json
@@ -13,8 +13,7 @@
{ "path": "../rest" },
{ "path": "../model" },
{ "path": "../or-chart" },
- { "path": "../or-panel" },
- { "path": "../or-table" },
+ { "path": "../or-components" },
{ "path": "../or-translate" },
{ "path": "../or-icon" },
{ "path": "../or-map" },
diff --git a/ui/component/or-attribute-history/package.json b/ui/component/or-attribute-history/package.json
index 848210d17..a54debfbb 100644
--- a/ui/component/or-attribute-history/package.json
+++ b/ui/component/or-attribute-history/package.json
@@ -15,7 +15,7 @@
"@material/data-table": "^9.0.0",
"@openremote/core": "^1.0.3",
"@openremote/or-mwc-components": "^1.0.3",
- "@openremote/or-panel": "^1.0.3",
+ "@openremote/or-components": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
"@openremote/or-chart": "^1.0.4",
"jsonpath-plus": "^5.0.2",
diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.ts
index 8b316157a..1369eb5b0 100644
--- a/ui/component/or-attribute-history/src/index.ts
+++ b/ui/component/or-attribute-history/src/index.ts
@@ -15,7 +15,7 @@ import {translate} from "@openremote/or-translate";
import {Attribute, AttributeRef, DatapointInterval, ValueDatapoint, ValueDescriptor} from "@openremote/model";
import manager, {AssetModelUtil, DefaultColor2, DefaultColor3, DefaultColor4, DefaultColor5} from "@openremote/core";
import "@openremote/or-mwc-components/or-mwc-input";
-import "@openremote/or-panel";
+import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
import "@openremote/or-chart";
import {Chart, ScatterDataPoint, ChartConfiguration, TimeUnit, TimeScaleOptions} from "chart.js";
diff --git a/ui/component/or-attribute-history/tsconfig.json b/ui/component/or-attribute-history/tsconfig.json
index ca0100bbe..467b7c2e8 100644
--- a/ui/component/or-attribute-history/tsconfig.json
+++ b/ui/component/or-attribute-history/tsconfig.json
@@ -10,7 +10,7 @@
],
"references": [
{ "path": "../core" },
- { "path": "../or-panel" },
+ { "path": "../or-components" },
{ "path": "../or-mwc-components" },
{ "path": "../or-translate" }
diff --git a/ui/component/or-chart/package.json b/ui/component/or-chart/package.json
index 36eb4fcf5..e00b5aad4 100644
--- a/ui/component/or-chart/package.json
+++ b/ui/component/or-chart/package.json
@@ -18,7 +18,7 @@
"@openremote/or-asset-tree": "^1.0.4",
"@openremote/or-icon": "^1.0.3",
"@openremote/or-mwc-components": "^1.0.3",
- "@openremote/or-panel": "^1.0.3",
+ "@openremote/or-components": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
"chart.js": "^3.1.0",
"chartjs-adapter-moment": "^1.0.0",
diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.ts
index bd0640959..e7af2434c 100644
--- a/ui/component/or-chart/src/index.ts
+++ b/ui/component/or-chart/src/index.ts
@@ -20,7 +20,7 @@ import manager, {
} from "@openremote/core";
import "@openremote/or-asset-tree";
import "@openremote/or-mwc-components/or-mwc-input";
-import "@openremote/or-panel";
+import "@openremote/or-components/or-panel";
import {MDCDialog} from '@material/dialog';
import "@openremote/or-translate";
import {Chart, ChartDataset, TimeUnit, ScatterDataPoint, ScatterController, LineController, LineElement, PointElement, LinearScale, TimeScale,
diff --git a/ui/component/or-chart/tsconfig.json b/ui/component/or-chart/tsconfig.json
index c9afb4766..8500b4fa2 100644
--- a/ui/component/or-chart/tsconfig.json
+++ b/ui/component/or-chart/tsconfig.json
@@ -10,7 +10,7 @@
],
"references": [
{ "path": "../core" },
- { "path": "../or-panel" },
+ { "path": "../or-components" },
{ "path": "../or-icon" },
{ "path": "../or-asset-tree" },
{ "path": "../or-mwc-components" },
diff --git a/ui/component/or-panel/.npmignore b/ui/component/or-components/.npmignore
similarity index 100%
rename from ui/component/or-panel/.npmignore
rename to ui/component/or-components/.npmignore
diff --git a/ui/component/or-table/README.md b/ui/component/or-components/README.md
similarity index 81%
rename from ui/component/or-table/README.md
rename to ui/component/or-components/README.md
index cb446bbca..4d223ac8d 100644
--- a/ui/component/or-table/README.md
+++ b/ui/component/or-components/README.md
@@ -1,14 +1,14 @@
-# @openremote/or-table \<or-table\>
+# @openremote/or-components
[![NPM Version][npm-image]][npm-url]
[![Linux Build][travis-image]][travis-url]
[![Test Coverage][coveralls-image]][coveralls-url]
-Web Component for displaying an input control.
+Contains basic UI components
## Install
```bash
-npm i @openremote/or-table
-yarn add @openremote/or-table
+npm i @openremote/or-components
+yarn add @openremote/or-components
```
## Usage
@@ -24,7 +24,7 @@ Internet Explorer 11 is also supported.
[GNU AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html)
[npm-image]: https://img.shields.io/npm/v/live-xxx.svg
-[npm-url]: https://npmjs.org/package/@openremote/or-table
+[npm-url]: https://npmjs.org/package/@openremote/or-components
[travis-image]: https://img.shields.io/travis/live-js/live-xxx/master.svg
[travis-url]: https://travis-ci.org/live-js/live-xxx
[coveralls-image]: https://img.shields.io/coveralls/live-js/live-xxx/master.svg
diff --git a/ui/component/or-panel/build.gradle b/ui/component/or-components/build.gradle
similarity index 100%
rename from ui/component/or-panel/build.gradle
rename to ui/component/or-components/build.gradle
diff --git a/ui/component/or-panel/package.json b/ui/component/or-components/package.json
similarity index 81%
rename from ui/component/or-panel/package.json
rename to ui/component/or-components/package.json
index 5df5b0ba9..b8c3f8a3f 100644
--- a/ui/component/or-panel/package.json
+++ b/ui/component/or-components/package.json
@@ -1,7 +1,7 @@
{
- "name": "@openremote/or-panel",
+ "name": "@openremote/or-components",
"version": "1.0.3",
- "description": "OpenRemote simple panel with heading",
+ "description": "OpenRemote basic UI components",
"main": "dist/umd/index.bundle.js",
"module": "dist/index.js",
"types": "dist/index.d.ts",
@@ -9,6 +9,9 @@
"test": "echo \"No tests\" && exit 0",
"prepublishOnly": "npx tsc -b && npx webpack"
},
+ "exports": {
+ "./*": "./dist/*.js"
+ },
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
diff --git a/ui/component/or-components/src/or-collapsible-panel.ts b/ui/component/or-components/src/or-collapsible-panel.ts
new file mode 100644
index 000000000..d084a8e5f
--- /dev/null
+++ b/ui/component/or-components/src/or-collapsible-panel.ts
@@ -0,0 +1,62 @@
+import {css, html, LitElement, PropertyValues, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
+import {DefaultColor2} from "@openremote/core";
+
+// language=CSS
+const style = css`
+
+ :host {
+ display: block;
+ }
+
+ :host([hidden]) {
+ display: none;
+ }
+
+ #indicator::after {
+ border-style: solid;
+ border-width: 0 2px 2px 0;
+ content: "";
+ display: inline-block;
+ padding: 3px;
+ transform: rotate(45deg);
+ vertical-align: middle;
+ }
+`;
+
+@customElement("or-collapsible-panel")
+export class OrCollapsiblePanel extends LitElement {
+
+ static get styles() {
+ return style;
+ }
+
+ @property({type: Boolean})
+ expanded: boolean = false;
+
+ protected _onHeaderClicked(ev: MouseEvent) {
+ ev.preventDefault();
+
+ if ((ev.currentTarget as HTMLElement).id !== "header") {
+ return;
+ }
+
+
+ }
+
+ render() {
+
+ return html`
+ <div id="header" @click="${(ev:MouseEvent) => this._onHeaderClicked(ev)}">
+ <span>
+ <slot name="header"></slot>
+ <slot name="header-content"></slot>
+ </span>
+ <span id="indicator"></span>
+ </div>
+ <div>
+ <slot name="content"></slot>
+ </div>
+ `;
+ }
+}
diff --git a/ui/component/or-panel/src/index.ts b/ui/component/or-components/src/or-panel.ts
similarity index 94%
rename from ui/component/or-panel/src/index.ts
rename to ui/component/or-components/src/or-panel.ts
index 9cbcd9d28..e4fcc9333 100644
--- a/ui/component/or-panel/src/index.ts
+++ b/ui/component/or-components/src/or-panel.ts
@@ -1,6 +1,5 @@
import {css, html, LitElement, PropertyValues, unsafeCSS} from "lit";
import {customElement, property, query} from "lit/decorators.js";
-import SimpleBar from "simplebar";
import {DefaultColor2} from "@openremote/core";
// TODO: Add webpack/rollup to build so consumers aren't forced to use the same tooling
@@ -54,12 +53,6 @@ export class OrPanel extends LitElement {
];
}
- @property({type: Boolean})
- autoHide = true;
-
- @property({type: Boolean})
- forceVisible?: boolean;
-
@property({type: Number})
zLevel?: number;
diff --git a/ui/component/or-panel/tsconfig.json b/ui/component/or-components/tsconfig.json
similarity index 100%
rename from ui/component/or-panel/tsconfig.json
rename to ui/component/or-components/tsconfig.json
diff --git a/ui/component/or-panel/webpack.config.js b/ui/component/or-components/webpack.config.js
similarity index 100%
rename from ui/component/or-panel/webpack.config.js
rename to ui/component/or-components/webpack.config.js
diff --git a/ui/component/or-data-viewer/package.json b/ui/component/or-data-viewer/package.json
index 4fed496e1..5e60cb21d 100644
--- a/ui/component/or-data-viewer/package.json
+++ b/ui/component/or-data-viewer/package.json
@@ -21,7 +21,7 @@
"@openremote/or-icon": "^1.0.3",
"@openremote/or-mwc-components": "^1.0.3",
"@openremote/or-map": "^1.0.4",
- "@openremote/or-panel": "^1.0.3",
+ "@openremote/or-components": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
"@openremote/rest": "^1.0.3",
"lit": "^2.0.0-rc.2"
diff --git a/ui/component/or-data-viewer/src/index.ts b/ui/component/or-data-viewer/src/index.ts
index 056077e07..350653ab8 100644
--- a/ui/component/or-data-viewer/src/index.ts
+++ b/ui/component/or-data-viewer/src/index.ts
@@ -3,7 +3,7 @@ import {customElement, property} from "lit/decorators.js";
import "@openremote/or-chart";
import "@openremote/or-translate";
import {translate} from "@openremote/or-translate";
-import "@openremote/or-panel";
+import "@openremote/or-components/or-panel";
import {OrChartConfig, OrChartEvent} from "@openremote/or-chart";
import {Asset, Attribute} from "@openremote/model";
import {style} from "./style";
diff --git a/ui/component/or-data-viewer/tsconfig.json b/ui/component/or-data-viewer/tsconfig.json
index 71b5d1067..322f9c268 100644
--- a/ui/component/or-data-viewer/tsconfig.json
+++ b/ui/component/or-data-viewer/tsconfig.json
@@ -13,8 +13,8 @@
{ "path": "../rest" },
{ "path": "../model" },
{ "path": "../or-chart" },
- { "path": "../or-panel" },
+ { "path": "../or-components" },
{ "path": "../or-translate" },
{ "path": "../or-attribute-card" }
]
-}
\ No newline at end of file
+}
diff --git a/ui/component/or-log-viewer/src/index.ts b/ui/component/or-log-viewer/src/index.ts
index 314039202..7352c9f93 100644
--- a/ui/component/or-log-viewer/src/index.ts
+++ b/ui/component/or-log-viewer/src/index.ts
@@ -12,7 +12,7 @@ import {translate} from "@openremote/or-translate";
import * as Model from "@openremote/model";
import manager, {DefaultColor2, DefaultColor3, Util} from "@openremote/core";
import "@openremote/or-mwc-components/or-mwc-input";
-import "@openremote/or-panel";
+import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";
import {MDCDataTable} from "@material/data-table";
diff --git a/ui/component/or-mwc-components/package.json b/ui/component/or-mwc-components/package.json
index 8eafb8867..35300a0f2 100644
--- a/ui/component/or-mwc-components/package.json
+++ b/ui/component/or-mwc-components/package.json
@@ -27,6 +27,7 @@
"@material/form-field": "^9.0.0",
"@material/icon-button": "^9.0.0",
"@material/line-ripple": "^9.0.0",
+ "@material/data-table": "^9.0.0",
"@material/ripple": "^9.0.0",
"@material/select": "^9.0.0",
"@material/slider": "^9.0.0",
diff --git a/ui/component/or-table/src/index.ts b/ui/component/or-mwc-components/src/or-mwc-table.ts
similarity index 97%
rename from ui/component/or-table/src/index.ts
rename to ui/component/or-mwc-components/src/or-mwc-table.ts
index 94561bd87..a41444bff 100644
--- a/ui/component/or-table/src/index.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-table.ts
@@ -74,8 +74,8 @@ const style = css`
}
`;
-@customElement("or-table")
-export class OrTable extends LitElement {
+@customElement("or-mwc-table")
+export class OrMwcTable extends LitElement {
static get styles() {
return [
diff --git a/ui/component/or-panel/README.md b/ui/component/or-panel/README.md
deleted file mode 100644
index 5f751601e..000000000
--- a/ui/component/or-panel/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# @openremote/or-panel \<or-panel\>
-[![NPM Version][npm-image]][npm-url]
-[![Linux Build][travis-image]][travis-url]
-[![Test Coverage][coveralls-image]][coveralls-url]
-
-Web Component for displaying a scrollable panel based on simplebar.
-
-## Install
-```bash
-npm i @openremote/or-panel
-yarn add @openremote/or-panel
-```
-
-## Usage
-For a full list of properties, methods and options refer to the TypeDoc generated [documentation]().
-
-
-## Supported Browsers
-The last 2 versions of all modern browsers are supported, including Chrome, Safari, Opera, Firefox, Edge. In addition,
-Internet Explorer 11 is also supported.
-
-
-## License
-[GNU AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html)
-
-[npm-image]: https://img.shields.io/npm/v/live-xxx.svg
-[npm-url]: https://npmjs.org/package/@openremote/or-panel
-[travis-image]: https://img.shields.io/travis/live-js/live-xxx/master.svg
-[travis-url]: https://travis-ci.org/live-js/live-xxx
-[coveralls-image]: https://img.shields.io/coveralls/live-js/live-xxx/master.svg
-[coveralls-url]: https://coveralls.io/r/live-js/live-xxx?branch=master
diff --git a/ui/component/or-rules/package.json b/ui/component/or-rules/package.json
index d9f9e2527..91bba44d5 100644
--- a/ui/component/or-rules/package.json
+++ b/ui/component/or-rules/package.json
@@ -17,7 +17,7 @@
"@openremote/or-attribute-input": "^1.0.4",
"@openremote/or-icon": "^1.0.3",
"@openremote/or-mwc-components": "^1.0.3",
- "@openremote/or-panel": "^1.0.3",
+ "@openremote/or-components": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
"@openremote/rest": "^1.0.3",
"ace-builds": "^1.4.7",
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.ts
index 67b9bb636..27bf79489 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
@@ -24,7 +24,7 @@ import {
import {Util} from "@openremote/core";
import "./or-rule-when";
import "./or-rule-then-otherwise";
-import "@openremote/or-panel";
+import "@openremote/or-components/or-panel";
import i18next from "i18next";
import {translate} from "@openremote/or-translate";
diff --git a/ui/component/or-rules/tsconfig.json b/ui/component/or-rules/tsconfig.json
index cde4384a3..207bc0ce1 100644
--- a/ui/component/or-rules/tsconfig.json
+++ b/ui/component/or-rules/tsconfig.json
@@ -12,7 +12,7 @@
{ "path": "../core" },
{ "path": "../or-translate" },
{ "path": "../or-icon" },
- { "path": "../or-panel" },
+ { "path": "../or-components" },
{ "path": "../or-mwc-components" },
{ "path": "../or-attribute-input" },
{ "path": "../or-asset-tree" }
diff --git a/ui/component/or-table/.npmignore b/ui/component/or-table/.npmignore
deleted file mode 100644
index 17e64b1ad..000000000
--- a/ui/component/or-table/.npmignore
+++ /dev/null
@@ -1,8 +0,0 @@
-build/
-build.gradle
-test/
-src/
-webpack.config.js
-tsconfig.json
-dist/*.map
-.tsbuildinfo
\ No newline at end of file
diff --git a/ui/component/or-table/build.gradle b/ui/component/or-table/build.gradle
deleted file mode 100644
index 98cdcb8e2..000000000
--- a/ui/component/or-table/build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-buildDir = "dist"
-
-task clean() {
- doLast {
- delete "dist"
- }
-}
-
-task prepareUi() {
- dependsOn clean, npmPrepare
-}
-
-task publishUi() {
- dependsOn clean, npmPublish
-}
\ No newline at end of file
diff --git a/ui/component/or-table/package.json b/ui/component/or-table/package.json
deleted file mode 100644
index 83855d9b3..000000000
--- a/ui/component/or-table/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "name": "@openremote/or-table",
- "version": "1.0.3",
- "description": "OpenRemote table",
- "main": "dist/umd/index.bundle.js",
- "module": "dist/index.js",
- "types": "dist/index.d.ts",
- "scripts": {
- "build": "npx tsc -b",
- "test": "echo \"No tests\" && exit 0",
- "prepublishOnly": "npx tsc -b && npx webpack"
- },
- "author": "OpenRemote",
- "license": "AGPL-3.0-or-later",
- "dependencies": {
- "@material/data-table": "^9.0.0",
- "lit": "^2.0.0-rc.2"
- },
- "devDependencies": {
- "tslint": ">=5.11.0",
- "typescript": ">=4.1.3",
- "webpack": "^5.16.0",
- "webpack-cli": "^4.4.0"
- },
- "publishConfig": {
- "access": "public"
- }
-}
diff --git a/ui/component/or-table/tsconfig.json b/ui/component/or-table/tsconfig.json
deleted file mode 100644
index 2d31b45ae..000000000
--- a/ui/component/or-table/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "extends": "../../tsconfig",
- "compilerOptions": {
- "outDir": "./dist",
- "tsBuildInfoFile": "./dist/.tsbuildinfo",
- "rootDir": "src"
- },
- "include": [
- "./src"
- ],
- "references": [
- { "path": "../core" }
- ]
-}
\ No newline at end of file
diff --git a/ui/component/or-table/webpack.config.js b/ui/component/or-table/webpack.config.js
deleted file mode 100644
index 06448283a..000000000
--- a/ui/component/or-table/webpack.config.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const util = require("@openremote/util");
-
-bundles = {
- "index.bundle": undefined
-};
-
-module.exports = util.generateExports(__dirname);