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
Styling update of asset edit, users, roles, realms, mobile drawer. Demo provisioning update.
Dondd3a0b891a59
diff --git a/deployment/manager/app/logo.png b/deployment/manager/app/logo.pngindex 96a8d549f..2179b259d 100644Binary files a/deployment/manager/app/logo.png and b/deployment/manager/app/logo.png differdiff --git a/deployment/manager/provisioning/assets/windturbine.json b/deployment/manager/provisioning/assets/windturbine.jsondeleted file mode 100644index d8bf87230..000000000--- a/deployment/manager/provisioning/assets/windturbine.json+++ /dev/null@@ -1,45 +0,0 @@-{- "name": "Wind Turbine",- "accessPublicRead": false,- "realm": "smartcity",- "type": "ElectricityProducerWindAsset",- "attributes": {- "notes": {- "name": "notes",- "type": "text"- },- "windSpeedMin": {- "name": "windSpeedMin",- "type": "positiveNumber",- "value": "10"- },- "windSpeedReference": {- "name": "windSpeedReference",- "type": "positiveNumber"- },- "powerExportMax": {- "name": "powerExportMax",- "type": "positiveNumber",- "value": "45.5"- },- "energyExportTotal": {- "name": "energyExportTotal",- "type": "positiveNumber"- },- "power": {- "name": "power",- "type": "number"- },- "location": {- "name": "location",- "type": "geoJSONPoint",- "value": {- "type": "Point",- "coordinates": [- 4.488424,- 51.906477- ]- }- }- }-}diff --git a/deployment/src/main/java/org/openremote/demo/setup/ManagerDemoSetup.java b/deployment/src/main/java/org/openremote/demo/setup/ManagerDemoSetup.javaindex 40d0badbe..f19ac9b32 100644--- a/deployment/src/main/java/org/openremote/demo/setup/ManagerDemoSetup.java+++ b/deployment/src/main/java/org/openremote/demo/setup/ManagerDemoSetup.java@@ -199,21 +199,21 @@ public class ManagerDemoSetup extends ManagerSetup {new SimulatorReplayDatapoint(midnight.plusHours(4).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(5).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 0),- new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 1),- new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 10),- new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 15),- new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 39),- new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 52),- new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 50),- new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 48),- new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 36),- new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 23),- new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 24),- new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 18),- new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 10),- new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 8),- new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 3),- new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 1),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), -1),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), -10),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), -15),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), -39),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), -52),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), -50),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), -48),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), -36),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), -23),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), -24),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), -18),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), -10),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), -8),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), -3),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), -1),new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 0)}@@ -301,21 +301,21 @@ public class ManagerDemoSetup extends ManagerSetup {new SimulatorReplayDatapoint(midnight.plusHours(4).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(5).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 0),- new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 1),- new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 2),- new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 3),- new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 8),- new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 14),- new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 12),- new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 10),- new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 7),- new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 5),- new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 7),- new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 5),- new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 3),- new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 2),- new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 1),- new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 1),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), -1),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), -2),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), -3),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), -8),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), -14),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), -12),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), -10),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), -7),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), -5),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), -7),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), -5),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), -3),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), -2),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), -1),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), -1),new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 0)}@@ -364,20 +364,20 @@ public class ManagerDemoSetup extends ManagerSetup {new SimulatorReplayDatapoint(midnight.plusHours(5).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 0),- new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 2),- new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 6),- new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 10),- new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 13),- new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 21),- new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 14),- new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 17),- new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 10),- new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 9),- new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 7),- new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 5),- new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 4),- new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 2),- new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 1),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), -2),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), -6),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), -10),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), -13),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), -21),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), -14),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), -17),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), -10),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), -9),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), -7),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), -5),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), -4),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), -2),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), -1),new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 0)}@@ -678,20 +678,20 @@ public class ManagerDemoSetup extends ManagerSetup {new SimulatorReplayDatapoint(midnight.plusHours(4).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(5).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 0),- new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 1),- new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 3),- new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 8),- new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 30),- new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 44),- new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 42),- new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 41),- new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 29),- new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 19),- new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 16),- new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 11),- new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 4),- new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 3),- new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), -1),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), -3),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), -8),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), -30),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), -44),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), -42),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), -41),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), -29),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), -19),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), -16),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), -11),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), -4),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), -3),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), -2),new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 0),new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 0)diff --git a/manager/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.json b/manager/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.jsonindex 0656b4fda..878497ca8 100644--- a/manager/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.json+++ b/manager/src/main/resources/demo/rules/smartcity/RotterdamBatteryUse.json@@ -25,8 +25,8 @@},"value": {"predicateType": "number",- "operator": "GREATER_THAN",- "value": 0+ "operator": "LESS_THAN",+ "value": -25}}]@@ -49,11 +49,11 @@"6bzhox7vxOKpKQ5yX5Ysoh"],"types": [- "ElectricityStorageAsset"+ "ElectricityBatteryAsset"]}},- "value": 18,+ "value": 25,"attributeName": "powerSetpoint"}],diff --git a/manager/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flow b/manager/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flowindex c5467498a..367a11964 100644--- a/manager/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flow+++ b/manager/src/main/resources/demo/rules/smartcity/RotterdamPowerBalance.flow@@ -1,159 +1,167 @@{- "name": "De Rotterdam: Power balance",- "description": null,- "connections": [- {- "from": "LvwzHkg9-A",- "to": "UPfbBoj2TB"- },- {- "from": "mtdBqMHEXV",- "to": "h2vtCkVJvU"- },- {- "from": "Xwu7VfgQwS",- "to": "Ni1QTWS6Cr"- }- ],- "nodes": [- {- "inputs": [],- "internals": [- {- "name": "Attribute",- "picker": {- "type": "ASSET_ATTRIBUTE"- },- "value": {- "assetId": "6DW7WWYVtOybr7W1BWREc3",- "attributeName": "power"- }- }- ],- "name": "READ_ATTRIBUTE",- "outputs": [- {- "name": "value",- "type": "NUMBER",- "nodeId": "sroPWsTkE",- "id": "LvwzHkg9-A"- }- ],- "type": "INPUT",- "position": {- "x": -689.5,- "y": -341.5- },- "size": {- "x": 194.563,- "y": 65- },- "id": "sroPWsTkE"- },- {- "inputs": [],- "internals": [- {- "name": "Attribute",- "picker": {- "type": "ASSET_ATTRIBUTE"- },- "value": {- "assetId": "3Mj9yiC6bcH4MoIYDY2T35",- "attributeName": "power"- }- }- ],- "name": "READ_ATTRIBUTE",- "outputs": [- {- "name": "value",- "type": "NUMBER",- "nodeId": "f4jr9m-j7",- "id": "mtdBqMHEXV"- }- ],- "type": "INPUT",- "position": {- "x": -687.5,- "y": -165.5- },- "size": {- "x": 257.781,- "y": 65- },- "id": "f4jr9m-j7"- },- {- "inputs": [- {- "name": "a",- "type": "NUMBER",- "nodeId": "9b8ReH1cB",- "id": "UPfbBoj2TB"- },- {- "name": "b",- "type": "NUMBER",- "nodeId": "9b8ReH1cB",- "id": "h2vtCkVJvU"- }- ],- "internals": [],- "name": "SUBTRACT_OPERATOR",- "displayCharacter": "-",- "outputs": [- {- "name": "c",- "type": "NUMBER",- "nodeId": "9b8ReH1cB",- "id": "Xwu7VfgQwS"- }- ],- "type": "PROCESSOR",- "position": {- "x": -187.5,- "y": -233.5- },- "size": {- "x": 0,- "y": 0- },- "id": "9b8ReH1cB"- },- {- "inputs": [- {- "name": "value",- "type": "NUMBER",- "nodeId": "pR1MxgR1S",- "id": "Ni1QTWS6Cr"- }- ],- "internals": [- {- "name": "Attribute",- "picker": {- "type": "ASSET_ATTRIBUTE"- },- "value": {- "assetId": "2wzKB2j39144oTzAJnHpfs",- "attributeName": "powerBalance"- }- }- ],- "name": "WRITE_ATTRIBUTE",- "outputs": [],- "type": "OUTPUT",- "position": {- "x": 25.9921875,- "y": -245.5- },- "size": {- "x": 242,- "y": 65- },- "id": "pR1MxgR1S"- }- ]+"name": "De Rotterdam: Power balance",+"description": "",+ "connections": [+ {+ "from": "mtdBqMHEXV",+ "to": "HdQFYHsvcv"+ },+ {+ "from": "LvwzHkg9-A",+ "to": "q-nDnOD6dF"+ },+ {+ "from": "NsjVJrTtFW",+ "to": "Ni1QTWS6Cr"+ }+ ],+ "nodes": [+ {+ "inputs": [++ ],+ "internals": [+ {+ "name": "Attribute",+ "picker": {+ "type": "ASSET_ATTRIBUTE"+ },+ "value": {+ "assetId": "6DW7WWYVtOybr7W1BWREc3",+ "attributeName": "power"+ }+ }+ ],+ "name": "READ_ATTRIBUTE",+ "outputs": [+ {+ "name": "value",+ "type": "NUMBER",+ "nodeId": "sroPWsTkE",+ "id": "LvwzHkg9-A"+ }+ ],+ "type": "INPUT",+ "position": {+ "x": -689.5,+ "y": -341.5+ },+ "size": {+ "x": 193.766,+ "y": 65+ },+ "id": "sroPWsTkE"+ },+ {+ "inputs": [++ ],+ "internals": [+ {+ "name": "Attribute",+ "picker": {+ "type": "ASSET_ATTRIBUTE"+ },+ "value": {+ "assetId": "3Mj9yiC6bcH4MoIYDY2T35",+ "attributeName": "power"+ }+ }+ ],+ "name": "READ_ATTRIBUTE",+ "outputs": [+ {+ "name": "value",+ "type": "NUMBER",+ "nodeId": "f4jr9m-j7",+ "id": "mtdBqMHEXV"+ }+ ],+ "type": "INPUT",+ "position": {+ "x": -687.5,+ "y": -165.5+ },+ "size": {+ "x": 256.844,+ "y": 65+ },+ "id": "f4jr9m-j7"+ },+ {+ "inputs": [+ {+ "name": "value",+ "type": "NUMBER",+ "nodeId": "pR1MxgR1S",+ "id": "Ni1QTWS6Cr"+ }+ ],+ "internals": [+ {+ "name": "Attribute",+ "picker": {+ "type": "ASSET_ATTRIBUTE"+ },+ "value": {+ "assetId": "2wzKB2j39144oTzAJnHpfs",+ "attributeName": "powerBalance"+ }+ }+ ],+ "name": "WRITE_ATTRIBUTE",+ "outputs": [++ ],+ "type": "OUTPUT",+ "position": {+ "x": 25.9921875,+ "y": -245.5+ },+ "size": {+ "x": 139.453,+ "y": 65+ },+ "id": "pR1MxgR1S"+ },+ {+ "inputs": [+ {+ "name": "a",+ "type": "NUMBER",+ "nodeId": "WdW_DByTa",+ "id": "q-nDnOD6dF"+ },+ {+ "name": "b",+ "type": "NUMBER",+ "nodeId": "WdW_DByTa",+ "id": "HdQFYHsvcv"+ }+ ],+ "internals": [++ ],+ "name": "ADD_OPERATOR",+ "displayCharacter": "+",+ "outputs": [+ {+ "name": "c",+ "type": "NUMBER",+ "nodeId": "WdW_DByTa",+ "id": "NsjVJrTtFW"+ }+ ],+ "type": "PROCESSOR",+ "position": {+ "x": -187.5,+ "y": -197.5+ },+ "size": {+ "x": 0,+ "y": 0+ },+ "id": "WdW_DByTa"+ }+ ]}diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.jsonindex 7c785d0ed..9e7c01c54 100644--- a/manager/src/web/shared/locales/en/or.json+++ b/manager/src/web/shared/locales/en/or.json@@ -398,5 +398,7 @@"daysOfTheWeek": "days of the week","dismiss": "dismiss","createAssetFailed": "Failed to create asset",- "logCategory": {}+ "logCategory": {},+ "readPermissions": "Read permissions",+ "writePermissions": "Write permissions"}diff --git a/manager/src/web/shared/locales/nl/or.json b/manager/src/web/shared/locales/nl/or.jsonindex 21fac6190..e4752d768 100644--- a/manager/src/web/shared/locales/nl/or.json+++ b/manager/src/web/shared/locales/nl/or.json@@ -353,5 +353,7 @@"validityRecurrence": "Herhaling plannen","activeFromTo": "Actief van {{start}} tot {{end}}","fromTo": "Van {{start}} tot {{end}}",- "fromToDays": "van {{start}} tot {{days}} dagen later {{end}}"+ "fromToDays": "van {{start}} tot {{days}} dagen later {{end}}",+ "readPermissions": "Leesrechten",+ "writePermissions": "Schrijfrechten"}diff --git a/ui/app/manager/src/headers.ts b/ui/app/manager/src/headers.tsindex 0b09a0fd4..3210a0f4c 100644--- a/ui/app/manager/src/headers.ts+++ b/ui/app/manager/src/headers.ts@@ -40,7 +40,7 @@ export function headerItemGatewayConnection<S extends AppStateKeyed, A extends Areturn {icon: "cloud",value: "gateway",- href: "#!gateway",+ href: "gateway",text: "gatewayConnection",roles: ["write:admin", "read:admin"]};@@ -108,7 +108,7 @@ export function headerItemRoles<S extends AppStateKeyed, A extends AnyAction>(or}export function headerItemRealms<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {return {- icon: "account-circle-outline",+ icon: "domain",value: "realms",href: "realms",text: "realm management",diff --git a/ui/app/manager/src/pages/page-gateway.ts b/ui/app/manager/src/pages/page-gateway.tsindex 33db4a1e3..656b1818a 100644--- a/ui/app/manager/src/pages/page-gateway.ts+++ b/ui/app/manager/src/pages/page-gateway.ts@@ -100,7 +100,6 @@ class PageGateway<S extends AppStateKeyed> extends Page<S> {or-panel {width: 100%;min-width: auto;- margin: 0;}#title {diff --git a/ui/app/manager/src/pages/page-insights.ts b/ui/app/manager/src/pages/page-insights.tsindex 660495fb1..5a51f5a4e 100644--- a/ui/app/manager/src/pages/page-insights.ts+++ b/ui/app/manager/src/pages/page-insights.ts@@ -50,6 +50,8 @@ class PageInsights<S extends AppStateKeyed> extends Page<S> {font-weight: bold;width: 100%;max-width: 1360px;+ align-items: center;+ display: flex;}or-data-viewer {@@ -61,6 +63,8 @@ class PageInsights<S extends AppStateKeyed> extends Page<S> {#title > or-icon {margin-right: 10px;margin-left: 14px;+ --or-icon-width: 20px;+ --or-icon-height: 20px;}@media only screen and (min-width: 768px){diff --git a/ui/app/manager/src/pages/page-realms.ts b/ui/app/manager/src/pages/page-realms.tsindex 95568389e..6506f4854 100644--- a/ui/app/manager/src/pages/page-realms.ts+++ b/ui/app/manager/src/pages/page-realms.ts@@ -7,7 +7,7 @@ import {TemplateResult,unsafeCSS,} from "lit-element";-import manager, { OREvent } from "@openremote/core";+import manager, { OREvent, DefaultColor3 } from "@openremote/core";import "@openremote/or-panel";import "@openremote/or-translate";import { EnhancedStore } from "@reduxjs/toolkit";@@ -54,6 +54,8 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {width: calc(100% - 40px);max-width: 1360px;margin: 20px auto;+ align-items: center;+ display: flex;}#title or-icon {@@ -64,7 +66,7 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {.panel {width: calc(100% - 90px);padding: 0 20px;- max-width: 1320px;+ max-width: 1310px;background-color: white;border: 1px solid #e5e5e5;border-radius: 5px;@@ -92,7 +94,7 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {}.mdc-data-table__row {- border-top-color: lightgrey;+ border-top-color: #D3D3D3;}td, th {@@ -109,12 +111,14 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {overflow: hidden;max-height: 0;transition: max-height 0.25s ease-out;- padding: 0 20px;+ padding-left: 16px;}or-input {margin-bottom: 10px;- margin-right: 20px;+ margin-right: 16px;+ margin-right: 2px;+ margin-left: -5px;}or-icon {@@ -139,7 +143,12 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {}.mdc-data-table__header-cell {- font-weight: bold;+ font-weight: bold;+ color: ${unsafeCSS(DefaultColor3)};+ }++ .mdc-data-table__header-cell:first-child {+ padding-left: 36px;}.padded-cell {@@ -162,12 +171,15 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {}.button {- cursor: pointer;- display: flex;- flex-direction: row;- align-content: center;- margin: 10px 15px;- align-items: center;+ cursor: pointer;+ display: flex;+ flex-direction: row;+ align-content: center;+ padding: 16px;+ align-items: center;+ font-size: 14px;+ text-transform: uppercase;+ color: var(--or-app-color4);}.button or-icon {@@ -187,7 +199,9 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {width: 100%;}.panel {- width: calc(100% - 40px);+ border-left: 0px;+ border-right: 0px;+ width: calc(100% - 48px);border-radius: 0;}.hide-mobile {@@ -313,7 +327,7 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {return html`<div id="wrapper"><div id="title">- <or-icon icon="account-box-multiple"></or-icon>${i18next.t(+ <or-icon icon="domain"></or-icon>${i18next.t("realm management")}</div>@@ -354,12 +368,11 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {<div class="row"><div class="column"><or-input ?readonly="${tenant.id}" .label="${i18next.t("realm")}" .type="${InputType.TEXT}" min="1" required .value="${tenant.realm}" @or-input-changed="${(e: OrInputChangedEvent) => tenant.realm = e.detail.value}"></or-input>+ <or-input ?readonly="${readonly}" .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" .value="${tenant.enabled}" @or-input-changed="${(e: OrInputChangedEvent) =>tenant.enabled = e.detail.value}}"></or-input></div><div class="column"><or-input .label="${i18next.t("displayName")}" .type="${InputType.TEXT}" min="1" required .value="${tenant.displayName}" @or-input-changed="${(e: OrInputChangedEvent) => tenant.displayName = e.detail.value}"></or-input></div>- <or-input ?readonly="${readonly}" .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" .value="${tenant.enabled}" @or-input-changed="${(e: OrInputChangedEvent) =>tenant.enabled = e.detail.value}}"></or-input>-</div>@@ -383,7 +396,7 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {${this._tenants.length > 0 && !!this._tenants[this._tenants.length -1].id && !readonly ? html`<tr class="mdc-data-table__row"><td colspan="100%">- <a class="button" @click="${() => this._tenants = [...this._tenants, {displayName:"", enabled: true}]}"><or-icon icon="plus"></or-icon><strong>${i18next.t("add")} ${i18next.t("realm")}</strong></a>+ <a class="button" @click="${() => this._tenants = [...this._tenants, {displayName:"", enabled: true}]}"><or-icon icon="plus"></or-icon>${i18next.t("add")} ${i18next.t("realm")}</a></td></tr>` : ``}diff --git a/ui/app/manager/src/pages/page-roles.ts b/ui/app/manager/src/pages/page-roles.tsindex 54e1a185b..fdbe55b58 100644--- a/ui/app/manager/src/pages/page-roles.ts+++ b/ui/app/manager/src/pages/page-roles.ts@@ -7,7 +7,7 @@ import {TemplateResult,unsafeCSS,} from "lit-element";-import manager, { OREvent } from "@openremote/core";+import manager, { OREvent, DefaultColor3 } from "@openremote/core";import "@openremote/or-panel";import "@openremote/or-translate";import { EnhancedStore } from "@reduxjs/toolkit";@@ -54,6 +54,8 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {width: calc(100% - 40px);max-width: 1360px;margin: 20px auto;+ align-items: center;+ display: flex;}#title or-icon {@@ -64,7 +66,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {.panel {width: calc(100% - 90px);padding: 0 20px;- max-width: 1320px;+ max-width: 1310px;background-color: white;border: 1px solid #e5e5e5;border-radius: 5px;@@ -92,7 +94,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {}.mdc-data-table__row {- border-top-color: lightgrey;+ border-top-color: #D3D3D3;}td, th {@@ -109,18 +111,20 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {overflow: hidden;max-height: 0;transition: max-height 0.25s ease-out;- padding: 0 20px;+ padding-left: 16px;}or-input {margin-bottom: 10px;- margin-right: 20px;+ margin-right: 16px;}or-icon {vertical-align: middle;--or-icon-width: 20px;--or-icon-height: 20px;+ margin-right: 2px;+ margin-left: -5px;}.row {@@ -135,16 +139,24 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {flex-direction: column;margin: 0px;flex: 1 1 0;-+ }++ .column-title {+ padding-bottom: 10px;}.mdc-data-table__header-cell {- font-weight: bold;+ font-weight: bold;+ color: ${unsafeCSS(DefaultColor3)};+ }++ .mdc-data-table__header-cell:first-child {+ padding-left: 36px;}.padded-cell {overflow-wrap: break-word;- word-wrap: break-word+ word-wrap: break-word;}.attribute-meta-row td {@@ -162,16 +174,20 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {}.button {- cursor: pointer;- display: flex;- flex-direction: row;- align-content: center;- margin: 10px 15px;- align-items: center;+ cursor: pointer;+ display: flex;+ flex-direction: row;+ align-content: center;+ padding: 16px;+ align-items: center;+ font-size: 14px;+ text-transform: uppercase;+ color: var(--or-app-color4);}.button or-icon {- --or-icon-fill: var(--or-app-color4);+ --or-icon-fill: var(--or-app-color4);+ margin-right: 5px;}@media screen and (max-width: 1024px){@@ -187,7 +203,9 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {width: 100%;}.panel {- width: calc(100% - 40px);+ border-left: 0px;+ border-right: 0px;+ width: calc(100% - 48px);border-radius: 0;}.hide-mobile {@@ -364,7 +382,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {<div class="row"><div class="column">- <or-input .label="${i18next.t("role")}" .type="${InputType.TEXT}" min="1" required .value="${role.name}" @or-input-changed="${(e: OrInputChangedEvent) => role.name = e.detail.value}"></or-input>+ <or-input .label="${i18next.t("user_role")}" .type="${InputType.TEXT}" min="1" required .value="${role.name}" @or-input-changed="${(e: OrInputChangedEvent) => role.name = e.detail.value}"></or-input></div><div class="column"><or-input .label="${i18next.t("description")}" .type="${InputType.TEXT}" min="1" required .value="${role.description}" @or-input-changed="${(e: OrInputChangedEvent) => role.description = e.detail.value}"></or-input>@@ -373,7 +391,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {<div class="row"><div class="column">- <strong>${i18next.t("read")}</strong>+ <strong class="column-title">${i18next.t("readPermissions")}</strong>${readRoles.map(r => {return html`@@ -384,7 +402,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {</div><div class="column">- <strong>${i18next.t("write")}</strong>+ <strong class="column-title">${i18next.t("writePermissions")}</strong>${writeRoles.map(r => {return html`<or-input ?readonly="${readonly}" .label="${r.name.split(":")[1]}: ${r.description}" .type="${InputType.CHECKBOX}" .value="${role.compositeRoleIds && role.compositeRoleIds.find(id => id === r.id)}" @or-input-changed="${(e: OrInputChangedEvent) => this.addRemoveRole(e, r, index) }"></or-input>@@ -419,7 +437,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {${!!this._compositeRoles[this._compositeRoles.length -1].id && !readonly ? html`<tr class="mdc-data-table__row"><td colspan="100%">- <a class="button" @click="${() => this._compositeRoles = [...this._compositeRoles, {composite:true, name:"", compositeRoleIds:[]}]}"><or-icon icon="plus"></or-icon><strong>${i18next.t("add")} ${i18next.t("role")}</strong></a>+ <a class="button" @click="${() => this._compositeRoles = [...this._compositeRoles, {composite:true, name:"", compositeRoleIds:[]}]}"><or-icon icon="plus"></or-icon>${i18next.t("add")} ${i18next.t("role")}</a></td></tr>` : ``}diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.tsindex e430c937e..99bd45207 100644--- a/ui/app/manager/src/pages/page-users.ts+++ b/ui/app/manager/src/pages/page-users.ts@@ -7,7 +7,7 @@ import {TemplateResult,unsafeCSS,} from "lit-element";-import manager, { OREvent } from "@openremote/core";+import manager, { OREvent, DefaultColor3 } from "@openremote/core";import "@openremote/or-panel";import "@openremote/or-translate";import { ifDefined } from "lit-html/directives/if-defined";@@ -54,6 +54,8 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {width: calc(100% - 40px);max-width: 1360px;margin: 20px auto;+ align-items: center;+ display: flex;}#title or-icon {@@ -63,7 +65,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {.panel {width: calc(100% - 90px);- max-width: 1320px;+ max-width: 1310px;background-color: white;border: 1px solid #e5e5e5;border-radius: 5px;@@ -90,7 +92,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {}.mdc-data-table__row {- border-top-color: lightgrey;+ border-top-color: #D3D3D3;}td, th {@@ -102,18 +104,20 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {overflow: hidden;max-height: 0;transition: max-height 0.25s ease-out;- padding: 0 20px;+ padding-left: 16px;}or-input {margin-bottom: 20px;- margin-right: 20px;+ margin-right: 16px;}or-icon {vertical-align: middle;--or-icon-width: 20px;--or-icon-height: 20px;+ margin-right: 2px;+ margin-left: -5px;}.row {@@ -133,6 +137,11 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {.mdc-data-table__header-cell {font-weight: bold;+ color: ${unsafeCSS(DefaultColor3)};+ }++ .mdc-data-table__header-cell:first-child {+ padding-left: 36px;}.attribute-meta-row td {@@ -145,16 +154,20 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {}.button {- cursor: pointer;- display: flex;- flex-direction: row;- align-content: center;- margin: 10px 15px;- align-items: center;+ cursor: pointer;+ display: flex;+ flex-direction: row;+ align-content: center;+ padding: 16px;+ align-items: center;+ font-size: 14px;+ text-transform: uppercase;+ color: var(--or-app-color4);}.button or-icon {--or-icon-fill: var(--or-app-color4);+ margin-right: 5px;}@media screen and (max-width: 768px){@@ -171,7 +184,9 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {}.panel {border-radius: 0;- width: calc(100% - 40px);+ border-left: 0px;+ border-right: 0px;+ width: calc(100% - 48px);}td, th {@@ -413,12 +428,12 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {${user.id && this._userRoleMapper[user.id] ? html`<or-input ?readonly="${readonly}" ?disabled="${isSameUser}" .value="${userRole ? ifDefined(userRole.id) : ifDefined(null)}" .type="${InputType.SELECT}" .options="${selectOptions}" .label="${i18next.t("role")}" @or-input-changed="${(e: OrInputChangedEvent) => this._userRoleMapper[user.id] = e.detail.value}"></or-input>` : html`- <or-input ?readonly="${readonly}" ?disabled="${isSameUser}" .type="${InputType.SELECT}" .options="${selectOptions}" .label="${i18next.t("role")}" @or-input-changed="${(e: OrInputChangedEvent) => this._userRoleMapper["newUser"] = e.detail.value}"></or-input>+ <or-input ?readonly="${readonly}" ?disabled="${isSameUser}" .type="${InputType.SELECT}" .options="${selectOptions}" .label="${i18next.t("role")}" @or-input-changed="${(e: OrInputChangedEvent) => this._userRoleMapper["newUser"] = e.detail.value}"></or-input>`}- <or-input id="password-${index}" ?readonly="${readonly}" .label="${i18next.t("password")}" .type="${InputType.PASSWORD}" min="1" @or-input-changed="${(e: OrInputChangedEvent) => { this.checkPassword(index) }}"></or-input>- <or-input id="repeatPassword-${index}" helperPersistent ?readonly="${readonly}" .label="${i18next.t("repeatPassword")}" .type="${InputType.PASSWORD}" min="1" @or-input-changed="${(e: OrInputChangedEvent) => { this.checkPassword(index) }}"></or-input>- <or-input ?readonly="${readonly}" .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" .value="${user.enabled}" @or-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}"></or-input>+ <or-input id="password-${index}" ?readonly="${readonly}" .label="${i18next.t("password")}" .type="${InputType.PASSWORD}" min="1" @or-input-changed="${(e: OrInputChangedEvent) => { this.checkPassword(index) }}"></or-input>+ <or-input id="repeatPassword-${index}" helperPersistent ?readonly="${readonly}" .label="${i18next.t("repeatPassword")}" .type="${InputType.PASSWORD}" min="1" @or-input-changed="${(e: OrInputChangedEvent) => { this.checkPassword(index) }}"></or-input>+ <or-input ?readonly="${readonly}" .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" .value="${user.enabled}" @or-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}" style="height: 56px;"></or-input></div></div>@@ -441,7 +456,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {${this._users.length === 0 || this._users.length > 0 && !!this._users[this._users.length -1].id && !readonly ? html`<tr class="mdc-data-table__row"><td colspan="100%">- <a class="button" @click="${() => this._users = [...this._users, {enabled: true}]}"><or-icon icon="plus"></or-icon><strong>${i18next.t("add")} ${i18next.t("user")}</strong></a>+ <a class="button" @click="${() => this._users = [...this._users, {enabled: true}]}"><or-icon icon="plus"></or-icon>${i18next.t("add")} ${i18next.t("user")}</a></td></tr>` : ``}diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.tsindex fe4e376ae..312a9fa82 100644--- a/ui/component/or-app/src/index.ts+++ b/ui/component/or-app/src/index.ts@@ -91,7 +91,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {return css`:host {--or-app-color2: ${unsafeCSS(DefaultColor2)};- --or-app-color3: #22211f;+ --or-app-color3: #4C4C4C;--or-app-color4: #4D9D2A;--or-console-primary-color: #4D9D2A;color: ${unsafeCSS(DefaultColor3)};diff --git a/ui/component/or-app/src/or-header.ts b/ui/component/or-app/src/or-header.tsindex 50fea5d59..479f3e1ef 100644--- a/ui/component/or-app/src/or-header.ts+++ b/ui/component/or-app/src/or-header.ts@@ -7,6 +7,7 @@ import manager, {DefaultColor2,DefaultColor3,DefaultColor4,+ DefaultColor5,DefaultHeaderHeight} from "@openremote/core";import "@openremote/or-mwc-components/dist/or-mwc-dialog";@@ -93,7 +94,7 @@ class OrHeader extends LitElement {--internal-or-header-drawer-color: var(--or-header-drawer-color, var(--or-app-color2, ${unsafeCSS(DefaultColor2)}));--internal-or-header-drawer-text-color: var(--or-header-drawer-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));--internal-or-header-drawer-item-size: var(--or-header-drawer-item-size, 30px);- --internal-or-header-drawer-separator-color: var(--or-header-drawer-separator-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));+ --internal-or-header-drawer-separator-color: var(--or-header-drawer-separator-color, var(--or-app-color5, ${unsafeCSS(DefaultColor5)}));display: block;z-index: 99999;@@ -145,7 +146,7 @@ class OrHeader extends LitElement {--or-icon-fill: var(--internal-or-header-drawer-text-color);--or-icon-height: calc(var(--internal-or-header-drawer-item-size) - 10px);--or-icon-width: calc(var(--internal-or-header-drawer-item-size) - 10px);- overflow: hidden;+ overflow: auto;}#drawer[opened] {@@ -157,7 +158,7 @@ class OrHeader extends LitElement {box-sizing: border-box;width: 100%;height: 100%;- padding: 6px 24px;+ padding: 10px 0px;position: relative;}@@ -185,8 +186,8 @@ class OrHeader extends LitElement {#mobile-bottom {border-top: 1px solid var(--internal-or-header-drawer-separator-color);- margin-top: 20px;- padding-top: 10px;+ margin-top: 16px;+ padding-top: 8px;}.menu-item {@@ -217,11 +218,12 @@ class OrHeader extends LitElement {#drawer .menu-item {display: block;line-height: var(--internal-or-header-drawer-item-size);- margin: 10px 0;+ margin: 6px 0;+ padding: 8px 16px;}#drawer .menu-item or-icon {- margin: 0 5px;+ margin: 0 10px;}#desktop-left .menu-item[selected] {diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex a69c631c0..e62475dbb 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -978,13 +978,13 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem${editMode ? html`<or-input id="name-input" .type="${InputType.TEXT}" min="1" max="1023" comfortable required outlined .label="${i18next.t("name")}" .value="${this.asset.name}" @or-input-changed="${(e: OrInputChangedEvent) => {this.asset!.name = e.detail.value; this._onAssetModified();}}"></or-input>` : html`<span>${this.asset.name}</span>`}</div>${!this._isReadonly() ? html`- <span id="edit-wrapper">+ <span id="edit-wrapper" class="mobileHidden"><or-translate value="editAsset"></or-translate><or-input id="edit-btn" .type="${InputType.SWITCH}" .value="${this.editMode}" @or-input-changed="${(ev: OrInputChangedEvent) => this._onEditToggleClicked(ev.detail.value)}"></or-input></span>`: ``}- <div id="right-wrapper">- ${this.asset!.createdOn ? html`<or-translate id="created-time" class="mobileHidden" value="createdOnWithDate" .options="${{ date: new Date(this.asset!.createdOn!) } as TOptions<InitOptions>}"></or-translate>` : ``}+ <div id="right-wrapper" class="mobileHidden">+ ${this.asset!.createdOn ? html`<or-translate id="created-time" value="createdOnWithDate" .options="${{ date: new Date(this.asset!.createdOn!) } as TOptions<InitOptions>}"></or-translate>` : ``}${editMode ? html`<or-input id="save-btn" .disabled="${!this.isModified()}" raised .type="${InputType.BUTTON}" .label="${i18next.t("save")}" @or-input-changed="${() => this._onSaveClicked()}"></or-input>` : ``}</div></div>diff --git a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts b/ui/component/or-asset-viewer/src/or-edit-asset-panel.tsindex 5b4900d1d..052ebe19e 100644--- a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts+++ b/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts@@ -2,7 +2,7 @@ import {css, customElement, html, LitElement, property, TemplateResult, unsafeCSimport {InputType, OrInput, OrInputChangedEvent, getValueHolderInputTemplateProvider, ValueInputProviderOptions, OrInputChangedEventDetail} from "@openremote/or-input";import i18next from "i18next";import {Asset, Attribute, NameValueHolder} from "@openremote/model";-import {AssetModelUtil, DefaultColor5, Util} from "@openremote/core";+import {AssetModelUtil, DefaultColor5, DefaultColor3, Util} from "@openremote/core";import "@openremote/or-input";import {OrIcon} from "@openremote/or-icon";import {showDialog, OrMwcDialog, DialogAction} from "@openremote/or-mwc-components/dist/or-mwc-dialog";@@ -23,8 +23,9 @@ const tableStyle = require("@material/data-table/dist/mdc.data-table.css");const style = css`.panel {margin: 10px auto;- max-width: 1200px;- }+ max-width: 1200px;+ }+#parent-edit-wrapper {display: flex;align-items: center;@@ -37,32 +38,53 @@ const style = css`#change-parent-btn {margin-left: 20px;}+.mdc-data-table__row:hover {background-color: inherit !important;}++ .mdc-data-table__row {+ border-top-color: #D3D3D3;+ }+#attribute-table {width: 100%;}++ .mdc-data-table__header-cell {+ font-weight: bold;+ color: ${unsafeCSS(DefaultColor3)};+ }++ .mdc-data-table__header-cell:first-child {+ padding-left: 36px;+ }.expander-cell {- --or-icon-width: 18px;- --or-icon-height: 18px;+ --or-icon-width: 20px;+ --or-icon-height: 20px;cursor: pointer;}.expander-cell > * {pointer-events: none;}.expander-cell > or-icon {- margin-right: 16px;+ vertical-align: middle;+ margin-right: 6px;+ margin-left: -5px;+ }+ .padded-cell {+ padding: 10px 16px;}.actions-cell {text-align: right;width: 40px;+ padding-right: 5px;}.meta-item-container {overflow: hidden;max-height: 0;transition: max-height 0.25s ease-out;- padding: 0 20px 0 50px;+ padding: 0 16px 0 36px;}.attribute-meta-row.expanded .meta-item-container {max-height: 1000px;@@ -83,7 +105,10 @@ const style = css`}.item-add {margin-bottom: 10px;- }+ }+ .item-add-attribute {+ margin: 10px 0px 10px 4px;+ }.button-clear {background: none;color: ${unsafeCSS(DefaultColor5)};@@ -91,7 +116,7 @@ const style = css`visibility: hidden;display: inline-block;border: none;- padding: 0;+ padding: 0 0 0 5px;cursor: pointer;}.button-clear:hover {@@ -103,9 +128,6 @@ const style = css`.button-clear.hidden {visibility: hidden;}- .padded-cell {- padding: 10px 0;- }.overflow-visible {overflow: visible;}@@ -192,9 +214,9 @@ export class OrEditAssetPanel extends LitElement {</thead><tbody class="mdc-data-table__content">${!this.asset.attributes ? `` : Object.entries(this.asset.attributes!).sort(Util.sortByString(([name, attribute]) => name.toUpperCase())).map(([name, attribute]) => {attribute.name = name; return this._getEditAttributeTemplate(this.asset.type!, attribute as Attribute<any>);})}- <tr>+ <tr class="mdc-data-table__row"><td colspan="4">- <div class="item-add">+ <div class="item-add-attribute"><or-input .type="${InputType.BUTTON}" .label="${i18next.t("addAttribute")}" icon="plus" @click="${() => this._addAttribute()}"></or-input></div></td>diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.tsindex 87e42ef8f..c3addb885 100644--- a/ui/component/or-asset-viewer/src/style.ts+++ b/ui/component/or-asset-viewer/src/style.ts@@ -1,5 +1,5 @@import {css, unsafeCSS} from "lit-element";-import {DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor5, DefaultColor4} from "@openremote/core";+import {DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor5, DefaultColor4, DefaultHeaderHeight} from "@openremote/core";// language=CSSexport const panelStyles = css`@@ -62,6 +62,7 @@ export const style = css`--internal-or-asset-viewer-panel-color: var(--or-asset-viewer-panel-color, var(--or-app-color1, ${unsafeCSS(DefaultColor1)}));--internal-or-asset-viewer-line-color: var(--or-asset-viewer-line-color, var(--or-app-color5, ${unsafeCSS(DefaultColor5)}));--internal-or-asset-viewer-button-color: var(--or-asset-viewer-button-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));+ --internal-or-header-height: var(--or-header-height, ${unsafeCSS(DefaultHeaderHeight)});height: 100%;width: 100%;@@ -98,6 +99,7 @@ export const style = css`grid-gap: 10px;grid-template-columns: repeat(auto-fill, minmax(calc(50% - 5px),1fr));grid-auto-rows: 5px;+ min-height: calc(100vh - 68px - var(--internal-or-header-height));-webkit-animation: fadein 0.3s; /* Safari, Chrome and Opera > 12.1 */-moz-animation: fadein 0.3s; /* Firefox < 16 */@@ -253,6 +255,7 @@ export const style = css`grid-auto-rows: auto;grid-template-columns: 100% !important;padding: 20px 0;+ min-height: unset;}}`;diff --git a/ui/component/or-map/src/index.ts b/ui/component/or-map/src/index.tsindex ec5bd979f..bc640a988 100644--- a/ui/component/or-map/src/index.ts+++ b/ui/component/or-map/src/index.ts@@ -292,7 +292,7 @@ export const geoJsonPointInputTemplateProvider: ValueInputProviderGenerator = (a</style><div id="geo-json-point-input-compact-wrapper"><or-input .type="${InputType.TEXT}" .value="${centerStr}" .pattern="${CoordinatesRegexPattern}" @keyup="${(e: KeyboardEvent) => getCoordinatesInputKeyHandler(valueChangeNotifier)(e)}"></or-input>- <or-input style="width: auto;" .type="${InputType.BUTTON}" compact action icon="crosshairs-gps" @click="${onClick}"></or-input>+ <or-input style="width: auto;" .type="${InputType.BUTTON}" compact icon="crosshairs-gps" @click="${onClick}"></or-input></div>`;}