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: or-header bug fixes (#219)
Rich Turnerc0a64310215f
diff --git a/ui/app/or-app/src/or-header.ts b/ui/app/or-app/src/or-header.tsindex 9607eb057..4ce389cc6 100644--- a/ui/app/or-app/src/or-header.ts+++ b/ui/app/or-app/src/or-header.ts@@ -13,7 +13,6 @@ import "@openremote/or-mwc-components/dist/or-mwc-dialog";import "@openremote/or-icon";import {getContentWithMenuTemplate, MenuItem} from "@openremote/or-mwc-components/dist/or-mwc-menu";import {Tenant} from "@openremote/model";-import {router} from "./index";export interface HeaderConfig {mainMenu: HeaderItem[];@@ -85,6 +84,7 @@ class OrHeader extends LitElement {--internal-or-header-drawer-separator-color: var(--or-header-drawer-separator-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));display: block;+ z-index: 99999;}#toolbar-top {@@ -122,16 +122,12 @@ class OrHeader extends LitElement {}#drawer {- z-index: 999999;+ width: 100%;position: absolute;top: var(--internal-or-header-height);- width: 100%;+ max-height: 0;height: calc(100% - var(--internal-or-header-height));- transition: all 300ms ease-in;- transition-property: -webkit-transform;- transition-property: transform;- -webkit-transform: translate3d(0, -100%, 0);- transform: translate3d(0, -100%, 0);+ transition: max-height 0.25s ease-out;background: var(--internal-or-header-drawer-color);color: var(--internal-or-header-drawer-text-color);--or-icon-fill: var(--internal-or-header-drawer-text-color);@@ -140,8 +136,8 @@ class OrHeader extends LitElement {}#drawer[opened] {- -webkit-transform: translate3d(0, 0, 0);- transform: translate3d(0, 0, 0);+ max-height: 10000px;+ transition: max-height 0.75s ease-in;}#drawer > div {@@ -234,8 +230,6 @@ class OrHeader extends LitElement {/* Wide layout: when the viewport width is bigger than 780px, layoutchanges to a wide layout. */--@media (min-width: 780px) {#menu-btn-desktop {display: block;@@ -257,7 +251,7 @@ class OrHeader extends LitElement {display: inline-block;}- #desktop-left .menu-item or-icon{+ #desktop-left .menu-item or-icon {display: none;}@@ -265,9 +259,7 @@ class OrHeader extends LitElement {border-bottom: 4px solid var(--internal-or-header-selected-color);line-height: calc(var(--internal-or-header-height) - 4px);}- }-- @media (min-width: 1024px) {+#logo {margin: var(--internal-or-header-logo-margin);height: var(--internal-or-header-logo-height);@@ -277,10 +269,23 @@ class OrHeader extends LitElement {#logo-mobile {display: none;}-- #desktop-left .menu-item or-icon{++ #drawer {+ display: none;+ }++ #desktop-right {+ display: block;+ }++ #desktop-left ::slotted(*) {display: inline-block;}++ #desktop-left ::slotted(*[selected]) {+ border-bottom: 4px solid var(--internal-or-header-selected-color);+ line-height: calc(var(--internal-or-header-height) - 4px);+ }}`;}diff --git a/ui/app/or-app/src/pages/page-assets.ts b/ui/app/or-app/src/pages/page-assets.tsindex 3cc11ba37..3fb262d25 100644--- a/ui/app/or-app/src/pages/page-assets.ts+++ b/ui/app/or-app/src/pages/page-assets.ts@@ -33,292 +33,7 @@ export const PAGE_ASSETS_DEFAULT_CONFIG: PageAssetsConfig = {historyConfig: {table: {attributeNames: {- // TODO: These need to move to custom project- // "gunshotEvent": {- // columns: [- // {- // header: "area",- // type: "prop",- // path: "$.content.area",- // styles: {- // width: "20%"- // }- // },- // {- // header: "location",- // type: "prop",- // path: "$.content.triggers[0].position.coordinates",- // styles: {- // width: "30%"- // },- // contentProvider: (datapoint, value, config) => {- // if (Array.isArray(value)) {- // return "[" + Number(value[0]).toLocaleString(undefined, {- // minimumFractionDigits: 5,- // maximumFractionDigits: 5- // }) + ", " + Number(value[1]).toLocaleString(undefined, {- // minimumFractionDigits: 5,- // maximumFractionDigits: 5- // }) + "]"- // }- // }- // },- // {- // header: "intensity",- // type: "prop",- // path: "$.content.triggers[0].intensity",- // styles: {- // width: "25%"- // },- // contentProvider: (datapoint, value, config) => {- // return Number(value).toLocaleString(undefined, {maximumFractionDigits: 0})- // }- // },- // {- // header: "timestamp",- // type: "prop",- // path: "$.content.time",- // styles: {- // width: "25%"- // },- // contentProvider: (datapoint, value, config) => {- // if (value) {- // return moment(value).format("L HH:mm:ss");- // }- // }- // }- // ]- // },- // "aggressionEvent": {- // columns: [- // {- // header: "area",- // type: "prop",- // path: "$.content.area",- // styles: {- // width: "20%"- // }- // },- // {- // header: "location",- // type: "prop",- // path: "$.content.triggers[0].position.coordinates",- // styles: {- // width: "30%"- // },- // contentProvider: (datapoint, value, config) => {- // if (Array.isArray(value)) {- // return "[" + Number(value[0]).toLocaleString(undefined, {- // minimumFractionDigits: 5,- // maximumFractionDigits: 5- // }) + ", " + Number(value[1]).toLocaleString(undefined, {- // minimumFractionDigits: 5,- // maximumFractionDigits: 5- // }) + "]"- // }- // }- // },- // {- // header: "intensity",- // type: "prop",- // path: "$.content.triggers[0].intensity",- // styles: {- // width: "25%"- // },- // contentProvider: (datapoint, value, config) => {- // return Number(value).toLocaleString(undefined, {maximumFractionDigits: 0})- // }- // },- // {- // header: "timestamp",- // type: "prop",- // path: "$.content.time",- // styles: {- // width: "25%"- // },- // contentProvider: (datapoint, value, config) => {- // if (value) {- // return moment(value).format("L HH:mm:ss");- // }- // }- // }- // ]- // },- // "alarmEvent": {- // columns: [- // {- // header: "area",- // type: "prop",- // path: "$.content.area",- // styles: {- // width: "20%"- // }- // },- // {- // header: "location",- // type: "prop",- // path: "$.content.triggers[0].position.coordinates",- // styles: {- // width: "30%"- // },- // contentProvider: (datapoint, value, config) => {- // if (Array.isArray(value)) {- // return "[" + Number(value[0]).toLocaleString(undefined, {- // minimumFractionDigits: 5,- // maximumFractionDigits: 5- // }) + ", " + Number(value[1]).toLocaleString(undefined, {- // minimumFractionDigits: 5,- // maximumFractionDigits: 5- // }) + "]"- // }- // }- // },- // {- // header: "intensity",- // type: "prop",- // path: "$.content.triggers[0].intensity",- // styles: {- // width: "25%"- // },- // contentProvider: (datapoint, value, config) => {- // return Number(value).toLocaleString(undefined, {maximumFractionDigits: 0})- // }- // },- // {- // header: "timestamp",- // type: "prop",- // path: "$.content.time",- // styles: {- // width: "25%"- // },- // contentProvider: (datapoint, value, config) => {- // if (value) {- // return moment(value).format("L HH:mm:ss");- // }- // }- // }- // ]- // },- // "intensityEvent": {- // columns: [- // {- // header: "area",- // type: "prop",- // path: "$.content.area",- // styles: {- // width: "20%"- // }- // },- // {- // header: "location",- // type: "prop",- // path: "$.content.triggers[0].position.coordinates",- // styles: {- // width: "30%"- // },- // contentProvider: (datapoint, value, config) => {- // if (Array.isArray(value)) {- // return "[" + Number(value[0]).toLocaleString(undefined, {- // minimumFractionDigits: 5,- // maximumFractionDigits: 5- // }) + ", " + Number(value[1]).toLocaleString(undefined, {- // minimumFractionDigits: 5,- // maximumFractionDigits: 5- // }) + "]"- // }- // }- // },- // {- // header: "intensity",- // type: "prop",- // path: "$.content.triggers[0].intensity",- // styles: {- // width: "25%"- // },- // contentProvider: (datapoint, value, config) => {- // return Number(value).toLocaleString(undefined, {maximumFractionDigits: 0})- // }- // },- // {- // header: "timestamp",- // type: "prop",- // path: "$.content.time",- // styles: {- // width: "25%"- // },- // contentProvider: (datapoint, value, config) => {- // if (value) {- // return moment(value).format("L HH:mm:ss");- // }- // }- // }- // ]- // },- // "breakingGlassEvent": {- // columns: [- // {- // header: "area",- // type: "prop",- // path: "$.content.area",- // styles: {- // width: "20%"- // }- // },- // {- // header: "location",- // type: "prop",- // path: "$.content.triggers[0].position.coordinates",- // styles: {- // width: "30%"- // },- // contentProvider: (datapoint, value, config) => {- // if (Array.isArray(value)) {- // return "[" + Number(value[0]).toLocaleString(undefined, {- // minimumFractionDigits: 5,- // maximumFractionDigits: 5- // }) + ", " + Number(value[1]).toLocaleString(undefined, {- // minimumFractionDigits: 5,- // maximumFractionDigits: 5- // }) + "]"- // }- // }- // },- // {- // header: "intensity",- // type: "prop",- // path: "$.content.triggers[0].intensity",- // styles: {- // width: "25%"- // },- // contentProvider: (datapoint, value, config) => {- // return Number(value).toLocaleString(undefined, {maximumFractionDigits: 0})- // }- // },- // {- // header: "timestamp",- // type: "prop",- // path: "$.content.time",- // styles: {- // width: "25%"- // },- // contentProvider: (datapoint, value, config) => {- // if (value) {- // return moment(value).format("L HH:mm:ss");- // }- // }- // }- // ]- // }- }- }- },- default: {- panels: {- "attributes": {- exclude: ["location", "userNotes", "manufacturer", "model", "status"]- },- "info": {- exclude: ["accessPublicRead"]+}}},@@ -352,97 +67,97 @@ export const PAGE_ASSETS_DEFAULT_CONFIG: PageAssetsConfig = {// }// }// },- "urn:openremote:asset:residence": {- panels: {- "attributes": {- exclude: [- "dayScene",- "daySceneEnabledFRIDAY",- "daySceneEnabledMONDAY",- "daySceneEnabledTUESDAY",- "daySceneEnabledWEDNESDAY",- "daySceneEnabledTHURSDAY",- "daySceneEnabledSATURDAY",- "daySceneEnabledSUNDAY",- "daySceneTimeFRIDAY",- "daySceneTimeMONDAY",- "daySceneTimeTUESDAY",- "daySceneTimeWEDNESDAY",- "daySceneTimeTHURSDAY",- "daySceneTimeSATURDAY",- "daySceneTimeSUNDAY",- "disableSceneTimer",- "enableSceneTimer",- "eveningScene",- "dayScene",- "eveningSceneEnabledFRIDAY",- "eveningSceneEnabledMONDAY",- "eveningSceneEnabledTUESDAY",- "eveningSceneEnabledWEDNESDAY",- "eveningSceneEnabledTHURSDAY",- "eveningSceneEnabledSATURDAY",- "eveningSceneEnabledSUNDAY",- "eveningSceneTimeFRIDAY",- "eveningSceneTimeMONDAY",- "eveningSceneTimeTUESDAY",- "eveningSceneTimeWEDNESDAY",- "eveningSceneTimeTHURSDAY",- "eveningSceneTimeSATURDAY",- "eveningSceneTimeSUNDAY",- "morningScene",- "nightscene",- "morningSceneEnabledFRIDAY",- "morningSceneEnabledMONDAY",- "morningSceneEnabledTUESDAY",- "morningSceneEnabledWEDNESDAY",- "morningSceneEnabledTHURSDAY",- "morningSceneEnabledSATURDAY",- "morningSceneEnabledSUNDAY",- "morningSceneTimeFRIDAY",- "morningSceneTimeMONDAY",- "morningSceneTimeTUESDAY",- "morningSceneTimeWEDNESDAY",- "morningSceneTimeTHURSDAY",- "morningSceneTimeSATURDAY",- "morningSceneTimeSUNDAY",- "nightSceneEnabledFRIDAY",- "nightSceneEnabledMONDAY",- "nightSceneEnabledTUESDAY",- "nightSceneEnabledWEDNESDAY",- "nightSceneEnabledTHURSDAY",- "nightSceneEnabledSATURDAY",- "nightSceneEnabledSUNDAY",- "nightSceneTimeFRIDAY",- "nightSceneTimeMONDAY",- "nightSceneTimeTUESDAY",- "nightSceneTimeWEDNESDAY",- "nightSceneTimeTHURSDAY",- "nightSceneTimeSATURDAY",- "nightSceneTimeSUNDAY",- "vacationUntil",- "ventilationLevel",- "location",- "firstPresenceDetected",- "lastPresenceDetected",- "smartSwitchStartTimeA",- "smartSwitchStartTimeB",- "smartSwitchStartTimeC",- "smartSwitchEnabledA",- "smartSwitchEnabledB",- "smartSwitchEnabledC",- "smartSwitchStopTimeA",- "smartSwitchStopTimeB",- "smartSwitchStopTimeC",- "smartSwitchBeginEndA",- "smartSwitchBeginEndB",- "smartSwitchBeginEndC",- "smartSwitchModeA",- "smartSwitchModeB",- "smartSwitchModeC"- ]- }- }- }+ // "urn:openremote:asset:residence": {+ // panels: {+ // "attributes": {+ // exclude: [+ // "dayScene",+ // "daySceneEnabledFRIDAY",+ // "daySceneEnabledMONDAY",+ // "daySceneEnabledTUESDAY",+ // "daySceneEnabledWEDNESDAY",+ // "daySceneEnabledTHURSDAY",+ // "daySceneEnabledSATURDAY",+ // "daySceneEnabledSUNDAY",+ // "daySceneTimeFRIDAY",+ // "daySceneTimeMONDAY",+ // "daySceneTimeTUESDAY",+ // "daySceneTimeWEDNESDAY",+ // "daySceneTimeTHURSDAY",+ // "daySceneTimeSATURDAY",+ // "daySceneTimeSUNDAY",+ // "disableSceneTimer",+ // "enableSceneTimer",+ // "eveningScene",+ // "dayScene",+ // "eveningSceneEnabledFRIDAY",+ // "eveningSceneEnabledMONDAY",+ // "eveningSceneEnabledTUESDAY",+ // "eveningSceneEnabledWEDNESDAY",+ // "eveningSceneEnabledTHURSDAY",+ // "eveningSceneEnabledSATURDAY",+ // "eveningSceneEnabledSUNDAY",+ // "eveningSceneTimeFRIDAY",+ // "eveningSceneTimeMONDAY",+ // "eveningSceneTimeTUESDAY",+ // "eveningSceneTimeWEDNESDAY",+ // "eveningSceneTimeTHURSDAY",+ // "eveningSceneTimeSATURDAY",+ // "eveningSceneTimeSUNDAY",+ // "morningScene",+ // "nightscene",+ // "morningSceneEnabledFRIDAY",+ // "morningSceneEnabledMONDAY",+ // "morningSceneEnabledTUESDAY",+ // "morningSceneEnabledWEDNESDAY",+ // "morningSceneEnabledTHURSDAY",+ // "morningSceneEnabledSATURDAY",+ // "morningSceneEnabledSUNDAY",+ // "morningSceneTimeFRIDAY",+ // "morningSceneTimeMONDAY",+ // "morningSceneTimeTUESDAY",+ // "morningSceneTimeWEDNESDAY",+ // "morningSceneTimeTHURSDAY",+ // "morningSceneTimeSATURDAY",+ // "morningSceneTimeSUNDAY",+ // "nightSceneEnabledFRIDAY",+ // "nightSceneEnabledMONDAY",+ // "nightSceneEnabledTUESDAY",+ // "nightSceneEnabledWEDNESDAY",+ // "nightSceneEnabledTHURSDAY",+ // "nightSceneEnabledSATURDAY",+ // "nightSceneEnabledSUNDAY",+ // "nightSceneTimeFRIDAY",+ // "nightSceneTimeMONDAY",+ // "nightSceneTimeTUESDAY",+ // "nightSceneTimeWEDNESDAY",+ // "nightSceneTimeTHURSDAY",+ // "nightSceneTimeSATURDAY",+ // "nightSceneTimeSUNDAY",+ // "vacationUntil",+ // "ventilationLevel",+ // "location",+ // "firstPresenceDetected",+ // "lastPresenceDetected",+ // "smartSwitchStartTimeA",+ // "smartSwitchStartTimeB",+ // "smartSwitchStartTimeC",+ // "smartSwitchEnabledA",+ // "smartSwitchEnabledB",+ // "smartSwitchEnabledC",+ // "smartSwitchStopTimeA",+ // "smartSwitchStopTimeB",+ // "smartSwitchStopTimeC",+ // "smartSwitchBeginEndA",+ // "smartSwitchBeginEndB",+ // "smartSwitchBeginEndC",+ // "smartSwitchModeA",+ // "smartSwitchModeB",+ // "smartSwitchModeC"+ // ]+ // }+ // }+ // }}}};