100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI updates: Added initial version of or-asset-tree component
Rich Turnerdbb7ecd57dd5
diff --git a/ui/component/or-asset-tree/.npmignore b/ui/component/or-asset-tree/.npmignorenew file mode 100644index 000000000..ca658009d--- /dev/null+++ b/ui/component/or-asset-tree/.npmignore@@ -0,0 +1,3 @@+build/+build.gradle+test/\ No newline at end of filediff --git a/ui/component/or-asset-tree/README.md b/ui/component/or-asset-tree/README.mdnew file mode 100644index 000000000..aea7d59d4--- /dev/null+++ b/ui/component/or-asset-tree/README.md@@ -0,0 +1,31 @@+# @openremote/or-asset-tree \<or-asset-tree\>+[![NPM Version][npm-image]][npm-url]+[![Linux Build][travis-image]][travis-url]+[![Test Coverage][coveralls-image]][coveralls-url]++Web Component for displaying an asset tree. This component requires an OpenRemote Manager to retrieve, save and query assets.++## Install+```bash+npm i @openremote/or-asset-list+yarn add @openremote/or-asset-list+```++## 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-asset-list+[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\ No newline at end of filediff --git a/ui/component/or-asset-tree/build.gradle b/ui/component/or-asset-tree/build.gradlenew file mode 100644index 000000000..9abc9f80f--- /dev/null+++ b/ui/component/or-asset-tree/build.gradle@@ -0,0 +1,13 @@+buildDir = "dist"++task clean() {+ doLast {+ delete "dist"+ }+}++npmBuild.dependsOn resolveTask(":ui:component:or-translate:build"), resolveTask(":ui:component:or-select:build"), resolveTask(":ui:component:or-input:build")++task build() {+ dependsOn npmBuild+}\ No newline at end of filediff --git a/ui/component/or-asset-tree/package.json b/ui/component/or-asset-tree/package.jsonnew file mode 100644index 000000000..f6ded862a--- /dev/null+++ b/ui/component/or-asset-tree/package.json@@ -0,0 +1,27 @@+{+ "name": "@openremote/or-asset-tree",+ "version": "1.0.0",+ "description": "OpenRemote Asset Tree",+ "main": "dist/index.js",+ "types": "src/index.ts",+ "scripts": {+ "build": "npx tsc",+ "test": "echo \"No tests\" && exit 0"+ },+ "author": "OpenRemote",+ "license": "AGPL-3.0-or-later",+ "dependencies": {+ "@openremote/core": "^1.0.2",+ "@openremote/model": "^1.0.2",+ "@openremote/or-icon": "^1.0.0",+ "@openremote/or-select": "^1.0.0",+ "@openremote/or-translate": "^1.0.0",+ "@openremote/rest": "^1.0.2",+ "lit-element": "^2.1.0",+ "moment": "^2.24.0"+ },+ "devDependencies": {+ "tslint": "^5.11.0",+ "typescript": "^3.4.5"+ }+}diff --git a/ui/component/or-asset-tree/src/components/or-modal.ts b/ui/component/or-asset-tree/src/components/or-modal.tsnew file mode 100644index 000000000..aed1dd057--- /dev/null+++ b/ui/component/or-asset-tree/src/components/or-modal.ts@@ -0,0 +1,56 @@+import {customElement, html, LitElement, property, PropertyValues, TemplateResult, css} from "lit-element";+import "@openremote/or-select";+import "@openremote/or-icon";+import "@openremote/or-translate";+import "@openremote/or-icon";+++@customElement("or-modal")+export class OrModal extends LitElement {++ @property({type: Boolean, reflect: true})+ public show: boolean = false;++ @property({type: Boolean})+ public dismissible: boolean = true;++ public static get styles() {+ return css`+ :host {+ position: relative;+ }++ div[hidden] {+ height: 0px;+ }++ div {+ transition: all 0.8s ease-in;+ position: absolute;+ height: auto;+ }+ `;+ }++ protected updated(_changedProperties: PropertyValues): void {+ super.updated(_changedProperties);++ if (_changedProperties.has("show") && this.dismissible) {+ if (this.show) {+ document.body.addEventListener("click", this._onMouseClick);+ } else {+ document.body.removeEventListener("click", this._onMouseClick)+ }+ }+ }++ protected _onMouseClick(evt: MouseEvent) {+ if (!this.contains(evt.target as Node)) {+ this.show = false;+ }+ }++ protected render(): TemplateResult | void {+ return html`<div ?hidden="${!this.show}">TEST</div>`;+ }+}\ No newline at end of filediff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsnew file mode 100644index 000000000..08caaad28--- /dev/null+++ b/ui/component/or-asset-tree/src/index.ts@@ -0,0 +1,646 @@+import {customElement, html, LitElement, property, PropertyValues, TemplateResult, query} from "lit-element";+import "@openremote/or-select";+import "@openremote/or-icon";+import {TenantRuleset, Asset, AssetQuery, Tenant, AssetTreeNode, AssetType} from "@openremote/model";+import "@openremote/or-translate";+import {style} from "./style";+import openremote, {AssetModelUtil} from "@openremote/core";+import rest from "@openremote/rest";+import {OrSelectChangedEvent} from "@openremote/or-select";+import "@openremote/or-icon";+import Qs from "qs";++export interface UiAssetTreeNode extends AssetTreeNode {+ selected: boolean;+ expandable: boolean;+ expanded: boolean;+ parent: UiAssetTreeNode;+ children: UiAssetTreeNode[];+}++interface RequestEventDetail<T> {+ allow: boolean,+ detail: T+}++interface NodeClickEventDetail {+ node: UiAssetTreeNode,+ clickEvent: MouseEvent+}++export class OrAssetTreeRequestSelectEvent extends CustomEvent<RequestEventDetail<NodeClickEventDetail>> {++ public static readonly NAME = "or-asset-tree-request-select";++ constructor(request: NodeClickEventDetail) {+ super(OrAssetTreeRequestSelectEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: {+ allow: true,+ detail: request+ }+ });+ }+}++export class OrAssetTreeRequestAddEvent extends CustomEvent<RequestEventDetail<void>> {++ public static readonly NAME = "or-asset-tree-request-add";++ constructor() {+ super(OrAssetTreeRequestAddEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: {+ allow: true,+ detail: undefined+ }+ });+ }+}++export class OrAssetTreeRequestDeleteEvent extends CustomEvent<RequestEventDetail<UiAssetTreeNode[]>> {++ public static readonly NAME = "or-asset-tree-request-delete";++ constructor(request: UiAssetTreeNode[]) {+ super(OrAssetTreeRequestDeleteEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: {+ allow: true,+ detail: request+ }+ });+ }+}++export class OrAssetTreeRequestCopyEvent extends CustomEvent<RequestEventDetail<UiAssetTreeNode>> {++ public static readonly NAME = "or-asset-tree-request-copy";++ constructor(request: UiAssetTreeNode) {+ super(OrAssetTreeRequestCopyEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: {+ allow: true,+ detail: request+ }+ });+ }+}++export class OrAssetTreeSelectionChangedEvent extends CustomEvent<UiAssetTreeNode[]> {++ public static readonly NAME = "or-asset-tree-selection-changed";++ constructor(nodes: UiAssetTreeNode[]) {+ super(OrAssetTreeSelectionChangedEvent.NAME, {+ bubbles: true,+ composed: true,+ detail: nodes+ });+ }+}++declare global {+ export interface HTMLElementEventMap {+ [OrAssetTreeRequestSelectEvent.NAME]: OrAssetTreeRequestSelectEvent;+ [OrAssetTreeRequestAddEvent.NAME]: OrAssetTreeRequestAddEvent;+ [OrAssetTreeRequestDeleteEvent.NAME]: OrAssetTreeRequestDeleteEvent;+ [OrAssetTreeRequestCopyEvent.NAME]: OrAssetTreeRequestCopyEvent;+ [OrAssetTreeSelectionChangedEvent.NAME]: OrAssetTreeSelectionChangedEvent;+ }+}++//TODO: Add websocket support+//TODO: Make modal a standalone component+@customElement("or-asset-tree")+export class OrAssetTree extends LitElement {++ static get styles() {+ return [+ style+ ];+ }++ /**+ * Allows arbitrary assets to be displayed using a tree+ */+ @property({type: Array, reflect: false})+ public assets?: Asset[];++ @property({type: Array})+ public assetIds?: string[];++ @property({type: Array})+ public rootAssets?: Asset[];++ @property({type: Array})+ public rootAssetIds?: string[];++ @property({type: String})+ public realm?: string;++ @property({type: Boolean})+ public multiSelect?: boolean = true;++ @property({type: Function, noAccessor: true, attribute: false})+ public selector?: (node: UiAssetTreeNode) => boolean;++ @property({type: Array, noAccessor: true})+ public selectTypes?: string[];++ @property({type: Array})+ public selectedIds?: string[];++ @property({type: String})+ public sortBy?: string;++ @property({attribute: false})+ protected _realms?: Tenant[];++ @property({attribute: false})+ protected _nodes?: UiAssetTreeNode[];++ @property()+ protected _showLoading: boolean = true;++ protected _selectedNodes: UiAssetTreeNode[] = [];++ @query("#sort-menu")+ protected _sortMenu!: HTMLDivElement;++ @query("#delete-not-allowed-modal")+ protected _deleteNotAllowedModal!: HTMLDivElement;++ @query("#delete-confirm-modal")+ protected _deleteConfirmModal!: HTMLDivElement;++ connectedCallback() {+ super.connectedCallback();++ if (openremote.isSuperUser()) {+ rest.api.TenantResource.getAll().then((response) => {+ this._realms = response.data;+ });+ }+ }++ protected firstUpdated(_changedProperties: PropertyValues): void {+ this.addEventListener("click", (evt) => {+ if (this._sortMenu.hasAttribute("data-visible") && !this._sortMenu.contains(evt.target as Node)) {+ this._sortMenu.toggleAttribute("data-visible");+ }+ if (this._deleteNotAllowedModal.hasAttribute("data-visible") && !this._deleteNotAllowedModal.contains(evt.target as Node)) {+ this._deleteNotAllowedModal.toggleAttribute("data-visible");+ }+ if (this._deleteConfirmModal.hasAttribute("data-visible") && !this._deleteConfirmModal.contains(evt.target as Node)) {+ this._deleteConfirmModal.toggleAttribute("data-visible");+ }+ });+ }++ protected render() {++ return html`+ <div id="header">+ <div id="title-container">+ <or-translate id="title" value="asset_plural"></or-translate>+ ${openremote.isSuperUser() ? html `<or-select id="realm-picker" noempty .value="${this._getRealm()}" .options="${this._realms ? this._realms.map((tenant) => [tenant.realm, tenant.displayName]) : []}" @or-select-changed="${(evt: OrSelectChangedEvent) => this._onRealmChanged(evt)}"></or-select>` : ``}+ </div>++ <div id="header-btns">+ <button ?hidden="${!this.selectedIds || this.selectedIds.length === 0}" @click="${() => this._onCopyClicked()}"><or-icon icon="content-copy"></or-icon></button>+ <button ?hidden="${!this.selectedIds || this.selectedIds.length === 0}" @click="${() => this._onDeleteClicked()}"><or-icon icon="delete"></or-icon></button>+ <button @click="${() => this._onAddClicked()}"><or-icon icon="plus"></or-icon></button>+ <button @click="${() => this._onSearchClicked()}"><or-icon icon="magnify"></or-icon></button>+ <button @click="${() => this._onSortClicked()}"><or-icon icon="sort-variant"></or-icon></button>+ <div class="modal-container">+ <div class="modal" id="sort-menu">+ <div class="modal-content">+ <h2><or-translate value="sortBy"></or-translate></h2>+ <ul>+ <li @click="${() => this.sortBy = "name"}" ?data-selected="${!this.sortBy || this.sortBy === "name"}"><or-icon icon="check"></or-icon><or-translate value="name"></or-translate></li>+ <li @click="${() => this.sortBy = "type"}" ?data-selected="${this.sortBy === "type"}"><or-icon icon="check"></or-icon><or-translate value="assetType"></or-translate></li>+ <li @click="${() => this.sortBy = "created"}" ?data-selected="${this.sortBy === "created"}"><or-icon icon="check"></or-icon><or-translate value="creationDate"></or-translate></li>+ <li @click="${() => this.sortBy = "status"}" ?data-selected="${this.sortBy === "status"}"><or-icon icon="check"></or-icon><or-translate value="status"></or-translate></li>+ </ul>+ </div>+ </div>+ </div>+ <div class="modal-container">+ <div class="modal" id="delete-not-allowed-modal">+ <div class="modal-content">+ <p>+ <or-translate value="deleteAssetsNoChildrenAllowed"></or-translate>+ </p>+ <div class="modal-btns">+ <span class="btn" @click="${() => this._deleteNotAllowedModal.toggleAttribute("data-visible")}">OK</span>+ </div>+ </div>+ </div>+ </div>+ <div class="modal-container">+ <div class="modal" id="delete-confirm-modal">+ <div class="modal-content">+ <p>+ <or-translate value="confirmDeleteAssets"></or-translate>+ </p>+ <div class="modal-btns">+ <span class="btn" @click="${() => this._deleteConfirmModal.toggleAttribute("data-visible")}">CANCEL</span>+ <span class="btn" @click="${() => this._doDelete()}">OK</span>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>++ ${!this._nodes || this._showLoading+ ? html`+ <span id="loading">LOADING</span>`+ : html`+ <div id="list-container">+ <ol id="list">+ ${this._nodes.map((treeNode) => this._treeNodeTemplate(treeNode, 0))}+ </ol>+ </div>+ `+ }++ <div id="footer">++ </div>+ `;+ }++ protected _treeNodeTemplate(treeNode: UiAssetTreeNode, level: number): TemplateResult | string {++ const descriptor = AssetModelUtil.getAssetDescriptor(treeNode.asset!.type!);++ return html`+ <li ?data-selected="${treeNode.selected}" ?data-expanded="${treeNode.expanded}" @click="${(evt: MouseEvent) => this._onNodeClicked(evt, treeNode)}">+ <div class="node-container" style="padding-left: ${level*22}px">+ <div class="node-name">+ <div class="expander" ?data-expandable="${treeNode.expandable}"></div>+ <or-icon style="--or-icon-fill: ${descriptor && descriptor.color ? "#" + descriptor.color : "unset"}" icon="${descriptor && descriptor.icon ? descriptor.icon : AssetType.THING.icon}"></or-icon>+ <span>${treeNode.asset!.name}</span>+ </div>+ </div>+ <ol>+ ${!treeNode.children ? `` : treeNode.children.map((childNode) => this._treeNodeTemplate(childNode, level + 1))}+ </ol>+ </li>+ `;+ }++ protected shouldUpdate(_changedProperties: PropertyValues): boolean {+ const result = super.shouldUpdate(_changedProperties);++ if (_changedProperties.has("assetIds")+ || _changedProperties.has("rootAssets")+ || _changedProperties.has("rootAssetIds")+ || _changedProperties.has("realm")) {+ this._nodes = undefined;+ }++ if (!this._nodes) {+ this._loadAssets();+ return true;+ }++ if (_changedProperties.has("selectedIds")) {+ this._updateSelectedNodes();+ }++ if (_changedProperties.has("sortBy")) {+ this._updateSort(this._nodes!, this._getSortFunction());+ }++ return result;+ }++ public get selectedNodes(): UiAssetTreeNode[] {+ return this._selectedNodes ? [...this._selectedNodes] : [];+ }++ protected _updateSelectedNodes() {+ const actuallySelectedIds: string[] = [];+ const selectedNodes: UiAssetTreeNode[] = [];+ OrAssetTree._forEachNodeRecursive(this._nodes!, (node) => {+ if (this.selectedIds && this.selectedIds.indexOf(node.asset!.id!) >= 0) {+ actuallySelectedIds.push(node.asset!.id!);+ selectedNodes.push(node);+ node.selected = true;+ // Expand every ancestor+ let parent = node.parent;+ while (parent) {+ parent.expanded = true;+ parent = parent.parent;+ }+ } else {+ node.selected = false;+ }+ });++ this.selectedIds = actuallySelectedIds;+ this._selectedNodes = selectedNodes;+ }+++ protected _updateSort(nodes: UiAssetTreeNode[], sortFunction: (a: UiAssetTreeNode, b: UiAssetTreeNode) => number) {+ if (!nodes) {+ return;+ }++ nodes.sort(sortFunction);+ nodes.forEach((node) => this._updateSort(node.children, sortFunction));+ }++ protected _onNodeClicked(evt: MouseEvent, node: UiAssetTreeNode) {+ if (evt.defaultPrevented) {+ return;+ }++ evt.preventDefault();++ const isExpander = (evt.target as HTMLElement).className.indexOf("expander") >= 0;++ if (isExpander) {+ if (node.expandable) {+ node.expanded = !node.expanded;+ const elem = (evt.target as HTMLElement).parentElement!.parentElement!.parentElement!;+ elem.toggleAttribute("data-expanded");+ }+ } else {+ let canSelect = true;++ if (this.selector) {+ canSelect = this.selector(node);+ } else if (this.selectTypes) {+ canSelect = this.selectTypes.indexOf(node.asset!.type!) >= 0;+ }++ if (canSelect) {+ this._doRequest(new OrAssetTreeRequestSelectEvent({+ node: node,+ clickEvent: evt+ }), (detail) => this._doSelect(detail));+ }+ }+ }++ protected _onCopyClicked() {+ if (this._selectedNodes.length > 0) {+ this._doRequest(new OrAssetTreeRequestCopyEvent(this._selectedNodes[0]), (node) => this._doCopy(node));+ }+ }++ protected _onDeleteClicked() {+ this._doRequest(new OrAssetTreeRequestDeleteEvent(this._selectedNodes), (nodes) => this._showDeleteModal());+ }++ protected _onAddClicked() {+ this._doRequest(new OrAssetTreeRequestAddEvent(), () => this._doAdd());+ }++ protected _onSearchClicked() {++ }++ protected _onSortClicked() {+ // Do open on next task to prevent click handler closing it immediately+ window.setTimeout(() => {+ this._sortMenu.toggleAttribute("data-visible");+ });+ }++ protected _doSelect(detail: NodeClickEventDetail) {+ const node = detail.node;+ const evt = detail.clickEvent;++ let selectedIds = this.selectedIds ? this.selectedIds : [];+ const index = selectedIds.indexOf(node.asset!.id!);+ let select = true;+ let deselectOthers = true;++ if (this.multiSelect) {+ if (evt.ctrlKey) {+ deselectOthers = false;+ if (index >= 0 && selectedIds.length > 1) {+ select = false;+ }+ }+ }++ if (deselectOthers) {+ selectedIds = [node.asset!.id!];+ } else if (select) {+ if (index < 0) {+ selectedIds = [...selectedIds];+ selectedIds.push(node.asset!.id!);+ }+ } else {+ if (index >= 0) {+ selectedIds.splice(index, 1);+ selectedIds = [...selectedIds];+ }+ }++ this.selectedIds = selectedIds;+ }++ protected _showDeleteModal() {++ if (!this._selectedNodes) {+ return;+ }++ // Check each selected node has no children+ if (this._selectedNodes.find((node) => node.children && node.children.length > 0)) {+ // Do open on next task to prevent click handler closing it immediately+ window.setTimeout(() => {+ this._deleteNotAllowedModal.toggleAttribute("data-visible");+ });+ return;+ }++ // Do open on next task to prevent click handler closing it immediately+ window.setTimeout(() => {+ this._deleteConfirmModal.toggleAttribute("data-visible");+ });+ }++ protected _doDelete() {+ if (!this._selectedNodes) {+ return;+ }++ rest.api.AssetResource.delete({+ assetId: this._selectedNodes.map((node) => node.asset!.id!)+ }, {+ paramsSerializer: params => Qs.stringify(params, {arrayFormat: 'repeat'})+ }).then((response) => {+ if (response.status !== 200) {+ // TODO: Error announcement+ }++ // Clear nodes to refetch them+ this._nodes = undefined;+ }).catch((reason) => {+ // TODO: Error announcement+ // Clear nodes to refetch them+ this._nodes = undefined;+ });+ this._showLoading = true;+ }++ protected _doAdd() {++ }++ protected _doCopy(node: UiAssetTreeNode) {++ }++ protected _getSortFunction(): (a: UiAssetTreeNode, b: UiAssetTreeNode) => number {++ const nameSort = (a: UiAssetTreeNode, b: UiAssetTreeNode) => { return a.asset!.name! < b.asset!.name! ? -1 : a.asset!.name! > b.asset!.name! ? 1 : 0 };++ switch (this.sortBy) {+ case "created":+ return (a, b) => { return a.asset!.createdOn! < b.asset!.createdOn! ? -1 : a.asset!.createdOn! > b.asset!.createdOn! ? 1 : nameSort(a, b) };+ case "status":+ return (a, b) => { return a.asset!.name! < b.asset!.name! ? -1 : a.asset!.name! > b.asset!.name! ? 1 : nameSort(a, b) };+ case "type":+ return (a, b) => { return a.asset!.type! < b.asset!.type! ? -1 : a.asset!.type! > b.asset!.type! ? 1 : nameSort(a, b) };+ default:+ return nameSort;+ }+ }++ protected _loadAssets() {++ const sortFunction = this._getSortFunction();++ if (!this.assets) {+ let query: AssetQuery = {+ tenant: {+ realm: this._getRealm()+ },+ select: {+ excludePath: true,+ excludeRealm: true,+ excludeAttributes: true,+ excludeParentInfo: false+ }+ };++ if (this.assetIds) {+ query.ids = this.assetIds;+ query.recursive = true;+ } else if (this.rootAssets) {+ query.ids = this.rootAssets.map((asset) => asset.id!);+ query.recursive = true;+ } else if (this.rootAssetIds) {+ query.ids = this.rootAssetIds;+ query.recursive = true;+ }++ rest.api.AssetResource.queryAssets(query).then((response) => {+ this._buildTreeNodes(response.data, sortFunction);+ });+ } else {+ this._buildTreeNodes(this.assets, sortFunction);+ }+ }++ protected _buildTreeNodes(assets: Asset[], sortFunction: (a: UiAssetTreeNode, b: UiAssetTreeNode) => number) {+ if (!assets || assets.length === 0) {+ this._nodes = [];+ }++ let rootAssetIds: string[] | undefined;++ if (this.rootAssetIds) {+ rootAssetIds = this.rootAssetIds;+ } else if (this.rootAssets) {+ rootAssetIds = this.rootAssets.map((ra) => ra.id!);+ }++ let rootAssets: UiAssetTreeNode[];++ if (rootAssetIds) {+ rootAssets = assets.filter((asset) => rootAssetIds!.indexOf(asset.id!) >= 0).map((asset) => {+ return {+ asset: asset+ } as UiAssetTreeNode;+ });+ } else {+ rootAssets = assets.filter((asset) => !asset.parentId).map((asset) => {+ return {+ asset: asset+ } as UiAssetTreeNode;+ });+ }++ rootAssets.sort(sortFunction);+ rootAssets.forEach((rootAsset) => this._buildChildTreeNodes(rootAsset, assets, sortFunction));++ this._nodes = rootAssets;+ this._showLoading = false;+ }++ protected _buildChildTreeNodes(treeNode: UiAssetTreeNode, assets: Asset[], sortFunction: (a: UiAssetTreeNode, b: UiAssetTreeNode) => number) {+ treeNode.children = assets.filter((asset) => asset.parentId === treeNode.asset!.id).map((asset) => {+ return {+ asset: asset+ } as UiAssetTreeNode;+ }).sort(sortFunction);++ if (treeNode.children.length > 0) {+ treeNode.expandable = true;+ }++ treeNode.children.forEach((childNode) => {+ childNode.parent = treeNode;+ this._buildChildTreeNodes(childNode, assets, sortFunction);+ });+ }++ protected _getRealm(): string | undefined {+ if (openremote.isSuperUser() && this.realm) {+ return this.realm;+ }++ return openremote.getRealm();+ }++ protected _onRealmChanged(evt: OrSelectChangedEvent) {+ this.realm = evt.detail.value;+ this.assets = undefined;+ }++ protected _doRequest<T>(event: CustomEvent<RequestEventDetail<T>>, handler: (detail: T) => void) {+ this.dispatchEvent(event);+ window.setTimeout(() => {+ if (event.detail.allow) {+ handler(event.detail.detail);+ }+ })+ }++ protected static _forEachNodeRecursive(nodes: UiAssetTreeNode[], fn: (node: UiAssetTreeNode) => void) {+ if (!nodes) {+ return;+ }++ nodes.forEach((node) => {+ fn(node);+ this._forEachNodeRecursive(node.children, fn);+ });+ }+}diff --git a/ui/component/or-asset-tree/src/style.ts b/ui/component/or-asset-tree/src/style.tsnew file mode 100644index 000000000..f92851141--- /dev/null+++ b/ui/component/or-asset-tree/src/style.ts@@ -0,0 +1,279 @@+import {css, unsafeCSS} from "lit-element";+import {DefaultColor1, DefaultColor2, DefaultColor5, DefaultColor3, DefaultColor4, DefaultColor7, DefaultBoxShadow, DefaultDisabledOpacity,+ DefaultBoxShadowBottom} from "@openremote/core";+import mdi from "@openremote/or-icon/dist/mdi-icons";++// language=CSS+export const style = css`++ :host {+ --internal-or-asset-tree-header-color: var(--or-asset-tree-header-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));+ --internal-or-asset-tree-header-text-color: var(--or-asset-tree-header-text-color, var(--or-app-color7, ${unsafeCSS(DefaultColor7)}));+ --internal-or-asset-tree-header-menu-background-color: var(--or-asset-tree-header-menu-background-color, var(--internal-or-asset-tree-header-text-color));+ --internal-or-asset-tree-header-menu-text-color: var(--or-asset-tree-header-menu-text-color, inherit);+ --internal-or-asset-tree-header-height: var(--or-asset-tree-header-height, 70px);+ --internal-or-asset-tree-background-color: var(--or-asset-tree-background-color, var(--or-app-color7, ${unsafeCSS(DefaultColor7)}));+ --internal-or-asset-tree-text-color: var(--or-asset-tree-text-color, inherit);+ --internal-or-asset-tree-item-height: var(--or-asset-tree-item-height, 28px);+ --internal-or-asset-tree-item-padding: var(--or-asset-tree-item-padding, 10px);+ --internal-or-asset-tree-selected-background-color: var(--or-asset-tree-selected-background-color, var(--or-app-color2, ${unsafeCSS(DefaultColor2)}));+ --internal-or-asset-tree-selected-color: var(--or-asset-tree-selected-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));+ --internal-or-asset-tree-button-color: var(--or-asset-tree-button-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));+ --internal-or-asset-tree-line-color: var(--or-asset-tree-line-color, var(--or-app-color5, ${unsafeCSS(DefaultColor5)}));++ display: flex;+ flex-direction: column;+ height: 100%;+ width: 100%;+ background-color: var(--internal-or-asset-tree-background-color);+ }++ *[hidden] {+ display: none;+ }++ button {+ background-color: var(--internal-or-asset-tree-button-color);+ color: var(--internal-or-asset-tree-background-color);+ --or-icon-width: 26px;+ --or-icon-height: 26px;+ --or-icon-fill: var(--internal-or-asset-tree-background-color);+ margin: 0 8px;+ border: none;+ padding: 0;+ display: inline-block;+ cursor: pointer;+ }++ button:focus {+ outline: 0;+ }++ #header {+ background-color: var(--internal-or-asset-tree-header-color);+ display: flex;+ width: 100%;+ height: var(--internal-or-asset-tree-header-height);+ border-bottom: 1px solid ${unsafeCSS(DefaultColor5)};+ -webkit-box-shadow: ${unsafeCSS(DefaultBoxShadowBottom)};+ -moz-box-shadow: ${unsafeCSS(DefaultBoxShadowBottom)};+ box-shadow: ${unsafeCSS(DefaultBoxShadowBottom)};+ z-index: 1000;+ }++ #header > * {+ line-height: var(--internal-or-asset-tree-header-height);+ }++ #title-container {+ flex: 1 0 auto;+ flex-direction: row;+ text-transform: capitalize;+ padding-left: 30px;++ --or-select-text-color: var(--internal-or-asset-tree-header-text-color);+ --or-select-option-text-color: var(--internal-or-asset-tree-header-menu-text-color);+ --or-select-option-background-color: var(--internal-or-asset-tree-header-menu-background-color);+ --or-select-background-color: none;+ --or-select-border-color: none;+ --or-select-padding: 5px 20px 5px 5px;+ }++ #title {+ font-weight: bold;+ font-size: 20px;+ color: var(--internal-or-asset-tree-header-text-color);+ }++ #realm-picker {+ outline: none;+ margin-left: 5px;+ text-transform: none;+ font-size: 14px;+ }++ #header-btns {+ display: flex;+ flex-direction: row;+ padding-right: 10px;+ }++ .modal-container {+ position: relative;+ line-height: normal;+ }++ .modal {+ position: absolute;+ height: 0;+ overflow: hidden;+ }++ .modal[data-visible] {+ transition: all 0.5s ease-in;+ height: auto;+ overflow: visible;+ }++ .modal-content {+ border: 1px solid var(--internal-or-asset-tree-line-color);+ box-shadow: ${unsafeCSS(DefaultBoxShadow)};+ -moz-box-shadow: ${unsafeCSS(DefaultBoxShadow)};+ -webkit-box-shadow: ${unsafeCSS(DefaultBoxShadow)};+ color: var(--internal-or-asset-tree-header-menu-text-color);+ background-color: var(--internal-or-asset-tree-header-menu-background-color);+ padding: 20px 25px 10px 25px;+ }++ .modal-content > ul {+ list-style-type: none;+ padding: 0;+ margin-bottom: 0;+ white-space: nowrap;+ }++ .modal-content > ul > li {+ font-weight: bolder;+ line-height: 40px;+ cursor: pointer;+ }++ .modal-content > ul > li > or-icon {+ visibility: hidden;+ width: 18px;+ height: 18px;+ margin-right: 10px;+ --or-icon-fill: var(--internal-or-asset-tree-header-color);+ --or-icon-stroke: var(--internal-or-asset-tree-header-color);+ --or-icon-stroke-width: 2px;+ }++ .modal-content > ul > li[data-selected] > or-icon {+ visibility: visible;+ }++ .modal-content > h2 {+ opacity: 0.6;+ font-size: 0.9em;+ margin: 0;+ }++ .modal-btns {+ text-align: right;+ }++ .modal-btns .btn {+ font-weight: bolder;+ cursor: pointer;+ }++ .modal-btns .btn + .btn {+ margin-left: 30px;+ }++ #sort-menu {+ left: -173px;+ top: var(--internal-or-asset-tree-header-height);+ }++ #delete-not-allowed-modal {+ left: -400px;+ top: var(--internal-or-asset-tree-header-height);+ }++ #delete-confirm-modal {+ left: -300px;+ top: var(--internal-or-asset-tree-header-height);+ }++ #list-container {+ flex: 1 0 auto;+ overflow: auto;+ }++ #list {+ margin: 0;+ color: var(--internal-or-asset-tree-text-color);+ padding: 15px 0;+ font-weight: bolder;+ }++ #list, ol {+ list-style-type: none;+ }++ li ol {+ padding: 0;+ }++ #list li:not([data-expanded]) > ol {+ display: none;+ }++ #list li[data-selected] > .node-container, #list li > .node-container:hover {+ background-color: var(--internal-or-asset-tree-selected-background-color);+ }++ #list li[data-selected] > .node-container {+ border-left-color: var(--internal-or-asset-tree-selected-color);+ }++ .node-container {+ display: flex;+ flex-direction: row;+ border-left: 4px solid transparent;+ user-select: none;+ cursor: pointer;+ height: var(--internal-or-asset-tree-item-height);+ line-height: var(--internal-or-asset-tree-item-height);+ padding-top: var(--internal-or-asset-tree-item-padding);+ padding-bottom: var(--internal-or-asset-tree-item-padding);+ }++ .node-container > * {+ flex: 0 0 auto;+ }++ .expander {+ width: 26px;+ height: 100%;+ display: inline-block;+ background-repeat: no-repeat;+ background-size: 100%;+ background-position: center;+ }++ .expander[data-expandable] {+ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='${unsafeCSS(mdi.icons["chevron-right"])}'/%3E%3C/svg%3E");+ }++ li[data-expanded] > .node-container .expander {+ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='${unsafeCSS(mdi.icons["chevron-down"])}'/%3E%3C/svg%3E") !important;+ }++ .node-name {+ margin: -4px 0;+ flex: 1 0 auto;+ display: flex;+ align-items: center;+ }++ .node-name > span {+ vertical-align: middle;+ }++ .node-name > or-icon {+ --or-icon-width: var(--internal-or-asset-tree-item-height);+ --or-icon-height: var(--internal-or-asset-tree-item-height);+ margin-right: 10px;+ }++ #loading {+ flex: 1 0 auto;+ display: inline-flex;+ align-items: center;+ text-align: center;+ margin: 0 auto;+ }++`;\ No newline at end of filediff --git a/ui/component/or-asset-tree/tsconfig.json b/ui/component/or-asset-tree/tsconfig.jsonnew file mode 100644index 000000000..917281342--- /dev/null+++ b/ui/component/or-asset-tree/tsconfig.json@@ -0,0 +1,18 @@+{+ "extends": "../../tsconfig",+ "compilerOptions": {+ "outDir": "./dist",+ "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "rootDir": "src"+ },+ "include": [+ "./src"+ ],+ "references": [+ { "path": "../core" },+ { "path": "../rest" },+ { "path": "../or-select" },+ { "path": "../or-translate" },+ { "path": "../or-icon" }+ ]+}\ No newline at end of filediff --git a/ui/demo/demo-or-asset-tree/.gitignore b/ui/demo/demo-or-asset-tree/.gitignorenew file mode 100644index 000000000..9fde23e0a--- /dev/null+++ b/ui/demo/demo-or-asset-tree/.gitignore@@ -0,0 +1,3 @@+src/**/*.d.ts+src/**/*.js.map+src/**/*.js\ No newline at end of filediff --git a/ui/demo/demo-or-asset-tree/babel.config.js b/ui/demo/demo-or-asset-tree/babel.config.jsnew file mode 100644index 000000000..a12d41ed6--- /dev/null+++ b/ui/demo/demo-or-asset-tree/babel.config.js@@ -0,0 +1,38 @@+module.exports = api => {++ api.cache(false);+ return {+ presets: [+ [+ "@babel/preset-env",+ {+ modules: false,+ exclude: ['transform-async-to-generator'],+ targets: [+ "last 2 versions",+ "IE 11"+ ]+ }+ ]+ ],+ plugins: [+ [+ "@babel/transform-runtime",+ {+ "corejs": false,+ "helpers": true,+ "regenerator": true,+ "useESModules": false+ }+ ],+ "@babel/syntax-dynamic-import",+ "@babel/syntax-object-rest-spread",+ [+ 'module:fast-async',+ {+ spec: true+ }+ ]+ ]+ };+};diff --git a/ui/demo/demo-or-asset-tree/build.gradle b/ui/demo/demo-or-asset-tree/build.gradlenew file mode 100644index 000000000..5f8fc3f9e--- /dev/null+++ b/ui/demo/demo-or-asset-tree/build.gradle@@ -0,0 +1,9 @@+buildDir = "dist"++task clean() {+ dependsOn npmClean+}++task build() {+ dependsOn npmBuild+}\ No newline at end of filediff --git a/ui/demo/demo-or-asset-tree/index.html b/ui/demo/demo-or-asset-tree/index.htmlnew file mode 100644index 000000000..846b97f4a--- /dev/null+++ b/ui/demo/demo-or-asset-tree/index.html@@ -0,0 +1,50 @@+<!doctype html>+<html lang="en">+<head>+ <meta charset="utf-8">+ <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">++ <title>Demo</title>++ <!--+ Feature detect Custom Elements support. If the browser DOES support Custom+ Elements then we need to load the custom-elements-es5-adapter because+ our project code has been transpiled from ES2015 to ES5 and native Custom+ Elements expect elements will be registered as classes.+ -->+ <script>if (!window.customElements) { document.write('<!--'); }</script>+ <script src="./modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>+ <!--! DO NOT REMOVE THIS COMMENT, WE NEED ITS CLOSING MARKER -->++ <style>+ body {+ font-family: Arial, "Open Sans", sans-serif;+ }+ </style>+</head>+<body>+<div class="vertical-section-container centered">+ <h3>Demo</h3>+ <or-demo-app></or-demo-app>+</div>++<!--+Use the webcomponents-loader script which will feature detect which Web+Components features are missing and lazy load the appropriate polyfills.+When we hear the 'WebComponentsReady' event from the polyfill bundle we can+insert our 'bundle.js'.+-->+<script>+ (function () {+ document.addEventListener('WebComponentsReady', function componentsReady() {+ document.removeEventListener('WebComponentsReady', componentsReady, false);+ var script = document.createElement('script');+ script.src = '<%= htmlWebpackPlugin.files.js[0] %>';+ var refScript = document.getElementsByTagName('script')[0];+ refScript.parentNode.insertBefore(script, refScript);+ }, false);+ })();+</script>+<script src="modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>+</body>+</html>diff --git a/ui/demo/demo-or-asset-tree/package.json b/ui/demo/demo-or-asset-tree/package.jsonnew file mode 100644index 000000000..d81320fb7--- /dev/null+++ b/ui/demo/demo-or-asset-tree/package.json@@ -0,0 +1,47 @@+{+ "name": "@openremote/demo-or-asset-tree",+ "version": "1.0.0",+ "description": "Component Demo",+ "scripts": {+ "clean": "npx shx rm -rf dist",+ "modelBuild": "node ../../model-build.js",+ "modelWatch": "node ../../model-watch.js",+ "build": "npx tsc -b && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",+ "serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack-dev-server --mode development",+ "watch": "npx tsc -b -w",+ "test": "echo \"Error: no test specified\" && exit 1"+ },+ "author": "OpenRemote",+ "license": "AGPL-3.0-or-later",+ "dependencies": {+ "@openremote/demo-core": "^1.0.0",+ "@openremote/or-asset-tree": "^1.0.0"+ },+ "devDependencies": {+ "@babel/core": "^7.2.2",+ "@babel/plugin-syntax-dynamic-import": "^7.2.0",+ "@babel/plugin-syntax-object-rest-spread": "^7.2.0",+ "@babel/plugin-transform-regenerator": "^7.0.0",+ "@babel/plugin-transform-runtime": "^7.2.0",+ "@babel/preset-env": "^7.2.0",+ "@babel/runtime": "^7.2.0",+ "@polymer/iron-demo-helpers": "^3.0.0-pre.19",+ "babel-loader": "^8.0.4",+ "copy-webpack-plugin": "^4.6.0",+ "cross-env": "^5.2.0",+ "css-loader": "^2.0.0",+ "fast-async": "^6.3.8",+ "file-loader": "^2.0.0",+ "html-webpack-plugin": "^3.2.0",+ "raw-loader": "^0.5.1",+ "shx": "^0.3.2",+ "source-map-loader": "^0.2.4",+ "style-loader": "^0.23.1",+ "tslint": "^5.11.0",+ "typescript": "^3.4.5",+ "url-loader": "^1.1.2",+ "webpack": "^4.24.0",+ "webpack-cli": "^3.1.2",+ "webpack-dev-server": "^3.1.10"+ }+}diff --git a/ui/demo/demo-or-asset-tree/src/index.ts b/ui/demo/demo-or-asset-tree/src/index.tsnew file mode 100644index 000000000..bce3bc364--- /dev/null+++ b/ui/demo/demo-or-asset-tree/src/index.ts@@ -0,0 +1,51 @@+import "@polymer/iron-demo-helpers/demo-pages-shared-styles";+import "@polymer/iron-demo-helpers/demo-snippet";+import "@openremote/or-asset-tree";+import openremote, {Auth} from "@openremote/core";+import {customElement, html, LitElement, property, TemplateResult, css} from "lit-element";++@customElement("or-demo-app")+class App extends LitElement {++ static get styles() {+ return css`+ :host {+ color: #4c4c4c;+ }++ or-asset-tree {+ width: 450px;+ height: 1000px;+ border: 1px solid grey;+ }+ `;+ }++ @property()+ public loaded: boolean = false;++ protected render(): TemplateResult | void {+ if (!this.loaded) {+ return;+ }++ return html`+ <demo-snippet>+ <template>+ <or-asset-tree></or-asset-tree>+ </template>+ </demo-snippet>+ `;+ }+}++openremote.init({+ auth: Auth.KEYCLOAK,+ autoLogin: true,+ keycloakUrl: "http://localhost:8080/auth",+ managerUrl: "http://localhost:8080",+ realm: "master"+}).then(() => {+ const app = document.getElementsByTagName("or-demo-app")[0] as App;+ app.loaded = true;+});diff --git a/ui/demo/demo-or-asset-tree/tsconfig.json b/ui/demo/demo-or-asset-tree/tsconfig.jsonnew file mode 100644index 000000000..79ef0c997--- /dev/null+++ b/ui/demo/demo-or-asset-tree/tsconfig.json@@ -0,0 +1,14 @@+{+ "extends": "../../tsconfig",+ "compilerOptions": {+ "tsBuildInfoFile": "./.tsbuildinfo"+ },+ "include": [+ "./src"+ ],+ "references": [+ { "path": "../../component/core" },+ { "path": "../../component/rest" },+ { "path": "../../component/or-asset-tree" }+ ]+}\ No newline at end of filediff --git a/ui/demo/demo-or-asset-tree/webpack.config.js b/ui/demo/demo-or-asset-tree/webpack.config.jsnew file mode 100644index 000000000..632e19aa7--- /dev/null+++ b/ui/demo/demo-or-asset-tree/webpack.config.js@@ -0,0 +1,75 @@+var HtmlWebpackPlugin = require("html-webpack-plugin");+var path = require("path");+var CopyWebpackPlugin = require("copy-webpack-plugin");++module.exports = {+ mode: 'development',+ entry: {+ 'bundle': './src/index.js'+ },+ output: {+ path: __dirname + "/dist",+ filename: "[name].[hash].js",+ publicPath: ""+ },+ devtool: 'inline-source-map',+ devServer: {+ port: 9000,+ contentBase: './dist',+ publicPath: "/" + __dirname.split(path.sep).slice(-1)[0] + "/"+ },+ watchOptions: {+ ignored: ['**/*.ts', 'node_modules']+ },+ plugins: [+ new HtmlWebpackPlugin({+ chunksSortMode: 'none',+ inject: false,+ template: 'index.html'+ }),+ new CopyWebpackPlugin([+ {+ from: path.dirname(require.resolve("@webcomponents/webcomponentsjs")),+ to: "modules/@webcomponents/webcomponentsjs",+ ignore: "!*.js"+ }+ ])+ ],+ module: {+ rules: [+ {+ test: /\.js$/,+ use: ["source-map-loader"],+ enforce: "pre",+ exclude: [+ /node_modules/+ ]+ },+ {+ test: /\.js$/,+ include: function(modulePath) {+ return /(@webcomponents[\/|\\]shadycss|lit-css|styled-lit-element|lit-html|lit-element|@polymer|@lit|pwa-helpers)/.test(modulePath) || !/node_modules/.test(modulePath);+ },+ use: [+ {+ loader: 'babel-loader'+ }+ ]+ },+ {+ test: /\.css$/,+ use: [+ { loader: "css-loader" }+ ]+ },+ {+ test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/,+ loader: 'url-loader',+ options: {+ outputPath: "images/",+ limit: 10000+ }+ }+ ]+ }+};\ No newline at end of file