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
rename modal
Vincentc935d7ff47b6
diff --git a/ui/component/or-asset-viewer/src/components/or-add-modal.ts b/ui/component/or-asset-viewer/src/components/or-attributes-modal.tssimilarity index 91%rename from ui/component/or-asset-viewer/src/components/or-add-modal.tsrename to ui/component/or-asset-viewer/src/components/or-attributes-modal.tsindex 66a381f5f..0d49c653c 100644--- a/ui/component/or-asset-viewer/src/components/or-add-modal.ts+++ b/ui/component/or-asset-viewer/src/components/or-attributes-modal.ts@@ -21,14 +21,11 @@ const style = css``;-@customElement("or-add-modal")-export class OrAddModal extends LitElement {+@customElement("or-attributes-modal")+export class OrAttributesModal extends LitElement {- @property({type: Boolean})- isVisible?: boolean = false;-- @query("#mdc-dialog-add-asset")+ @query("#mdc-dialog-add-remove-attributes")protected _dialogElem!: HTMLElement;protected _dialog!: MDCDialog;@@ -46,7 +43,7 @@ export class OrAddModal extends LitElement {protected render() {return html`- <div id="mdc-dialog-add-asset"+ <div id="mdc-dialog-add-remove-attributes"class="mdc-dialog"role="alertdialog"aria-modal="true"diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 4a97ed20a..24e849665 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -30,7 +30,7 @@ import {style} from "./style";import i18next from "i18next";import {styleMap} from "lit-html/directives/style-map";import {classMap} from "lit-html/directives/class-map";-import "./components/or-add-modal";+import "./components/or-attributes-modal";import {MDCDialog} from "@material/dialog";export type PanelType = "property" | "location" | "attribute" | "history" | "chart" | "group";@@ -516,10 +516,10 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemreturn;}- const doAdd = () => {- const modal = shadowRoot!.getElementById("add-modal");+ const openModal = () => {+ const modal = shadowRoot!.getElementById("modal-attributes");if (modal && modal.shadowRoot) {- const component = modal.shadowRoot.getElementById("mdc-dialog-add-asset");+ const component = modal.shadowRoot.getElementById("mdc-dialog-add-remove-attributes");if (component) {const dialog = new MDCDialog(component);if (dialog) {@@ -544,14 +544,16 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemreturn html`<or-tableheaders='${JSON.stringify(headers)}'rows='${JSON.stringify(rows)}'></or-table>`;+ <or-attributes-modal+ id="modal-attributes"+ .selectedAttributes="${selectedHeaders}"></or-attributes-modal>} else {return html`<span>No data found</span>`;}});content = html`- <or-icon icon="plus-minus" @click="${() => doAdd()}"></or-icon>- <or-add-modal id="add-modal"></or-add-modal>+ <or-icon icon="plus-minus" @click="${() => openModal()}"></or-icon>${until(renderTable, `<span>Loading...</span>`)}`;