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: minor updates to or-asset-viewer

Rich Turnerff130e6f040f
diff --git a/ui/app/or-app/src/pages/page-assets.ts b/ui/app/or-app/src/pages/page-assets.ts
index 45b6ceeef..0dbc657c5 100644
--- a/ui/app/or-app/src/pages/page-assets.ts
+++ b/ui/app/or-app/src/pages/page-assets.ts
@@ -6,7 +6,9 @@ import {
OrAssetViewerEditToggleEvent,
OrAssetViewerRequestEditToggleEvent,
OrAssetViewerSaveEvent,
- ViewerConfig
+ ViewerConfig,
+ saveAsset,
+ SaveResult
} from "@openremote/or-asset-viewer";
import {
AssetTreeConfig,
@@ -123,7 +125,7 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {
this.addEventListener(OrAssetViewerRequestEditToggleEvent.NAME, this._onEditToggleRequested);
this.addEventListener(OrAssetViewerEditToggleEvent.NAME, this._onEditToggle);
this.addEventListener(OrAssetTreeAddEvent.NAME, this._onAssetAdd);
- this.addEventListener(OrAssetViewerSaveEvent.NAME, this._onAssetSave);
+ this.addEventListener(OrAssetViewerSaveEvent.NAME, (ev) => this._onAssetSave(ev.detail));
this.addEventListener(OrAssetTreeAssetEvent.NAME, this._onAssetTreeAssetEvent);
}
@@ -209,16 +211,20 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {
}
}
- protected _onAssetAdd(ev: OrAssetTreeAddEvent) {
- // Load the asset into the viewer and ensure we're in edit mode
- this._viewer.asset = ev.detail.asset;
- this._editMode = true;
- this._updateRoute(true);
+ protected async _onAssetAdd(ev: OrAssetTreeAddEvent) {
+ if (this._editMode) {
+ // Just load the asset into the viewer
+ this._viewer.asset = ev.detail.asset;
+ } else {
+ // Auto save and load
+ const result = await saveAsset(ev.detail.asset);
+ this._onAssetSave(result);
+ }
}
- protected _onAssetSave(ev: OrAssetViewerSaveEvent) {
- if (ev.detail.success && ev.detail.isNew) {
- this._addedAssetId = ev.detail.asset.id!;
+ protected _onAssetSave(result: SaveResult) {
+ if (result.success && result.isNew) {
+ this._addedAssetId = result.assetId!;
}
}
@@ -228,6 +234,8 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {
if (this._addedAssetId === ev.detail.asset.id) {
this._assetIds = [ev.detail.asset.id];
this._addedAssetId = undefined;
+ this._viewer.assetId = ev.detail.asset.id;
+ this._updateRoute(true);
}
}
}
diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.ts
index 34b8ed163..9386763a7 100644
--- a/ui/component/or-asset-tree/src/index.ts
+++ b/ui/component/or-asset-tree/src/index.ts
@@ -283,6 +283,20 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
}
}
+ public isAncestorSelected(node: UiAssetTreeNode) {
+ if (!this.selectedIds || !node.parent) {
+ return false;
+ }
+
+ while (node.parent) {
+ node = node.parent;
+ if (this.selectedIds.includes(node.asset!.id!)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
protected render() {
return html`
@@ -294,7 +308,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
<div id="header-btns">
<or-input ?hidden="${!this.selectedIds || this.selectedIds.length === 0}" type="${InputType.BUTTON}" icon="close" @click="${() => this._onDeselectClicked()}"></or-input>
<or-input ?hidden="${this._isReadonly() || !this.selectedIds || this.selectedIds.length !== 1}" type="${InputType.BUTTON}" icon="content-copy" @click="${() => this._onCopyClicked()}"></or-input>
- <or-input ?hidden="${this._isReadonly() || !this.selectedIds || this.selectedIds.length === 0}" type="${InputType.BUTTON}" icon="delete" @click="${() => this._onDeleteClicked()}"></or-input>
+ <or-input ?hidden="${this._isReadonly() || !this.selectedIds || this.selectedIds.length === 0 || this.selectedNodes.some((node) => this.isAncestorSelected(node))}" type="${InputType.BUTTON}" icon="delete" @click="${() => this._onDeleteClicked()}"></or-input>
<or-input ?hidden="${this._isReadonly() || !this._canAdd()}" type="${InputType.BUTTON}" icon="plus" @click="${() => this._onAddClicked()}"></or-input>
<or-input hidden type="${InputType.BUTTON}" icon="magnify" @click="${() => this._onSearchClicked()}"></or-input>
@@ -509,8 +523,9 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
const parent = this._selectedNodes && this._selectedNodes.length === 1 ? this._selectedNodes[0].asset : undefined;
const onAddChanged = (ev: OrAddChangedEvent) => {
+ const nameValid = ev.detail.name && ev.detail.name.trim().length > 0 && ev.detail.name.trim().length < 1024;
const addBtn = dialog.shadowRoot!.getElementById("add-btn") as OrInput;
- addBtn.disabled = !ev.detail.descriptor || !ev.detail.name;
+ addBtn.disabled = !ev.detail.descriptor || !nameValid;
};
dialog = showDialog(
@@ -532,18 +547,20 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {
const addAssetDialog = dialog.shadowRoot!.getElementById("add-panel") as OrAddAssetDialog;
const descriptor = addAssetDialog.selectedType;
+ const name = addAssetDialog.name;
if (!descriptor) {
return;
}
const asset: Asset = {
- name: "New Asset",
+ name: name,
type: descriptor.type,
realm: manager.getRealm()
};
- if(this.selectedIds) {
- asset["parentId"] = this.selectedIds[0];
+
+ if (this.selectedIds) {
+ asset.parentId = parent ? parent.id : undefined;
}
const detail: AddEventDetail = {
asset: asset
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.ts
index 3cbf86248..e51892788 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
@@ -9,10 +9,9 @@ import {
OrMwcList,
OrMwcListChangedEvent
} from "@openremote/or-mwc-components/dist/or-mwc-list";
-import {OrMwcDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";
import {i18next} from "@openremote/or-translate";
-import {Util, DefaultColor5, DefaultColor2} from "@openremote/core";
-import { InputType, OrInputChangedEvent, OrInput } from "@openremote/or-input";
+import {DefaultColor2, DefaultColor5, Util} from "@openremote/core";
+import {InputType, OrInput, OrInputChangedEvent} from "@openremote/or-input";
export type OrAddAssetDetail = {
name: string | undefined;
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.ts
index 053a96c66..134439fd6 100644
--- a/ui/component/or-asset-viewer/src/index.ts
+++ b/ui/component/or-asset-viewer/src/index.ts
@@ -178,8 +178,8 @@ export class OrAssetViewerComputeGridEvent extends CustomEvent<void> {
export type SaveResult = {
success: boolean,
- asset: Asset,
- isNew: boolean
+ assetId: string,
+ isNew?: boolean
};
export class OrAssetViewerRequestSaveEvent extends CustomEvent<Util.RequestEventDetail<Asset>> {
@@ -703,6 +703,40 @@ async function getAssetChildren(id: string, childAssetType: string): Promise<Ass
return response.data.filter((asset) => asset.type === childAssetType);
}
+export async function saveAsset(asset: Asset, isUpdate: boolean = false): Promise<SaveResult> {
+
+ let success: boolean;
+ let id: string = "";
+
+ try {
+ if (isUpdate) {
+ if (!asset.id) {
+ throw new Error("Request to update existing asset but asset ID is not set");
+ }
+ const response = await manager.rest.api.AssetResource.update(asset.id!, asset);
+ success = response.status === 204;
+ if (success) {
+ id = asset.id!;
+ }
+ } else {
+ const response = await manager.rest.api.AssetResource.create(asset);
+ success = response.status === 200;
+ if (success) {
+ id = response.data.id!;
+ }
+ }
+ } catch (e) {
+ success = false;
+ console.error("Failed to save asset", e);
+ }
+
+ return {
+ assetId: id,
+ success: success,
+ isNew: !isUpdate
+ };
+}
+
// TODO: Add webpack/rollup to build so consumers aren't forced to use the same tooling
const tableStyle = require("!!raw-loader!@material/data-table/dist/mdc.data-table.css");
@@ -995,39 +1029,24 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem
return;
}
- let fail = false;
- const isNew = !asset.id;
+ const isUpdate = !!asset.version;
this.saveBtnElem.disabled = true;
this.wrapperElem.classList.add("saving");
- try {
- if (!isNew) {
- const response = await manager.rest.api.AssetResource.update(asset.id!, asset);
- fail = response.status !== 204;
- } else {
- const response = await manager.rest.api.AssetResource.create(asset);
- fail = response.status !== 200;
- if (!fail) {
- asset = response.data;
- }
- }
- } catch (e) {
- fail = true;
- console.error("Failed to save asset", e);
- }
+ const result = await saveAsset(asset, isUpdate);
this.wrapperElem.classList.remove("saving");
this.saveBtnElem.disabled = false;
- if (fail) {
+ if (!result.success) {
showErrorDialog(i18next.t("saveAssetFailed"));
+ } else {
+ this._assetModified = false;
+ this.assetId = result.assetId;
+ this.reloadAsset();
}
- this.dispatchEvent(new OrAssetViewerSaveEvent({
- asset: asset,
- isNew: isNew,
- success: !fail
- }));
+ this.dispatchEvent(new OrAssetViewerSaveEvent(result));
}
protected _onAssetModified() {