From a4244b77fca552795d10ed59ac9238cd7866e920 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 8 Sep 2023 13:49:52 +0300 Subject: [PATCH 1/2] UI: Update home page dashboards. --- ui-ngx/src/assets/dashboard/api_usage.json | 848 +++++++++--------- .../dashboard/customer_user_home_page.json | 45 +- .../assets/dashboard/sys_admin_home_page.json | 250 ++---- .../dashboard/tenant_admin_home_page.json | 144 +-- 4 files changed, 570 insertions(+), 717 deletions(-) diff --git a/ui-ngx/src/assets/dashboard/api_usage.json b/ui-ngx/src/assets/dashboard/api_usage.json index 769849cc9e..5733b011f9 100644 --- a/ui-ngx/src/assets/dashboard/api_usage.json +++ b/ui-ngx/src/assets/dashboard/api_usage.json @@ -7,11 +7,7 @@ "description": "", "widgets": { "fd6df872-2ddf-0921-3929-2e7f55062fad": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 7.5, "sizeY": 3, "config": { @@ -117,8 +113,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694083375825, + "endTimeMs": 1694169775825 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -162,14 +177,11 @@ }, "row": 0, "col": 0, - "id": "fd6df872-2ddf-0921-3929-2e7f55062fad" + "id": "fd6df872-2ddf-0921-3929-2e7f55062fad", + "typeFullFqn": "system.cards.html_value_card" }, "7e235874-461b-e7c2-2fdd-d8762a020773": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 7.5, "sizeY": 3, "config": { @@ -275,8 +287,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694083375826, + "endTimeMs": 1694169775826 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -320,14 +351,11 @@ }, "row": 0, "col": 0, - "id": "7e235874-461b-e7c2-2fdd-d8762a020773" + "id": "7e235874-461b-e7c2-2fdd-d8762a020773", + "typeFullFqn": "system.cards.html_value_card" }, "08545554-a0e8-05c7-66df-6000cfeff8a4": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 7.5, "sizeY": 3, "config": { @@ -433,8 +461,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694083375826, + "endTimeMs": 1694169775826 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -488,14 +535,11 @@ }, "row": 0, "col": 0, - "id": "08545554-a0e8-05c7-66df-6000cfeff8a4" + "id": "08545554-a0e8-05c7-66df-6000cfeff8a4", + "typeFullFqn": "system.cards.html_value_card" }, "a245c67e-53ec-d299-fa89-69fe2062ccb2": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 7.5, "sizeY": 3, "config": { @@ -614,8 +658,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694083375826, + "endTimeMs": 1694169775826 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -659,14 +722,11 @@ }, "row": 0, "col": 0, - "id": "a245c67e-53ec-d299-fa89-69fe2062ccb2" + "id": "a245c67e-53ec-d299-fa89-69fe2062ccb2", + "typeFullFqn": "system.cards.html_value_card" }, "a151ae60-0326-6116-d818-9070dda8e9c7": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 7.5, "sizeY": 3, "config": { @@ -772,8 +832,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694083375826, + "endTimeMs": 1694169775826 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -822,14 +901,11 @@ }, "row": 0, "col": 0, - "id": "a151ae60-0326-6116-d818-9070dda8e9c7" + "id": "a151ae60-0326-6116-d818-9070dda8e9c7", + "typeFullFqn": "system.cards.html_value_card" }, "68e16e98-0420-f72c-4848-41dedffd3904": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -926,6 +1002,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.rule-engine-hourly-activity}", @@ -937,7 +1023,6 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": { "headerButton": [ { @@ -966,27 +1051,15 @@ "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "68e16e98-0420-f72c-4848-41dedffd3904" + "id": "68e16e98-0420-f72c-4848-41dedffd3904", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "2aa6b499-6e27-b315-6833-89c4d58485ce": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -1119,7 +1192,17 @@ "axisPosition": "top", "showLabels": true }, - "tooltipCumulative": false + "tooltipCumulative": false, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true + } }, "title": "{i18n:api-usage.transport-hourly-activity}", "dropShadow": true, @@ -1130,7 +1213,6 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": { "headerButton": [ { @@ -1149,27 +1231,15 @@ "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "2aa6b499-6e27-b315-6833-89c4d58485ce" + "id": "2aa6b499-6e27-b315-6833-89c4d58485ce", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "d890cea3-fba0-6474-9a21-fa780230dc62": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -1266,6 +1336,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.javascript-functions-hourly-activity}", @@ -1277,7 +1357,6 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": { "headerButton": [ { @@ -1296,27 +1375,15 @@ "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "d890cea3-fba0-6474-9a21-fa780230dc62" + "id": "d890cea3-fba0-6474-9a21-fa780230dc62", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "84b6cfa5-1449-e0f2-3560-f810d2dd7ead": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -1413,6 +1480,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.telemetry-persistence-hourly-activity}", @@ -1424,7 +1501,6 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": { "headerButton": [ { @@ -1443,27 +1519,15 @@ "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "84b6cfa5-1449-e0f2-3560-f810d2dd7ead" + "id": "84b6cfa5-1449-e0f2-3560-f810d2dd7ead", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "d296b566-a000-7402-ae9d-c815381c5435": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -1560,6 +1624,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.alarms-created-hourly-activity}", @@ -1571,7 +1645,6 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": { "headerButton": [ { @@ -1595,27 +1668,15 @@ "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "d296b566-a000-7402-ae9d-c815381c5435" + "id": "d296b566-a000-7402-ae9d-c815381c5435", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "00a02464-9509-911b-3b5e-21fb37629822": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -1747,6 +1808,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.notifications-hourly-activity}", @@ -1758,7 +1829,6 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": { "headerButton": [ { @@ -1782,27 +1852,15 @@ "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "00a02464-9509-911b-3b5e-21fb37629822" + "id": "00a02464-9509-911b-3b5e-21fb37629822", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "74199074-7873-6c6a-2a51-3fc614769f03": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -1900,6 +1958,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.rule-engine-daily-activity}", @@ -1911,33 +1979,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "74199074-7873-6c6a-2a51-3fc614769f03" + "id": "74199074-7873-6c6a-2a51-3fc614769f03", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "00006bc3-8a8d-b55e-ed39-e318f1bcd090": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -2035,6 +2090,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.rule-engine-monthly-activity}", @@ -2046,33 +2111,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "00006bc3-8a8d-b55e-ed39-e318f1bcd090" + "id": "00006bc3-8a8d-b55e-ed39-e318f1bcd090", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "5f5ca59c-e507-5301-5910-7ad8cd34df40": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -2170,6 +2222,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.javascript-functions-daily-activity}", @@ -2181,33 +2243,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "5f5ca59c-e507-5301-5910-7ad8cd34df40" + "id": "5f5ca59c-e507-5301-5910-7ad8cd34df40", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "ada32ee9-44ed-48d1-c368-fd0c94b7607f": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -2305,6 +2354,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.javascript-functions-monthly-activity}", @@ -2316,33 +2375,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "ada32ee9-44ed-48d1-c368-fd0c94b7607f" + "id": "ada32ee9-44ed-48d1-c368-fd0c94b7607f", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "98bae68b-0f35-72f2-a428-9b06889f1554": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -2476,7 +2522,17 @@ "axisPosition": "top", "showLabels": true }, - "tooltipCumulative": false + "tooltipCumulative": false, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true + } }, "title": "{i18n:api-usage.transport-daily-activity}", "dropShadow": true, @@ -2487,33 +2543,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "98bae68b-0f35-72f2-a428-9b06889f1554" + "id": "98bae68b-0f35-72f2-a428-9b06889f1554", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "e61e5477-5a09-cc25-966b-f613d81da833": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -2647,7 +2690,17 @@ "axisPosition": "top", "showLabels": true }, - "tooltipCumulative": false + "tooltipCumulative": false, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true + } }, "title": "{i18n:api-usage.transport-monthly-activity}", "dropShadow": true, @@ -2658,33 +2711,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "e61e5477-5a09-cc25-966b-f613d81da833" + "id": "e61e5477-5a09-cc25-966b-f613d81da833", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "85fe0738-5326-f069-ab3f-30594bde5fed": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -2782,6 +2822,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.telemetry-persistence-daily-activity}", @@ -2793,33 +2843,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "85fe0738-5326-f069-ab3f-30594bde5fed" + "id": "85fe0738-5326-f069-ab3f-30594bde5fed", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "eaeb381a-437e-f6e9-60c9-6bc8826fdd44": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -2917,6 +2954,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.telemetry-persistence-monthly-activity}", @@ -2928,33 +2975,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "eaeb381a-437e-f6e9-60c9-6bc8826fdd44" + "id": "eaeb381a-437e-f6e9-60c9-6bc8826fdd44", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "4b798823-b97d-9d6a-59dc-fcafd897fc23": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -3052,6 +3086,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.alarms-created-daily-activity}", @@ -3063,33 +3107,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "4b798823-b97d-9d6a-59dc-fcafd897fc23" + "id": "4b798823-b97d-9d6a-59dc-fcafd897fc23", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "6a981580-7490-19dd-f937-b64cbf67a982": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -3187,6 +3218,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.alarms-created-monthly-activity}", @@ -3198,33 +3239,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "6a981580-7490-19dd-f937-b64cbf67a982" + "id": "6a981580-7490-19dd-f937-b64cbf67a982", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "7302df65-1b0c-579e-bbdb-145126ae3392": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -3322,6 +3350,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.sms-messages-daily-activity}", @@ -3333,33 +3371,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "7302df65-1b0c-579e-bbdb-145126ae3392" + "id": "7302df65-1b0c-579e-bbdb-145126ae3392", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "fdb385e7-14fe-fc9f-ebdc-b400f26fc66b": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -3457,6 +3482,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.sms-messages-monthly-activity}", @@ -3468,33 +3503,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "fdb385e7-14fe-fc9f-ebdc-b400f26fc66b" + "id": "fdb385e7-14fe-fc9f-ebdc-b400f26fc66b", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "2408ad30-163e-8221-08e1-a82b638be564": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", "sizeX": 12, "sizeY": 7, "config": { @@ -3642,6 +3664,15 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "showMin": true, + "showMax": true, + "showAvg": false, + "showTotal": true } }, "title": "Queue Stats", @@ -3660,25 +3691,13 @@ "widgetStyle": {}, "useDashboardTimewindow": false, "displayTimewindow": true, - "showLegend": true, - "actions": {}, - "legendConfig": { - "direction": "column", - "position": "bottom", - "showMin": true, - "showMax": true, - "showAvg": false, - "showTotal": true - } + "actions": {} }, - "id": "2408ad30-163e-8221-08e1-a82b638be564" + "id": "2408ad30-163e-8221-08e1-a82b638be564", + "typeFullFqn": "system.charts.basic_timeseries" }, "e43dcfe1-b970-6a11-ce0e-5769f3eb5e88": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", "sizeX": 12, "sizeY": 7, "config": { @@ -3796,6 +3815,15 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "showMin": true, + "showMax": true, + "showAvg": false, + "showTotal": true } }, "title": "Processing Failures and Timeouts", @@ -3814,25 +3842,13 @@ "widgetStyle": {}, "useDashboardTimewindow": false, "displayTimewindow": true, - "showLegend": true, - "actions": {}, - "legendConfig": { - "direction": "column", - "position": "bottom", - "showMin": true, - "showMax": true, - "showAvg": false, - "showTotal": true - } + "actions": {} }, - "id": "e43dcfe1-b970-6a11-ce0e-5769f3eb5e88" + "id": "e43dcfe1-b970-6a11-ce0e-5769f3eb5e88", + "typeFullFqn": "system.charts.basic_timeseries" }, "a669cf86-e715-efa4-dd9a-b839abf499e9": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "timeseries_table", "type": "timeseries", - "title": "New widget", "sizeX": 24, "sizeY": 5, "config": { @@ -3921,14 +3937,11 @@ "titleTooltip": "", "displayTimewindow": true }, - "id": "a669cf86-e715-efa4-dd9a-b839abf499e9" + "id": "a669cf86-e715-efa4-dd9a-b839abf499e9", + "typeFullFqn": "system.cards.timeseries_table" }, "292eaded-4775-36f7-c896-98d57bdda936": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 7.5, "sizeY": 3, "config": { @@ -4047,8 +4060,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694083375827, + "endTimeMs": 1694169775827 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -4097,14 +4129,11 @@ }, "row": 0, "col": 0, - "id": "292eaded-4775-36f7-c896-98d57bdda936" + "id": "292eaded-4775-36f7-c896-98d57bdda936", + "typeFullFqn": "system.cards.html_value_card" }, "b3571a36-2106-1122-7d58-0d38bbb0e9c8": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -4202,6 +4231,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.email-messages-daily-activity}", @@ -4213,33 +4252,20 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "b3571a36-2106-1122-7d58-0d38bbb0e9c8" + "id": "b3571a36-2106-1122-7d58-0d38bbb0e9c8", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "aa875b7f-e7c8-7529-1ae7-f456211b59cc": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", "sizeX": 8, "sizeY": 5, "config": { @@ -4337,6 +4363,16 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": true } }, "title": "{i18n:api-usage.email-messages-monthly-activity}", @@ -4348,26 +4384,17 @@ }, "widgetStyle": {}, "useDashboardTimewindow": false, - "showLegend": true, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "iconColor": "rgba(0, 0, 0, 0.87)", "iconSize": "24px", - "titleTooltip": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": true - } + "titleTooltip": "" }, "row": 0, "col": 0, - "id": "aa875b7f-e7c8-7529-1ae7-f456211b59cc" + "id": "aa875b7f-e7c8-7529-1ae7-f456211b59cc", + "typeFullFqn": "system.charts.timeseries_bars_flot" } }, "states": { @@ -4465,7 +4492,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -4498,7 +4526,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -4531,7 +4560,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -4564,7 +4594,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -4597,7 +4628,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -4638,7 +4670,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -4683,7 +4716,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -4716,7 +4750,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -4737,8 +4772,10 @@ "filter": { "type": "assetType", "resolveMultiple": true, - "assetType": "TbServiceQueue", - "assetNameFilter": "" + "assetNameFilter": "", + "assetTypes": [ + "TbServiceQueue" + ] } } }, @@ -4770,5 +4807,6 @@ "showDashboardLogo": false } }, + "externalId": null, "name": "Api Usage" -} +} \ No newline at end of file diff --git a/ui-ngx/src/assets/dashboard/customer_user_home_page.json b/ui-ngx/src/assets/dashboard/customer_user_home_page.json index 8aee6c108e..7c79162d5b 100644 --- a/ui-ngx/src/assets/dashboard/customer_user_home_page.json +++ b/ui-ngx/src/assets/dashboard/customer_user_home_page.json @@ -7,13 +7,7 @@ "description": "", "widgets": { "867f82cf-ecf2-2d5c-35cb-08c6f2edc3a4": { - "isSystemType": true, - "bundleAlias": "home_page_widgets", - "typeAlias": "documentation_links", "type": "static", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 3, "config": { @@ -41,16 +35,11 @@ }, "row": 0, "col": 0, - "id": "867f82cf-ecf2-2d5c-35cb-08c6f2edc3a4" + "id": "867f82cf-ecf2-2d5c-35cb-08c6f2edc3a4", + "typeFullFqn": "system.home_page_widgets.documentation_links" }, "9e3ef045-d8bc-1640-a3f4-2dd10b19d50e": { - "isSystemType": true, - "bundleAlias": "home_page_widgets", - "typeAlias": "quick_links", "type": "static", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 3, "config": { @@ -73,16 +62,11 @@ }, "row": 0, "col": 0, - "id": "9e3ef045-d8bc-1640-a3f4-2dd10b19d50e" + "id": "9e3ef045-d8bc-1640-a3f4-2dd10b19d50e", + "typeFullFqn": "system.home_page_widgets.quick_links" }, "6d6e2b1d-6ce7-4678-3745-c6b0897b2674": { - "isSystemType": true, - "bundleAlias": "home_page_widgets", - "typeAlias": "dashboards", "type": "static", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { @@ -103,16 +87,11 @@ }, "row": 0, "col": 0, - "id": "6d6e2b1d-6ce7-4678-3745-c6b0897b2674" + "id": "6d6e2b1d-6ce7-4678-3745-c6b0897b2674", + "typeFullFqn": "system.home_page_widgets.dashboards" }, "35d3ac3b-f1af-dc3d-a1d1-11f351d16fc6": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -238,16 +217,11 @@ }, "row": 0, "col": 0, - "id": "35d3ac3b-f1af-dc3d-a1d1-11f351d16fc6" + "id": "35d3ac3b-f1af-dc3d-a1d1-11f351d16fc6", + "typeFullFqn": "system.cards.markdown_card" }, "7ac20b6a-dc40-b18e-9f5f-bca20bc693bb": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -392,7 +366,8 @@ }, "row": 0, "col": 0, - "id": "7ac20b6a-dc40-b18e-9f5f-bca20bc693bb" + "id": "7ac20b6a-dc40-b18e-9f5f-bca20bc693bb", + "typeFullFqn": "system.cards.markdown_card" } }, "states": { diff --git a/ui-ngx/src/assets/dashboard/sys_admin_home_page.json b/ui-ngx/src/assets/dashboard/sys_admin_home_page.json index b1dfe94f86..f93de01596 100644 --- a/ui-ngx/src/assets/dashboard/sys_admin_home_page.json +++ b/ui-ngx/src/assets/dashboard/sys_admin_home_page.json @@ -7,13 +7,7 @@ "description": "", "widgets": { "d70cc256-4c7b-ee06-9905-b8c5e546605f": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -72,16 +66,11 @@ }, "row": 0, "col": 0, - "id": "d70cc256-4c7b-ee06-9905-b8c5e546605f" + "id": "d70cc256-4c7b-ee06-9905-b8c5e546605f", + "typeFullFqn": "system.cards.markdown_card" }, "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", - "image": null, - "description": null, "sizeX": 8, "sizeY": 5, "config": { @@ -179,7 +168,18 @@ "showLabels": true }, "customLegendEnabled": false, - "dataKeysListForLabels": [] + "dataKeysListForLabels": [], + "showLegend": false, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": true, + "showTotal": false, + "showLatest": false + } }, "title": "Transport messages", "dropShadow": false, @@ -192,37 +192,21 @@ "padding": "0" }, "useDashboardTimewindow": false, - "showLegend": false, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "titleTooltip": "", "widgetCss": ".tb-widget-container > .tb-widget {\n border: none !important;\n border-radius: 0 !important;\n box-shadow: none !important;\n}\n\n.tb-widget-container > .tb-widget .flot-base {\n opacity: 0.48;\n}\n", "pageSize": 1024, - "noDataDisplayMessage": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": true, - "showTotal": false, - "showLatest": false - } + "noDataDisplayMessage": "" }, "row": 0, "col": 0, - "id": "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e" + "id": "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "4b5e47ed-c197-a937-d727-041ba8decec2": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -307,16 +291,11 @@ }, "row": 0, "col": 0, - "id": "4b5e47ed-c197-a937-d727-041ba8decec2" + "id": "4b5e47ed-c197-a937-d727-041ba8decec2", + "typeFullFqn": "system.cards.markdown_card" }, "eace9148-b02a-48fe-1a95-acd9928aa8c5": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", - "image": null, - "description": null, "sizeX": 8, "sizeY": 5, "config": { @@ -501,7 +480,18 @@ "showLabels": true }, "customLegendEnabled": false, - "dataKeysListForLabels": [] + "dataKeysListForLabels": [], + "showLegend": true, + "legendConfig": { + "direction": "row", + "position": "top", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": false, + "showTotal": false, + "showLatest": false + } }, "title": "System Info Chart", "dropShadow": false, @@ -518,31 +508,15 @@ "pageSize": 1024, "units": "%", "noDataDisplayMessage": "", - "showLegend": true, - "legendConfig": { - "direction": "row", - "position": "top", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": false, - "showTotal": false, - "showLatest": false - }, "displayTimewindow": true }, "row": 0, "col": 0, - "id": "eace9148-b02a-48fe-1a95-acd9928aa8c5" + "id": "eace9148-b02a-48fe-1a95-acd9928aa8c5", + "typeFullFqn": "system.charts.basic_timeseries" }, "8acbf5df-f9fc-114d-216f-86f081aa4779": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -601,16 +575,11 @@ }, "row": 0, "col": 0, - "id": "8acbf5df-f9fc-114d-216f-86f081aa4779" + "id": "8acbf5df-f9fc-114d-216f-86f081aa4779", + "typeFullFqn": "system.cards.markdown_card" }, "d2784f6c-0518-fd95-1d28-b21f70bdcb10": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -668,16 +637,11 @@ }, "row": 0, "col": 0, - "id": "d2784f6c-0518-fd95-1d28-b21f70bdcb10" + "id": "d2784f6c-0518-fd95-1d28-b21f70bdcb10", + "typeFullFqn": "system.cards.markdown_card" }, "66dcf1a2-9d83-6873-c693-d6a5d989b3f8": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -735,16 +699,11 @@ }, "row": 0, "col": 0, - "id": "66dcf1a2-9d83-6873-c693-d6a5d989b3f8" + "id": "66dcf1a2-9d83-6873-c693-d6a5d989b3f8", + "typeFullFqn": "system.cards.markdown_card" }, "867f82cf-ecf2-2d5c-35cb-08c6f2edc3a4": { - "isSystemType": true, - "bundleAlias": "home_page_widgets", - "typeAlias": "documentation_links", "type": "static", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 3, "config": { @@ -772,16 +731,11 @@ }, "row": 0, "col": 0, - "id": "867f82cf-ecf2-2d5c-35cb-08c6f2edc3a4" + "id": "867f82cf-ecf2-2d5c-35cb-08c6f2edc3a4", + "typeFullFqn": "system.home_page_widgets.documentation_links" }, "a23185ad-dc46-806c-0e50-5b21fb080ace": { - "isSystemType": true, - "bundleAlias": "home_page_widgets", - "typeAlias": "getting_started", "type": "static", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { @@ -809,16 +763,11 @@ }, "row": 0, "col": 0, - "id": "a23185ad-dc46-806c-0e50-5b21fb080ace" + "id": "a23185ad-dc46-806c-0e50-5b21fb080ace", + "typeFullFqn": "system.home_page_widgets.getting_started" }, "b35fa1b0-7f95-0b23-fade-d066653a40e1": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -930,16 +879,11 @@ }, "row": 0, "col": 0, - "id": "b35fa1b0-7f95-0b23-fade-d066653a40e1" + "id": "b35fa1b0-7f95-0b23-fade-d066653a40e1", + "typeFullFqn": "system.cards.markdown_card" }, "5eabde4c-095f-defc-dd09-6c0afb9b9f7b": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -1063,16 +1007,11 @@ }, "row": 0, "col": 0, - "id": "5eabde4c-095f-defc-dd09-6c0afb9b9f7b" + "id": "5eabde4c-095f-defc-dd09-6c0afb9b9f7b", + "typeFullFqn": "system.cards.markdown_card" }, "451e2588-80b8-cd08-2199-1263ed4dc12c": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -1196,16 +1135,11 @@ }, "row": 0, "col": 0, - "id": "451e2588-80b8-cd08-2199-1263ed4dc12c" + "id": "451e2588-80b8-cd08-2199-1263ed4dc12c", + "typeFullFqn": "system.cards.markdown_card" }, "01b94c17-84eb-4e49-6a92-c3f108ecff8e": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -1417,16 +1351,11 @@ }, "row": 0, "col": 0, - "id": "01b94c17-84eb-4e49-6a92-c3f108ecff8e" + "id": "01b94c17-84eb-4e49-6a92-c3f108ecff8e", + "typeFullFqn": "system.cards.markdown_card" }, "f0479b00-ed47-0a30-0c36-bde7847aae00": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -1488,16 +1417,11 @@ }, "row": 0, "col": 0, - "id": "f0479b00-ed47-0a30-0c36-bde7847aae00" + "id": "f0479b00-ed47-0a30-0c36-bde7847aae00", + "typeFullFqn": "system.cards.markdown_card" }, "57ed0ad9-8fcf-4454-1fa7-d39e22f84570": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -1579,16 +1503,11 @@ }, "row": 0, "col": 0, - "id": "57ed0ad9-8fcf-4454-1fa7-d39e22f84570" + "id": "57ed0ad9-8fcf-4454-1fa7-d39e22f84570", + "typeFullFqn": "system.cards.markdown_card" }, "0464b6bc-7863-ba75-4b84-64b8acae2af9": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -1670,16 +1589,11 @@ }, "row": 0, "col": 0, - "id": "0464b6bc-7863-ba75-4b84-64b8acae2af9" + "id": "0464b6bc-7863-ba75-4b84-64b8acae2af9", + "typeFullFqn": "system.cards.markdown_card" }, "4c043bba-6ac1-dd23-0796-fe6ae4c3c0a3": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -1761,16 +1675,11 @@ }, "row": 0, "col": 0, - "id": "4c043bba-6ac1-dd23-0796-fe6ae4c3c0a3" + "id": "4c043bba-6ac1-dd23-0796-fe6ae4c3c0a3", + "typeFullFqn": "system.cards.markdown_card" }, "8b8d5d4f-2c5f-c768-d4fb-68d6e0b716f4": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -1852,16 +1761,11 @@ }, "row": 0, "col": 0, - "id": "8b8d5d4f-2c5f-c768-d4fb-68d6e0b716f4" + "id": "8b8d5d4f-2c5f-c768-d4fb-68d6e0b716f4", + "typeFullFqn": "system.cards.markdown_card" }, "d58bfdd4-18b0-a70c-5d5f-73d12c2ea468": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -1943,16 +1847,11 @@ }, "row": 0, "col": 0, - "id": "d58bfdd4-18b0-a70c-5d5f-73d12c2ea468" + "id": "d58bfdd4-18b0-a70c-5d5f-73d12c2ea468", + "typeFullFqn": "system.cards.markdown_card" }, "a3d83738-a4f2-ea92-17d7-1a3c52aa1770": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -2034,16 +1933,11 @@ }, "row": 0, "col": 0, - "id": "a3d83738-a4f2-ea92-17d7-1a3c52aa1770" + "id": "a3d83738-a4f2-ea92-17d7-1a3c52aa1770", + "typeFullFqn": "system.cards.markdown_card" }, "ff4f04a2-f739-2f3e-17dc-9ede9f2df75d": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -2235,16 +2129,11 @@ }, "row": 0, "col": 0, - "id": "ff4f04a2-f739-2f3e-17dc-9ede9f2df75d" + "id": "ff4f04a2-f739-2f3e-17dc-9ede9f2df75d", + "typeFullFqn": "system.cards.markdown_card" }, "163025d8-3ca4-dd1e-c17b-e40d8e03e8a8": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -2306,7 +2195,8 @@ }, "row": 0, "col": 0, - "id": "163025d8-3ca4-dd1e-c17b-e40d8e03e8a8" + "id": "163025d8-3ca4-dd1e-c17b-e40d8e03e8a8", + "typeFullFqn": "system.cards.markdown_card" } }, "states": { @@ -2721,4 +2611,4 @@ }, "externalId": null, "name": "System Administrator Home Page" -} +} \ No newline at end of file diff --git a/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json b/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json index 6f9215b4f9..a2edebb7c4 100644 --- a/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json +++ b/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json @@ -7,13 +7,7 @@ "description": "", "widgets": { "d70cc256-4c7b-ee06-9905-b8c5e546605f": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -72,16 +66,11 @@ }, "row": 0, "col": 0, - "id": "d70cc256-4c7b-ee06-9905-b8c5e546605f" + "id": "d70cc256-4c7b-ee06-9905-b8c5e546605f", + "typeFullFqn": "system.cards.markdown_card" }, "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "timeseries_bars_flot", "type": "timeseries", - "title": "New widget", - "image": null, - "description": null, "sizeX": 8, "sizeY": 5, "config": { @@ -179,7 +168,18 @@ "showLabels": true }, "customLegendEnabled": false, - "dataKeysListForLabels": [] + "dataKeysListForLabels": [], + "showLegend": false, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": true, + "showTotal": false, + "showLatest": false + } }, "title": "Transport messages", "dropShadow": false, @@ -192,37 +192,21 @@ "padding": "0" }, "useDashboardTimewindow": false, - "showLegend": false, "actions": {}, "displayTimewindow": true, "showTitleIcon": false, "titleTooltip": "", "widgetCss": ".tb-widget-container > .tb-widget {\n border: none !important;\n border-radius: 0 !important;\n box-shadow: none !important;\n}\n\n.tb-widget-container > .tb-widget .flot-base {\n opacity: 0.48;\n}\n", "pageSize": 1024, - "noDataDisplayMessage": "", - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": true, - "showTotal": false, - "showLatest": false - } + "noDataDisplayMessage": "" }, "row": 0, "col": 0, - "id": "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e" + "id": "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e", + "typeFullFqn": "system.charts.timeseries_bars_flot" }, "867f82cf-ecf2-2d5c-35cb-08c6f2edc3a4": { - "isSystemType": true, - "bundleAlias": "home_page_widgets", - "typeAlias": "documentation_links", "type": "static", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 3, "config": { @@ -250,16 +234,11 @@ }, "row": 0, "col": 0, - "id": "867f82cf-ecf2-2d5c-35cb-08c6f2edc3a4" + "id": "867f82cf-ecf2-2d5c-35cb-08c6f2edc3a4", + "typeFullFqn": "system.home_page_widgets.documentation_links" }, "a23185ad-dc46-806c-0e50-5b21fb080ace": { - "isSystemType": true, - "bundleAlias": "home_page_widgets", - "typeAlias": "getting_started", "type": "static", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { @@ -287,16 +266,11 @@ }, "row": 0, "col": 0, - "id": "a23185ad-dc46-806c-0e50-5b21fb080ace" + "id": "a23185ad-dc46-806c-0e50-5b21fb080ace", + "typeFullFqn": "system.home_page_widgets.getting_started" }, "d26e5cd7-75ef-d475-00c7-1a2d1114efe8": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", - "image": null, - "description": null, "sizeX": 8, "sizeY": 5, "config": { @@ -412,7 +386,18 @@ "showLabels": true }, "customLegendEnabled": false, - "dataKeysListForLabels": [] + "dataKeysListForLabels": [], + "showLegend": false, + "legendConfig": { + "direction": "column", + "position": "bottom", + "sortDataKeys": false, + "showMin": false, + "showMax": false, + "showAvg": true, + "showTotal": false, + "showLatest": false + } }, "title": "Devices activity", "dropShadow": false, @@ -430,31 +415,15 @@ }, "widgetCss": ".tb-widget-container > .tb-widget {\n border: none !important;\n border-radius: 0 !important;\n box-shadow: none !important;\n}\n", "pageSize": 1024, - "noDataDisplayMessage": "", - "showLegend": false, - "legendConfig": { - "direction": "column", - "position": "bottom", - "sortDataKeys": false, - "showMin": false, - "showMax": false, - "showAvg": true, - "showTotal": false, - "showLatest": false - } + "noDataDisplayMessage": "" }, "row": 0, "col": 0, - "id": "d26e5cd7-75ef-d475-00c7-1a2d1114efe8" + "id": "d26e5cd7-75ef-d475-00c7-1a2d1114efe8", + "typeFullFqn": "system.charts.basic_timeseries" }, "ebbd0a6e-8a47-e770-5086-7f4974250f2d": { - "isSystemType": true, - "bundleAlias": "home_page_widgets", - "typeAlias": "usage_info", "type": "static", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { @@ -475,16 +444,11 @@ }, "row": 0, "col": 0, - "id": "ebbd0a6e-8a47-e770-5086-7f4974250f2d" + "id": "ebbd0a6e-8a47-e770-5086-7f4974250f2d", + "typeFullFqn": "system.home_page_widgets.usage_info" }, "9e3ef045-d8bc-1640-a3f4-2dd10b19d50e": { - "isSystemType": true, - "bundleAlias": "home_page_widgets", - "typeAlias": "quick_links", "type": "static", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 3, "config": { @@ -507,16 +471,11 @@ }, "row": 0, "col": 0, - "id": "9e3ef045-d8bc-1640-a3f4-2dd10b19d50e" + "id": "9e3ef045-d8bc-1640-a3f4-2dd10b19d50e", + "typeFullFqn": "system.home_page_widgets.quick_links" }, "6d6e2b1d-6ce7-4678-3745-c6b0897b2674": { - "isSystemType": true, - "bundleAlias": "home_page_widgets", - "typeAlias": "dashboards", "type": "static", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { @@ -537,16 +496,11 @@ }, "row": 0, "col": 0, - "id": "6d6e2b1d-6ce7-4678-3745-c6b0897b2674" + "id": "6d6e2b1d-6ce7-4678-3745-c6b0897b2674", + "typeFullFqn": "system.home_page_widgets.dashboards" }, "35d3ac3b-f1af-dc3d-a1d1-11f351d16fc6": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -672,16 +626,11 @@ }, "row": 0, "col": 0, - "id": "35d3ac3b-f1af-dc3d-a1d1-11f351d16fc6" + "id": "35d3ac3b-f1af-dc3d-a1d1-11f351d16fc6", + "typeFullFqn": "system.cards.markdown_card" }, "7ac20b6a-dc40-b18e-9f5f-bca20bc693bb": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "markdown_card", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 5, "sizeY": 3.5, "config": { @@ -826,7 +775,8 @@ }, "row": 0, "col": 0, - "id": "7ac20b6a-dc40-b18e-9f5f-bca20bc693bb" + "id": "7ac20b6a-dc40-b18e-9f5f-bca20bc693bb", + "typeFullFqn": "system.cards.markdown_card" } }, "states": { @@ -1101,4 +1051,4 @@ }, "externalId": null, "name": "Tenant Administrator Home Page" -} +} \ No newline at end of file From b1f70e162a5a504a3d410ac0cc4cec2358e86080 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 8 Sep 2023 14:16:56 +0300 Subject: [PATCH 2/2] Update demo data dashboards --- .../data/json/demo/dashboards/firmware.json | 267 +++++++++++++----- .../data/json/demo/dashboards/gateways.json | 234 +++++++++------ .../dashboards/rule_engine_statistics.json | 82 +++--- .../data/json/demo/dashboards/software.json | 267 +++++++++++++----- .../json/demo/dashboards/thermostats.json | 229 ++++++++++----- 5 files changed, 716 insertions(+), 363 deletions(-) diff --git a/application/src/main/data/json/demo/dashboards/firmware.json b/application/src/main/data/json/demo/dashboards/firmware.json index 779f2cb93c..7a21e86761 100644 --- a/application/src/main/data/json/demo/dashboards/firmware.json +++ b/application/src/main/data/json/demo/dashboards/firmware.json @@ -1,24 +1,34 @@ { "title": "Firmware", "image": null, + "mobileHide": false, + "mobileOrder": null, "configuration": { "description": "", "widgets": { "cd03188e-cd9d-9601-fd57-da4cb95fc016": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085363133, + "endTimeMs": 1694171763133 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -299,16 +309,11 @@ }, "row": 0, "col": 0, - "id": "cd03188e-cd9d-9601-fd57-da4cb95fc016" + "id": "cd03188e-cd9d-9601-fd57-da4cb95fc016", + "typeFullFqn": "system.cards.entities_table" }, "100b756c-0082-6505-3ae1-3603e6deea48": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "timeseries_table", "type": "timeseries", - "title": "New widget", - "image": null, - "description": null, "sizeX": 8, "sizeY": 6.5, "config": { @@ -461,14 +466,11 @@ }, "row": 0, "col": 0, - "id": "100b756c-0082-6505-3ae1-3603e6deea48" + "id": "100b756c-0082-6505-3ae1-3603e6deea48", + "typeFullFqn": "system.cards.timeseries_table" }, "17543c57-af4a-2c1e-bf12-53a7b46791e6": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 8, "sizeY": 3, "config": { @@ -496,8 +498,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085363133, + "endTimeMs": 1694171763133 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -545,14 +566,11 @@ "enableDataExport": false, "displayTimewindow": true }, - "id": "17543c57-af4a-2c1e-bf12-53a7b46791e6" + "id": "17543c57-af4a-2c1e-bf12-53a7b46791e6", + "typeFullFqn": "system.cards.html_value_card" }, "6c1c4e1a-bce0-f5ad-ff8b-ba1dfc5a4ec6": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 8, "sizeY": 3, "config": { @@ -580,8 +598,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085363133, + "endTimeMs": 1694171763133 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -629,14 +666,11 @@ "enableDataExport": false, "displayTimewindow": true }, - "id": "6c1c4e1a-bce0-f5ad-ff8b-ba1dfc5a4ec6" + "id": "6c1c4e1a-bce0-f5ad-ff8b-ba1dfc5a4ec6", + "typeFullFqn": "system.cards.html_value_card" }, "e6674227-9cf3-a2f6-ecac-5ccfc38a3c81": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 8, "sizeY": 3, "config": { @@ -664,8 +698,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085363133, + "endTimeMs": 1694171763133 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -713,14 +766,11 @@ "enableDataExport": false, "displayTimewindow": true }, - "id": "e6674227-9cf3-a2f6-ecac-5ccfc38a3c81" + "id": "e6674227-9cf3-a2f6-ecac-5ccfc38a3c81", + "typeFullFqn": "system.cards.html_value_card" }, "77b10144-b904-edd5-8c7c-8fb75616c6d8": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 8, "sizeY": 3, "config": { @@ -748,8 +798,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085363133, + "endTimeMs": 1694171763133 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -797,23 +866,32 @@ "enableDataExport": false, "displayTimewindow": true }, - "id": "77b10144-b904-edd5-8c7c-8fb75616c6d8" + "id": "77b10144-b904-edd5-8c7c-8fb75616c6d8", + "typeFullFqn": "system.cards.html_value_card" }, "21be08bb-ec90-f760-ad6f-e7678f12c401": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085363133, + "endTimeMs": 1694171763133 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -1094,23 +1172,32 @@ }, "row": 0, "col": 0, - "id": "21be08bb-ec90-f760-ad6f-e7678f12c401" + "id": "21be08bb-ec90-f760-ad6f-e7678f12c401", + "typeFullFqn": "system.cards.entities_table" }, "e8280043-d3dc-7acb-c2ff-a4522972ff91": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085363133, + "endTimeMs": 1694171763133 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -1391,23 +1478,32 @@ }, "row": 0, "col": 0, - "id": "e8280043-d3dc-7acb-c2ff-a4522972ff91" + "id": "e8280043-d3dc-7acb-c2ff-a4522972ff91", + "typeFullFqn": "system.cards.entities_table" }, "3624013b-378c-f110-5eba-ae95c25a4dcc": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085363133, + "endTimeMs": 1694171763133 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -1688,23 +1784,32 @@ }, "row": 0, "col": 0, - "id": "3624013b-378c-f110-5eba-ae95c25a4dcc" + "id": "3624013b-378c-f110-5eba-ae95c25a4dcc", + "typeFullFqn": "system.cards.entities_table" }, "d2d13e0d-4e71-889f-9343-ad2f0af9f176": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085363133, + "endTimeMs": 1694171763133 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -1985,7 +2090,8 @@ }, "row": 0, "col": 0, - "id": "d2d13e0d-4e71-889f-9343-ad2f0af9f176" + "id": "d2d13e0d-4e71-889f-9343-ad2f0af9f176", + "typeFullFqn": "system.cards.entities_table" } }, "states": { @@ -2035,7 +2141,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": true, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2062,7 +2169,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2089,7 +2197,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2116,7 +2225,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2143,7 +2253,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2170,7 +2281,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2488,5 +2600,6 @@ "showUpdateDashboardImage": false } }, + "externalId": null, "name": "Firmware" } \ No newline at end of file diff --git a/application/src/main/data/json/demo/dashboards/gateways.json b/application/src/main/data/json/demo/dashboards/gateways.json index 6051fbd514..f4eb275c3c 100644 --- a/application/src/main/data/json/demo/dashboards/gateways.json +++ b/application/src/main/data/json/demo/dashboards/gateways.json @@ -1,20 +1,33 @@ { "title": "Gateways", + "image": null, + "mobileHide": false, + "mobileOrder": null, "configuration": { "widgets": { "94715984-ae74-76e4-20b7-2f956b01ed80": { - "isSystemType": true, - "bundleAlias": "entity_admin_widgets", - "typeAlias": "device_admin_table", "type": "latest", - "title": "New widget", "sizeX": 24, "sizeY": 12, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085270425, + "endTimeMs": 1694171670425 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -187,14 +200,11 @@ ] } }, - "id": "94715984-ae74-76e4-20b7-2f956b01ed80" + "id": "94715984-ae74-76e4-20b7-2f956b01ed80", + "typeFullFqn": "system.entity_admin_widgets.device_admin_table" }, "eadabbc7-519e-76fc-ba10-b3fe8c18da10": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "timeseries_table", "type": "timeseries", - "title": "New widget", "sizeX": 14, "sizeY": 13, "config": { @@ -255,14 +265,11 @@ "titleTooltip": "", "displayTimewindow": true }, - "id": "eadabbc7-519e-76fc-ba10-b3fe8c18da10" + "id": "eadabbc7-519e-76fc-ba10-b3fe8c18da10", + "typeFullFqn": "system.cards.timeseries_table" }, "f928afc4-30d1-8d0c-e3cf-777f9f9d1155": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", "sizeX": 17, "sizeY": 4, "config": { @@ -375,6 +382,15 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "right", + "showMin": true, + "showMax": true, + "showAvg": true, + "showTotal": true } }, "title": "Real time information", @@ -393,25 +409,13 @@ "widgetStyle": {}, "useDashboardTimewindow": false, "displayTimewindow": true, - "showLegend": true, - "legendConfig": { - "direction": "column", - "position": "right", - "showMin": true, - "showMax": true, - "showAvg": true, - "showTotal": true - }, "actions": {} }, - "id": "f928afc4-30d1-8d0c-e3cf-777f9f9d1155" + "id": "f928afc4-30d1-8d0c-e3cf-777f9f9d1155", + "typeFullFqn": "system.charts.basic_timeseries" }, "2a95b473-042d-59d0-2da2-40d0cccb6c8a": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "timeseries_table", "type": "timeseries", - "title": "New widget", "sizeX": 7, "sizeY": 7, "config": { @@ -491,14 +495,11 @@ "showTotal": false } }, - "id": "2a95b473-042d-59d0-2da2-40d0cccb6c8a" + "id": "2a95b473-042d-59d0-2da2-40d0cccb6c8a", + "typeFullFqn": "system.cards.timeseries_table" }, "aaa69366-aacc-9028-65aa-645c0f8533ec": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", "sizeX": 17, "sizeY": 4, "config": { @@ -604,6 +605,15 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "right", + "showMin": true, + "showMax": true, + "showAvg": true, + "showTotal": true } }, "title": "History information", @@ -622,25 +632,13 @@ "widgetStyle": {}, "useDashboardTimewindow": true, "displayTimewindow": true, - "showLegend": true, - "legendConfig": { - "direction": "column", - "position": "right", - "showMin": true, - "showMax": true, - "showAvg": true, - "showTotal": true - }, "actions": {} }, - "id": "aaa69366-aacc-9028-65aa-645c0f8533ec" + "id": "aaa69366-aacc-9028-65aa-645c0f8533ec", + "typeFullFqn": "system.charts.basic_timeseries" }, "ce5c7d01-a3ef-5cf0-4578-8505135c23a0": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", "sizeX": 17, "sizeY": 4, "config": { @@ -751,6 +749,15 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "right", + "showMin": true, + "showMax": true, + "showAvg": true, + "showTotal": true } }, "title": "Real time information", @@ -769,25 +776,13 @@ "widgetStyle": {}, "useDashboardTimewindow": false, "displayTimewindow": true, - "showLegend": true, - "legendConfig": { - "direction": "column", - "position": "right", - "showMin": true, - "showMax": true, - "showAvg": true, - "showTotal": true - }, "actions": {} }, - "id": "ce5c7d01-a3ef-5cf0-4578-8505135c23a0" + "id": "ce5c7d01-a3ef-5cf0-4578-8505135c23a0", + "typeFullFqn": "system.charts.basic_timeseries" }, "466f046d-6005-a168-b107-60fcb2469cd5": { - "isSystemType": true, - "bundleAlias": "gateway_widgets", - "typeAlias": "attributes_card", "type": "latest", - "title": "New widget", "sizeX": 7, "sizeY": 5, "config": { @@ -799,8 +794,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085270425, + "endTimeMs": 1694171670425 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": true, @@ -832,14 +846,11 @@ "showLegend": false, "actions": {} }, - "id": "466f046d-6005-a168-b107-60fcb2469cd5" + "id": "466f046d-6005-a168-b107-60fcb2469cd5", + "typeFullFqn": "system.gateway_widgets.attributes_card" }, "8fc32225-164f-3258-73f7-e6b6d959cf0b": { - "isSystemType": true, - "bundleAlias": "gateway_widgets", - "typeAlias": "config_form_latest", "type": "latest", - "title": "New widget", "sizeX": 10, "sizeY": 9, "config": { @@ -851,8 +862,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085270425, + "endTimeMs": 1694171670425 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": true, @@ -881,14 +911,11 @@ "showLegend": false, "actions": {} }, - "id": "8fc32225-164f-3258-73f7-e6b6d959cf0b" + "id": "8fc32225-164f-3258-73f7-e6b6d959cf0b", + "typeFullFqn": "system.gateway_widgets.config_form_latest" }, "063fc179-c9fd-f952-e714-f24e9c43c05c": { - "isSystemType": true, - "bundleAlias": "control_widgets", - "typeAlias": "rpcbutton", "type": "rpc", - "title": "New widget", "sizeX": 4, "sizeY": 2, "config": { @@ -930,14 +957,11 @@ "b2487e75-2fa4-f211-142c-434dfd50c70c" ] }, - "id": "063fc179-c9fd-f952-e714-f24e9c43c05c" + "id": "063fc179-c9fd-f952-e714-f24e9c43c05c", + "typeFullFqn": "system.control_widgets.rpcbutton" }, "3c2134cc-27a0-93e1-dbe1-2fa7c1ce16b7": { - "isSystemType": true, - "bundleAlias": "control_widgets", - "typeAlias": "rpcbutton", "type": "rpc", - "title": "New widget", "sizeX": 4, "sizeY": 2, "config": { @@ -979,14 +1003,11 @@ "b2487e75-2fa4-f211-142c-434dfd50c70c" ] }, - "id": "3c2134cc-27a0-93e1-dbe1-2fa7c1ce16b7" + "id": "3c2134cc-27a0-93e1-dbe1-2fa7c1ce16b7", + "typeFullFqn": "system.control_widgets.rpcbutton" }, "6770b6ba-eff8-df05-75f8-c1f9326d4842": { - "isSystemType": true, - "bundleAlias": "input_widgets", - "typeAlias": "markers_placement_openstreetmap", "type": "latest", - "title": "New widget", "sizeX": 6, "sizeY": 4, "config": { @@ -1015,8 +1036,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085270425, + "endTimeMs": 1694171670425 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -1083,7 +1123,8 @@ "titleTooltip": "", "displayTimewindow": true }, - "id": "6770b6ba-eff8-df05-75f8-c1f9326d4842" + "id": "6770b6ba-eff8-df05-75f8-c1f9326d4842", + "typeFullFqn": "system.input_widgets.markers_placement_openstreetmap" } }, "states": { @@ -1108,7 +1149,8 @@ "autoFillHeight": true, "mobileAutoFillHeight": false, "mobileRowHeight": 70, - "margin": 10 + "margin": 10, + "outerMargin": true } } } @@ -1158,7 +1200,8 @@ "autoFillHeight": true, "mobileAutoFillHeight": false, "mobileRowHeight": 70, - "margin": 10 + "margin": 10, + "outerMargin": true } } } @@ -1211,7 +1254,8 @@ "autoFillHeight": true, "mobileAutoFillHeight": true, "mobileRowHeight": 70, - "margin": 10 + "margin": 10, + "outerMargin": true } } } @@ -1224,8 +1268,10 @@ "filter": { "type": "deviceType", "resolveMultiple": true, - "deviceType": "gateway", - "deviceNameFilter": "" + "deviceNameFilter": "", + "deviceTypes": [ + "gateway" + ] } }, "b2487e75-2fa4-f211-142c-434dfd50c70c": { @@ -1261,7 +1307,9 @@ "showDashboardExport": true, "toolbarAlwaysOpen": true, "titleColor": "rgba(0,0,0,0.870588)" - } + }, + "filters": {} }, + "externalId": null, "name": "Gateways" -} +} \ No newline at end of file diff --git a/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json b/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json index b8231ab880..c84faa359e 100644 --- a/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json +++ b/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json @@ -1,13 +1,12 @@ { "title": "Rule Engine Statistics", + "image": null, + "mobileHide": false, + "mobileOrder": null, "configuration": { "widgets": { "81987f19-3eac-e4ce-b790-d96e9b54d9a0": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", "sizeX": 12, "sizeY": 7, "config": { @@ -151,6 +150,15 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "showMin": true, + "showMax": true, + "showAvg": false, + "showTotal": true } }, "title": "Queue Stats", @@ -169,25 +177,13 @@ "widgetStyle": {}, "useDashboardTimewindow": false, "displayTimewindow": true, - "showLegend": true, - "actions": {}, - "legendConfig": { - "direction": "column", - "position": "bottom", - "showMin": true, - "showMax": true, - "showAvg": false, - "showTotal": true - } + "actions": {} }, - "id": "81987f19-3eac-e4ce-b790-d96e9b54d9a0" + "id": "81987f19-3eac-e4ce-b790-d96e9b54d9a0", + "typeFullFqn": "system.charts.basic_timeseries" }, "5eb79712-5c24-3060-7e4f-6af36b8f842d": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "timeseries_table", "type": "timeseries", - "title": "New widget", "sizeX": 24, "sizeY": 5, "config": { @@ -272,14 +268,11 @@ "titleTooltip": "", "displayTimewindow": true }, - "id": "5eb79712-5c24-3060-7e4f-6af36b8f842d" + "id": "5eb79712-5c24-3060-7e4f-6af36b8f842d", + "typeFullFqn": "system.cards.timeseries_table" }, "ad3f1417-87a8-750e-fc67-49a2de1466d4": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", "sizeX": 12, "sizeY": 7, "config": { @@ -393,6 +386,15 @@ "xaxisSecond": { "axisPosition": "top", "showLabels": true + }, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "showMin": true, + "showMax": true, + "showAvg": false, + "showTotal": true } }, "title": "Processing Failures and Timeouts", @@ -411,18 +413,10 @@ "widgetStyle": {}, "useDashboardTimewindow": false, "displayTimewindow": true, - "showLegend": true, - "actions": {}, - "legendConfig": { - "direction": "column", - "position": "bottom", - "showMin": true, - "showMax": true, - "showAvg": false, - "showTotal": true - } + "actions": {} }, - "id": "ad3f1417-87a8-750e-fc67-49a2de1466d4" + "id": "ad3f1417-87a8-750e-fc67-49a2de1466d4", + "typeFullFqn": "system.charts.basic_timeseries" } }, "states": { @@ -457,14 +451,12 @@ "backgroundColor": "#eeeeee", "color": "rgba(0,0,0,0.870588)", "columns": 24, - "margins": [ - 10, - 10 - ], "backgroundSizeMode": "100%", "autoFillHeight": true, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "margin": 10, + "outerMargin": true } } } @@ -477,8 +469,10 @@ "filter": { "type": "assetType", "resolveMultiple": true, - "assetType": "TbServiceQueue", - "assetNameFilter": "" + "assetNameFilter": "", + "assetTypes": [ + "TbServiceQueue" + ] } } }, @@ -514,7 +508,9 @@ "showDashboardTimewindow": true, "showDashboardExport": true, "toolbarAlwaysOpen": true - } + }, + "filters": {} }, + "externalId": null, "name": "Rule Engine Statistics" } \ No newline at end of file diff --git a/application/src/main/data/json/demo/dashboards/software.json b/application/src/main/data/json/demo/dashboards/software.json index e9d7e9bbbd..eea81e5368 100644 --- a/application/src/main/data/json/demo/dashboards/software.json +++ b/application/src/main/data/json/demo/dashboards/software.json @@ -1,24 +1,34 @@ { "title": "Software", "image": null, + "mobileHide": false, + "mobileOrder": null, "configuration": { "description": "", "widgets": { "cd03188e-cd9d-9601-fd57-da4cb95fc016": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085343279, + "endTimeMs": 1694171743279 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -299,16 +309,11 @@ }, "row": 0, "col": 0, - "id": "cd03188e-cd9d-9601-fd57-da4cb95fc016" + "id": "cd03188e-cd9d-9601-fd57-da4cb95fc016", + "typeFullFqn": "system.cards.entities_table" }, "100b756c-0082-6505-3ae1-3603e6deea48": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "timeseries_table", "type": "timeseries", - "title": "New widget", - "image": null, - "description": null, "sizeX": 8, "sizeY": 6.5, "config": { @@ -461,14 +466,11 @@ }, "row": 0, "col": 0, - "id": "100b756c-0082-6505-3ae1-3603e6deea48" + "id": "100b756c-0082-6505-3ae1-3603e6deea48", + "typeFullFqn": "system.cards.timeseries_table" }, "17543c57-af4a-2c1e-bf12-53a7b46791e6": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 8, "sizeY": 3, "config": { @@ -496,8 +498,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085343280, + "endTimeMs": 1694171743280 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -545,14 +566,11 @@ "enableDataExport": false, "displayTimewindow": true }, - "id": "17543c57-af4a-2c1e-bf12-53a7b46791e6" + "id": "17543c57-af4a-2c1e-bf12-53a7b46791e6", + "typeFullFqn": "system.cards.html_value_card" }, "6c1c4e1a-bce0-f5ad-ff8b-ba1dfc5a4ec6": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 8, "sizeY": 3, "config": { @@ -580,8 +598,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085343280, + "endTimeMs": 1694171743280 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -629,14 +666,11 @@ "enableDataExport": false, "displayTimewindow": true }, - "id": "6c1c4e1a-bce0-f5ad-ff8b-ba1dfc5a4ec6" + "id": "6c1c4e1a-bce0-f5ad-ff8b-ba1dfc5a4ec6", + "typeFullFqn": "system.cards.html_value_card" }, "e6674227-9cf3-a2f6-ecac-5ccfc38a3c81": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 8, "sizeY": 3, "config": { @@ -664,8 +698,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085343280, + "endTimeMs": 1694171743280 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -713,14 +766,11 @@ "enableDataExport": false, "displayTimewindow": true }, - "id": "e6674227-9cf3-a2f6-ecac-5ccfc38a3c81" + "id": "e6674227-9cf3-a2f6-ecac-5ccfc38a3c81", + "typeFullFqn": "system.cards.html_value_card" }, "77b10144-b904-edd5-8c7c-8fb75616c6d8": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "html_value_card", "type": "latest", - "title": "New widget", "sizeX": 8, "sizeY": 3, "config": { @@ -748,8 +798,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085343280, + "endTimeMs": 1694171743280 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -797,23 +866,32 @@ "enableDataExport": false, "displayTimewindow": true }, - "id": "77b10144-b904-edd5-8c7c-8fb75616c6d8" + "id": "77b10144-b904-edd5-8c7c-8fb75616c6d8", + "typeFullFqn": "system.cards.html_value_card" }, "21be08bb-ec90-f760-ad6f-e7678f12c401": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085343280, + "endTimeMs": 1694171743280 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -1094,23 +1172,32 @@ }, "row": 0, "col": 0, - "id": "21be08bb-ec90-f760-ad6f-e7678f12c401" + "id": "21be08bb-ec90-f760-ad6f-e7678f12c401", + "typeFullFqn": "system.cards.entities_table" }, "e8280043-d3dc-7acb-c2ff-a4522972ff91": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085343280, + "endTimeMs": 1694171743280 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -1391,23 +1478,32 @@ }, "row": 0, "col": 0, - "id": "e8280043-d3dc-7acb-c2ff-a4522972ff91" + "id": "e8280043-d3dc-7acb-c2ff-a4522972ff91", + "typeFullFqn": "system.cards.entities_table" }, "3624013b-378c-f110-5eba-ae95c25a4dcc": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085343280, + "endTimeMs": 1694171743280 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -1688,23 +1784,32 @@ }, "row": 0, "col": 0, - "id": "3624013b-378c-f110-5eba-ae95c25a4dcc" + "id": "3624013b-378c-f110-5eba-ae95c25a4dcc", + "typeFullFqn": "system.cards.entities_table" }, "d2d13e0d-4e71-889f-9343-ad2f0af9f176": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", - "image": null, - "description": null, "sizeX": 7.5, "sizeY": 6.5, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085343280, + "endTimeMs": 1694171743280 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -1985,7 +2090,8 @@ }, "row": 0, "col": 0, - "id": "d2d13e0d-4e71-889f-9343-ad2f0af9f176" + "id": "d2d13e0d-4e71-889f-9343-ad2f0af9f176", + "typeFullFqn": "system.cards.entities_table" } }, "states": { @@ -2035,7 +2141,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": true, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2062,7 +2169,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2089,7 +2197,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2116,7 +2225,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2143,7 +2253,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2170,7 +2281,8 @@ "autoFillHeight": true, "backgroundImageUrl": null, "mobileAutoFillHeight": false, - "mobileRowHeight": 70 + "mobileRowHeight": 70, + "outerMargin": true } } } @@ -2488,5 +2600,6 @@ "showUpdateDashboardImage": false } }, + "externalId": null, "name": "Software" } \ No newline at end of file diff --git a/application/src/main/data/json/demo/dashboards/thermostats.json b/application/src/main/data/json/demo/dashboards/thermostats.json index c014d8875a..967c1cb253 100644 --- a/application/src/main/data/json/demo/dashboards/thermostats.json +++ b/application/src/main/data/json/demo/dashboards/thermostats.json @@ -1,20 +1,33 @@ { "title": "Thermostats", + "image": null, + "mobileHide": false, + "mobileOrder": null, "configuration": { "widgets": { "f33c746c-0dfc-c212-395b-b448c8a17209": { - "isSystemType": true, - "bundleAlias": "cards", - "typeAlias": "entities_table", "type": "latest", - "title": "New widget", "sizeX": 11, "sizeY": 11, "config": { "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { + "realtimeType": 1, "interval": 1000, - "timewindowMs": 86400000 + "timewindowMs": 86400000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085177686, + "endTimeMs": 1694171577686 + }, + "quickInterval": "CURRENT_DAY" }, "aggregation": { "type": "NONE", @@ -184,14 +197,11 @@ "rowClick": [] } }, - "id": "f33c746c-0dfc-c212-395b-b448c8a17209" + "id": "f33c746c-0dfc-c212-395b-b448c8a17209", + "typeFullFqn": "system.cards.entities_table" }, "7943196b-eedb-d422-f9c3-b32d379ad172": { - "isSystemType": true, - "bundleAlias": "alarm_widgets", - "typeAlias": "alarms_table", "type": "alarm", - "title": "New widget", "sizeX": 13, "sizeY": 5, "config": { @@ -230,7 +240,7 @@ "titleStyle": { "fontSize": "16px", "fontWeight": 400, - "padding": "5px 10px 5px 10px" + "padding": "5px 10px 5px 2px" }, "useDashboardTimewindow": false, "showLegend": false, @@ -290,7 +300,6 @@ } ] }, - "alarmSearchStatus": "ANY", "alarmsPollingInterval": 5, "showTitleIcon": false, "titleIcon": null, @@ -302,16 +311,22 @@ "actions": {}, "datasources": [], "alarmsMaxCountLoad": 0, - "alarmsFetchSize": 100 + "alarmsFetchSize": 100, + "alarmFilterConfig": { + "statusList": [], + "severityList": [], + "typeList": [], + "searchPropagatedAlarms": true + }, + "widgetCss": "", + "pageSize": 1024, + "noDataDisplayMessage": "" }, - "id": "7943196b-eedb-d422-f9c3-b32d379ad172" + "id": "7943196b-eedb-d422-f9c3-b32d379ad172", + "typeFullFqn": "system.alarm_widgets.alarms_table" }, "14a19183-f0b2-d6be-0f62-9863f0a51111": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", "sizeX": 18, "sizeY": 6, "config": { @@ -395,7 +410,16 @@ "axisPosition": "top", "showLabels": true }, - "smoothLines": true + "smoothLines": true, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "showMin": true, + "showMax": true, + "showAvg": true, + "showTotal": false + } }, "title": "Temperature", "dropShadow": true, @@ -413,25 +437,13 @@ "widgetStyle": {}, "useDashboardTimewindow": false, "displayTimewindow": true, - "showLegend": true, - "legendConfig": { - "direction": "column", - "position": "bottom", - "showMin": true, - "showMax": true, - "showAvg": true, - "showTotal": false - }, "actions": {} }, - "id": "14a19183-f0b2-d6be-0f62-9863f0a51111" + "id": "14a19183-f0b2-d6be-0f62-9863f0a51111", + "typeFullFqn": "system.charts.basic_timeseries" }, "07f49fd5-a73b-d74c-c220-362c20af81f4": { - "isSystemType": true, - "bundleAlias": "charts", - "typeAlias": "basic_timeseries", "type": "timeseries", - "title": "New widget", "sizeX": 18, "sizeY": 6, "config": { @@ -515,7 +527,16 @@ "axisPosition": "top", "showLabels": true }, - "smoothLines": true + "smoothLines": true, + "showLegend": true, + "legendConfig": { + "direction": "column", + "position": "bottom", + "showMin": true, + "showMax": true, + "showAvg": true, + "showTotal": false + } }, "title": "Humidity", "dropShadow": true, @@ -533,25 +554,13 @@ "widgetStyle": {}, "useDashboardTimewindow": false, "displayTimewindow": true, - "showLegend": true, - "legendConfig": { - "direction": "column", - "position": "bottom", - "showMin": true, - "showMax": true, - "showAvg": true, - "showTotal": false - }, "actions": {} }, - "id": "07f49fd5-a73b-d74c-c220-362c20af81f4" + "id": "07f49fd5-a73b-d74c-c220-362c20af81f4", + "typeFullFqn": "system.charts.basic_timeseries" }, "c4631f94-2db3-523b-4d09-2a1a0a75d93f": { - "isSystemType": true, - "bundleAlias": "input_widgets", - "typeAlias": "update_multiple_attributes", "type": "latest", - "title": "New widget", "sizeX": 6, "sizeY": 6, "config": { @@ -626,8 +635,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085177686, + "endTimeMs": 1694171577686 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": true, @@ -661,14 +689,11 @@ "titleTooltip": "", "displayTimewindow": true }, - "id": "c4631f94-2db3-523b-4d09-2a1a0a75d93f" + "id": "c4631f94-2db3-523b-4d09-2a1a0a75d93f", + "typeFullFqn": "system.input_widgets.update_multiple_attributes" }, "3da9a9a1-0b9a-2e1f-0dcb-0ff34a695abb": { - "isSystemType": true, - "bundleAlias": "maps_v2", - "typeAlias": "openstreetmap", "type": "latest", - "title": "New widget", "sizeX": 13, "sizeY": 6, "config": { @@ -725,8 +750,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085177686, + "endTimeMs": 1694171577686 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -802,14 +846,11 @@ "titleTooltip": "", "displayTimewindow": true }, - "id": "3da9a9a1-0b9a-2e1f-0dcb-0ff34a695abb" + "id": "3da9a9a1-0b9a-2e1f-0dcb-0ff34a695abb", + "typeFullFqn": "system.maps_v2.openstreetmap" }, "00fb2742-ba1f-7e43-673f-d6c08b72ed06": { - "isSystemType": true, - "bundleAlias": "input_widgets", - "typeAlias": "markers_placement_openstreetmap", "type": "latest", - "title": "New widget", "sizeX": 24, "sizeY": 12, "config": { @@ -864,8 +905,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085177686, + "endTimeMs": 1694171577686 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -937,14 +997,11 @@ "titleTooltip": "", "displayTimewindow": true }, - "id": "00fb2742-ba1f-7e43-673f-d6c08b72ed06" + "id": "00fb2742-ba1f-7e43-673f-d6c08b72ed06", + "typeFullFqn": "system.input_widgets.markers_placement_openstreetmap" }, "0a430429-9078-9ae6-2b67-e4a15a2bf8bf": { - "isSystemType": true, - "bundleAlias": "input_widgets", - "typeAlias": "markers_placement_openstreetmap", "type": "latest", - "title": "New widget", "sizeX": 6, "sizeY": 6, "config": { @@ -999,8 +1056,27 @@ } ], "timewindow": { + "displayValue": "", + "selectedTab": 0, "realtime": { - "timewindowMs": 60000 + "realtimeType": 1, + "interval": 1000, + "timewindowMs": 60000, + "quickInterval": "CURRENT_DAY" + }, + "history": { + "historyType": 0, + "interval": 1000, + "timewindowMs": 60000, + "fixedTimewindow": { + "startTimeMs": 1694085177686, + "endTimeMs": 1694171577686 + }, + "quickInterval": "CURRENT_DAY" + }, + "aggregation": { + "type": "AVG", + "limit": 25000 } }, "showTitle": false, @@ -1073,7 +1149,8 @@ "titleTooltip": "", "displayTimewindow": true }, - "id": "0a430429-9078-9ae6-2b67-e4a15a2bf8bf" + "id": "0a430429-9078-9ae6-2b67-e4a15a2bf8bf", + "typeFullFqn": "system.input_widgets.markers_placement_openstreetmap" } }, "states": { @@ -1110,7 +1187,8 @@ "autoFillHeight": true, "mobileAutoFillHeight": false, "mobileRowHeight": 70, - "margin": 10 + "margin": 10, + "outerMargin": true } } } @@ -1136,7 +1214,8 @@ "autoFillHeight": true, "mobileAutoFillHeight": false, "mobileRowHeight": 70, - "margin": 10 + "margin": 10, + "outerMargin": true } } } @@ -1182,7 +1261,8 @@ "autoFillHeight": true, "mobileAutoFillHeight": false, "mobileRowHeight": 70, - "margin": 10 + "margin": 10, + "outerMargin": true } } } @@ -1195,8 +1275,10 @@ "filter": { "type": "deviceType", "resolveMultiple": true, - "deviceType": "thermostat", - "deviceNameFilter": "" + "deviceNameFilter": "", + "deviceTypes": [ + "thermostat" + ] } }, "12ae98c7-1ea2-52cf-64d5-763e9d993547": { @@ -1245,5 +1327,6 @@ }, "filters": {} }, + "externalId": null, "name": "Thermostats" } \ No newline at end of file