Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug: Fix queries with a single field #15

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Bug: Fix queries with a single field #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10239c3
fix(uselightsdata): support expressions/ds queries that only have 1 f…
jackw Jun 14, 2024
3f1e991
chore(provisioning): update provisioned dashboard with new features
jackw Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
240 changes: 233 additions & 7 deletions provisioning/dashboards/panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@
"options": {
"horizontal": false,
"minLightWidth": 75,
"reverseColors": false,
"seriesCountSize": "sm",
"showLegend": true,
"showSeriesCount": false,
"showTrend": false,
"showValue": false,
Expand Down Expand Up @@ -125,7 +127,9 @@
"options": {
"horizontal": false,
"minLightWidth": 75,
"reverseColors": false,
"seriesCountSize": "sm",
"showLegend": true,
"showSeriesCount": false,
"showTrend": false,
"showValue": true,
Expand Down Expand Up @@ -185,7 +189,9 @@
"options": {
"horizontal": false,
"minLightWidth": 75,
"reverseColors": false,
"seriesCountSize": "sm",
"showLegend": true,
"showSeriesCount": false,
"showTrend": true,
"showValue": true,
Expand Down Expand Up @@ -245,7 +251,9 @@
"options": {
"horizontal": false,
"minLightWidth": 100,
"reverseColors": false,
"seriesCountSize": "sm",
"showLegend": true,
"showSeriesCount": false,
"showTrend": true,
"showValue": true,
Expand Down Expand Up @@ -308,6 +316,8 @@
"options": {
"horizontal": false,
"minLightWidth": 100,
"reverseColors": false,
"showLegend": true,
"showTrend": true,
"showValue": true,
"singleRow": true,
Expand Down Expand Up @@ -361,14 +371,16 @@
},
"gridPos": {
"h": 9,
"w": 24,
"w": 12,
"x": 0,
"y": 21
},
"id": 15,
"options": {
"horizontal": true,
"minLightWidth": 100,
"reverseColors": false,
"showLegend": true,
"showTrend": true,
"showValue": true,
"singleRow": false,
Expand All @@ -389,6 +401,210 @@
"title": "Traffic Light horizontal",
"type": "heywesty-trafficlight-panel"
},
{
"datasource": {
"type": "testdata",
"uid": "P814D78962B0F8AC2"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
"mappings": [],
"thresholds": {
"mode": "percentage",
"steps": [
{
"color": "red",
"value": null
},
{
"color": "#EAB839",
"value": 50
},
{
"color": "#73BF69",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 9,
"w": 12,
"x": 12,
"y": 21
},
"id": 18,
"options": {
"horizontal": true,
"minLightWidth": 100,
"reverseColors": false,
"showLegend": true,
"showTrend": true,
"showValue": true,
"singleRow": true,
"sortLights": "none",
"style": "default"
},
"targets": [
{
"datasource": {
"type": "testdata",
"uid": "P814D78962B0F8AC2"
},
"refId": "A",
"scenarioId": "random_walk",
"seriesCount": 20
}
],
"title": "Traffic Light horizontal",
"type": "heywesty-trafficlight-panel"
},
{
"datasource": {
"type": "testdata",
"uid": "P814D78962B0F8AC2"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
"mappings": [],
"thresholds": {
"mode": "percentage",
"steps": [
{
"color": "red",
"value": null
},
{
"color": "#EAB839",
"value": 50
},
{
"color": "#73BF69",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 9,
"w": 12,
"x": 0,
"y": 30
},
"id": 19,
"options": {
"horizontal": false,
"minLightWidth": 100,
"reverseColors": true,
"showLegend": true,
"showTrend": true,
"showValue": true,
"singleRow": false,
"sortLights": "none",
"style": "default"
},
"targets": [
{
"datasource": {
"type": "testdata",
"uid": "P814D78962B0F8AC2"
},
"refId": "A",
"scenarioId": "random_walk",
"seriesCount": 10
}
],
"title": "Traffic Light reversed colors",
"type": "heywesty-trafficlight-panel"
},
{
"datasource": {
"type": "testdata",
"uid": "P814D78962B0F8AC2"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
"mappings": [],
"thresholds": {
"mode": "percentage",
"steps": [
{
"color": "red",
"value": null
},
{
"color": "#EAB839",
"value": 50
},
{
"color": "#73BF69",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 9,
"w": 12,
"x": 12,
"y": 30
},
"id": 20,
"options": {
"horizontal": false,
"minLightWidth": 100,
"reverseColors": false,
"showLegend": true,
"showTrend": true,
"showValue": true,
"singleRow": true,
"sortLights": "none",
"style": "default"
},
"targets": [
{
"csvContent": "time, value\n100000000, 1",
"datasource": {
"type": "testdata",
"uid": "P814D78962B0F8AC2"
},
"refId": "A",
"scenarioId": "csv_content"
},
{
"datasource": {
"name": "Expression",
"type": "__expr__",
"uid": "__expr__"
},
"expression": "${A}+10",
"hide": false,
"reducer": "last",
"refId": "B",
"settings": {
"mode": "dropNN"
},
"type": "math"
}
],
"title": "Traffic Light expressions",
"type": "heywesty-trafficlight-panel"
},
{
"datasource": {
"type": "testdata",
Expand Down Expand Up @@ -420,12 +636,14 @@
"h": 8,
"w": 8,
"x": 0,
"y": 30
"y": 39
},
"id": 10,
"options": {
"horizontal": false,
"minLightWidth": 75,
"reverseColors": false,
"showLegend": true,
"showTrend": true,
"showValue": true,
"singleRow": false,
Expand Down Expand Up @@ -466,12 +684,14 @@
"h": 8,
"w": 8,
"x": 8,
"y": 30
"y": 39
},
"id": 13,
"options": {
"horizontal": false,
"minLightWidth": 75,
"reverseColors": false,
"showLegend": true,
"showTrend": true,
"showValue": true,
"singleRow": false,
Expand Down Expand Up @@ -523,12 +743,14 @@
"h": 8,
"w": 8,
"x": 16,
"y": 30
"y": 39
},
"id": 14,
"options": {
"horizontal": false,
"minLightWidth": 75,
"reverseColors": false,
"showLegend": true,
"showTrend": true,
"showValue": true,
"singleRow": false,
Expand Down Expand Up @@ -758,12 +980,14 @@
"h": 9,
"w": 12,
"x": 0,
"y": 38
"y": 47
},
"id": 16,
"options": {
"horizontal": false,
"minLightWidth": 100,
"reverseColors": false,
"showLegend": true,
"showTrend": true,
"showValue": true,
"singleRow": false,
Expand Down Expand Up @@ -856,12 +1080,14 @@
"h": 9,
"w": 12,
"x": 12,
"y": 38
"y": 47
},
"id": 17,
"options": {
"horizontal": false,
"minLightWidth": 100,
"reverseColors": false,
"showLegend": true,
"showTrend": true,
"showValue": true,
"singleRow": false,
Expand Down Expand Up @@ -898,6 +1124,6 @@
"timezone": "",
"title": "Traffic Lights Example",
"uid": "O4tc_E6Gz",
"version": 4,
"version": 1,
"weekStart": ""
}
5 changes: 4 additions & 1 deletion src/hooks/useLightsData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@ export function useLightsData(options: UseLightsData): LightsDataResult {
};
});

const trendValue = basicTrend(displayValue.view?.dataFrame.fields[1].values.toArray());
const fieldValues =
displayValue.view?.dataFrame.fields[1]?.values.toArray() ||
displayValue.view?.dataFrame.fields[0]?.values.toArray();
const trendValue = basicTrend(fieldValues);
const trendColor = theme.visualization.getColorByName(getTrendColor(trendValue));

if (!thresholdsValid) {
Expand Down