Skip to content

Commit addb13b

Browse files
[BUGFIX] TimeSeriesChart: Grafana migration: handle string value for fillOpacity params (#610)
Signed-off-by: AntoineThebaud <antoine.thebaud@yahoo.fr>
1 parent 37e86f6 commit addb13b

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

timeserieschart/schemas/migrate/migrate.cue

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,11 @@ spec: {
161161
visual: lineStyle: #lineStyleMapping[#lineStyle]
162162
}
163163

164-
#fillOpacity: *#panel.fieldConfig.defaults.custom.fillOpacity | null
164+
#fillOpacityRaw: *#panel.fieldConfig.defaults.custom.fillOpacity | null
165+
#fillOpacity: [
166+
if (#fillOpacityRaw & string) != _|_ {strconv.Atoi(#fillOpacityRaw)},
167+
#fillOpacityRaw,
168+
][0]
165169
if #fillOpacity != null {
166170
visual: areaOpacity: #fillOpacity / 100
167171
}
@@ -202,7 +206,11 @@ spec: {
202206
lineStyle: #lineStyleMapping[property.value.fill]
203207
}
204208
if property.id == "custom.fillOpacity" {
205-
areaOpacity: property.value / 100
209+
#queryFillOpacity: [
210+
if (property.value & string) != _|_ {strconv.Atoi(property.value)},
211+
property.value,
212+
][0]
213+
areaOpacity: #queryFillOpacity / 100
206214
}
207215
}
208216
},

timeserieschart/schemas/migrate/tests/basic-with-logbase/input.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"barAlignment": 0,
1515
"barWidthFactor": 0.6,
1616
"drawStyle": "line",
17-
"fillOpacity": 10,
17+
"fillOpacity": "10",
1818
"gradientMode": "none",
1919
"hideFrom": {
2020
"legend": false,

timeserieschart/schemas/migrate/tests/multiple-overrides/input.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"properties": [
6666
{
6767
"id": "custom.fillOpacity",
68-
"value": 0
68+
"value": "0"
6969
},
7070
{
7171
"id": "custom.lineWidth",

0 commit comments

Comments
 (0)