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
Improve asset-viewer to work like a masonry layout, or-map css variables
robindekkers42494cfbd64d
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 58a63ab62..30b711574 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -31,7 +31,6 @@ export type PanelType = "property" | "location" | "attribute" | "history";export interface PanelConfig {type?: PanelType;- scrollable?: boolean;hide?: boolean;hideOnMobile?: boolean;include?: string[];@@ -79,17 +78,12 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElempublic static DEFAULT_CONFIG: AssetViewerConfig = {viewerStyles: {- gridTemplateColumns: "repeat(12, 1fr)",- gridTemplateRows: "auto minmax(0, 1fr) minmax(0, 50%)"+},panels: {"info": {type: "property",panelStyles: {- gridColumnStart: "1",- gridColumnEnd: "7",- gridRowStart: "1",- gridRowEnd: "2",},fieldStyles: {name: {@@ -104,40 +98,23 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem},"location": {type: "location",- scrollable: false,include: ["location"],panelStyles: {- gridColumnStart: "7",- gridColumnEnd: "13",- gridRowStart: "1",- gridRowEnd: "3",- minHeight: "400px"},fieldStyles: {location: {- height: "100%",- margin: "0"}}},"attributes": {type: "attribute",panelStyles: {- gridColumnStart: "1",- gridColumnEnd: "7",- gridRowStart: "2",- gridRowEnd: "4"}},"history": {type: "history",panelStyles: {- gridColumnStart: "7",- gridColumnEnd: "13",- gridRowStart: "3",- gridRowEnd: "4"- },- scrollable: false+ }}}};@@ -171,6 +148,12 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemprotected _viewerConfig?: AssetViewerConfig;protected _attributes?: AssetAttribute[];++ constructor() {+ super();+ window.addEventListener('resize', this.generateGrid.bind(this));+ }+shouldUpdate(changedProperties: PropertyValues): boolean {if (changedProperties.has("asset")) {@@ -221,7 +204,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem<div id="title"><or-icon title="${descriptor && descriptor.type ? descriptor.type : "unset"}" style="--or-icon-fill: ${descriptor && descriptor.color ? "#" + descriptor.color : "unset"}" icon="${descriptor && descriptor.icon ? descriptor.icon : AssetType.THING.icon}"></or-icon>${this.asset.name}</div>- <div id="created"><or-translate value="createdOn" .options="${{date: new Date(this.asset!.createdOn!)} as i18next.TOptions<i18next.InitOptions>}"></or-translate></div>+ <div id="created" class="mobileHidden"><or-translate value="createdOn" .options="${{date: new Date(this.asset!.createdOn!)} as i18next.TOptions<i18next.InitOptions>}"></or-translate></div></div><div id="container" style="${this._viewerConfig.viewerStyles ? styleMap(this._viewerConfig.viewerStyles) : ""}">${html`${Object.entries(this._viewerConfig.panels).map(([name, panelConfig]) => {@@ -246,6 +229,35 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemsuper.assetIds = undefined;}}++ this.onCompleted().then(() => {+ this.generateGrid();+ });++ }++ async onCompleted() {+ await this.updateComplete;+ }++ generateGrid(){+ if(this.shadowRoot) {+ const grid = this.shadowRoot.querySelector('#container');+ if(grid){+ const rowHeight = parseInt(window.getComputedStyle(grid).getPropertyValue('grid-auto-rows'));+ const rowGap = parseInt(window.getComputedStyle(grid).getPropertyValue('grid-row-gap'));+ const items = this.shadowRoot.querySelectorAll('.panel');+ if(items){+ items.forEach((item) => {+ const content = item.querySelector('.panel-content-wrapper');+ if(content) {+ const rowSpan = Math.ceil((content.getBoundingClientRect().height + rowGap) / (rowHeight + rowGap));+ (item as HTMLElement).style.gridRowEnd = "span "+rowSpan;+ }+ });+ }+ }+ }}public static getInfoProperties(config?: PanelConfig): string[] {@@ -265,24 +277,17 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemreturn;}+return html`<div class=${classMap({"panel": true, mobileHidden: panelConfig.hideOnMobile === true})} id="${name}-panel" style="${panelConfig && panelConfig.panelStyles ? styleMap(panelConfig.panelStyles) : ""}">- <div class="panel-title">- <or-translate value="${name}"></or-translate>- </div>- ${!panelConfig || panelConfig.scrollable === undefined || panelConfig.scrollable ? html`- <or-panel class="panel-content-wrapper">- <div class="panel-content">- ${content}- </div>- </or-panel>- `: html`- <div class="panel-content-wrapper">- <div class="panel-content">- ${content}- </div>+ <div class="panel-content-wrapper">+ <div class="panel-title">+ <or-translate value="${name}"></or-translate>+ </div>+ <div class="panel-content">+ ${content}</div>- `}+ </div></div>`;}@@ -346,38 +351,10 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem};content = html`- <style>- #history-container {- height: 100%;- width: 100%;- display: flex;- flex-direction: column;- position: relative;- }-- #history-controls {- flex: 0;- margin-bottom: 10px;- position: absolute;- }-- #history-attribute-picker {- flex: 0;- width: 200px;- }-- or-attribute-history {- height: 100%;- flex: 1 1 auto;- --or-attribute-history-controls-margin: 0 0 0 204px;- }- </style>- <div id="history-container">- <div id="history-controls">- <or-input id="history-attribute-picker" .label="${i18next.t("attribute")}" @or-input-changed="${(evt: OrInputChangedEvent) => attributeChanged(evt.detail.value)}" .type="${InputType.SELECT}" .options="${historyAttrs.map((attr) => [attr.name, getAttributeLabel(attr, undefined)])}"></or-input>- </div>- <or-attribute-history id="attribute-history" .config="${viewerConfig.historyConfig}" .assetType="${asset.type}"></or-attribute-history>- </div>+ <div id="history-controls">+ <or-input id="history-attribute-picker" .label="${i18next.t("attribute")}" @or-input-changed="${(evt: OrInputChangedEvent) => attributeChanged(evt.detail.value)}" .type="${InputType.SELECT}" .options="${historyAttrs.map((attr) => [attr.name, getAttributeLabel(attr, undefined)])}"></or-input>+ </div>+ <or-attribute-history id="attribute-history" .config="${viewerConfig.historyConfig}" .assetType="${asset.type}"></or-attribute-history>`;}} else if (panelConfig && panelConfig.type === "location") {@@ -391,30 +368,20 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemcontent = html`<style>- #location-container {- height: 100%;- width: 100%;- display: flex;- flex-direction: column;- padding-top: 10px;- }- #location-container > or-map {- flex: 1;+ or-map {border: #e5e5e5 1px solid;}+#location-map-input {- flex: 0 0 auto;padding: 20px 0 0 0;}</style>- <div id="location-container">- <or-map id="location-map" class="or-map" .center="${center}" type="${mapType}">- <or-map-marker-asset active .asset="${asset}"></or-map-marker-asset>- </or-map>- ${attribute.name === AttributeType.LOCATION.attributeName ? html`- <or-input id="location-map-input" type="${InputType.SWITCH}" readonly dense .value="${showOnMapMeta ? showOnMapMeta.value : undefined}" label="${i18next.t("showOnMap")}"></or-input>- ` : ``}- </div>+ <or-map id="location-map" class="or-map" .center="${center}" type="${mapType}">+ <or-map-marker-asset active .asset="${asset}"></or-map-marker-asset>+ </or-map>+ ${attribute.name === AttributeType.LOCATION.attributeName ? html`+ <or-input id="location-map-input" type="${InputType.SWITCH}" readonly dense .value="${showOnMapMeta ? showOnMapMeta.value : undefined}" label="${i18next.t("showOnMap")}"></or-input>+ ` : ``}`;}} else {diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.tsindex 2e2b65821..f57d73e9b 100644--- a/ui/component/or-asset-viewer/src/style.ts+++ b/ui/component/or-asset-viewer/src/style.ts@@ -27,16 +27,18 @@ export const style = css`width: 100%;display: flex;flex-direction: column;++ overflow: auto;}#container {box-sizing: border-box;- padding: 20px 30px;- column-gap: var(--internal-or-asset-viewer-panel-margin);- row-gap: var(--internal-or-asset-viewer-panel-margin);- flex: 1 1 auto;display: grid;- width: 100%;+ padding: 30px 20px;+ grid-gap: 10px;+ grid-template-columns: repeat(auto-fill, minmax(calc(50% - 5px),1fr));+ grid-auto-rows: 20px;+-webkit-animation: fadein 0.3s; /* Safari, Chrome and Opera > 12.1 */-moz-animation: fadein 0.3s; /* Firefox < 16 */-ms-animation: fadein 0.3s; /* Internet Explorer */@@ -98,18 +100,13 @@ export const style = css`}.panel {- display: flex;- flex-direction: column;- background-color: var(--internal-or-asset-viewer-panel-color);- margin: 0;- padding: var(--internal-or-asset-viewer-panel-padding);+ background-color: var(--internal-or-asset-viewer-panel-color);border: 1px solid #e5e5e5;border-radius: 5px;}.panel-content-wrapper {- flex: 1;- height: 100%;+ padding: var(--internal-or-asset-viewer-panel-padding);}.panel-content {@@ -150,6 +147,7 @@ export const style = css`display: none;cursor: pointer;}+@media screen and (max-width: 769px) {.back-navigation {display: block;@@ -159,7 +157,6 @@ export const style = css`display: none;}- .panel,#asset-header {grid-area: auto!important;}@@ -169,7 +166,6 @@ export const style = css`}.panel {- padding: 16px;border-radius: 0;border-right: none;border-left: none;diff --git a/ui/component/or-map/src/style.ts b/ui/component/or-map/src/style.tsindex 276384db4..8e63cbd8a 100644--- a/ui/component/or-map/src/style.ts+++ b/ui/component/or-map/src/style.ts@@ -7,6 +7,8 @@ export const markerActiveColorVar = "--internal-or-map-marker-active-color";// language=CSSexport const style = css`:host {+ --internal-or-map-width: var(--or-map-width, 100%);+ --internal-or-map-min-height: var(--or-map-min-height, 300px);--internal-or-map-marker-transform: var(--or-map-marker-transform, translate(-16px, -29px));--internal-or-map-marker-width: var(--or-map-marker-width, 32px);--internal-or-map-marker-height: var(--or-map-marker-height, 32px);@@ -29,6 +31,9 @@ export const style = css`--internal-or-map-marker-icon-active-transform: var(--or-map-marker-icon-active-transform, translate(-50%, -20px));display: block;overflow: hidden;++ min-height: var(--internal-or-map-min-height);+ width: var(--internal-or-map-width);}:host([hidden]) {