public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ValueMappings: Improve singlestat value mappings migration (#35578) (#35636)

Browse Source 
* Migrate singlestat value mappings to new value mappings

* Update public/app/features/dashboard/state/DashboardMigrator.ts

* Update migration to produce single value map

(cherry picked from commit 08bc2b402b)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
This commit is contained in:
Grot (@grafanabot)
2021-06-14 14:11:50 +02:00
committed by GitHub
co-authored by Dominik Prokop
parent 7a96df875b
commit 8db130f746
4 changed files with 158 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/grafana-data/src/utils/valueMappings.ts
+3 -4
View File
@@ -172,7 +172,7 @@ export function getMappedValue(valueMappings: LegacyValueMapping[], value: any):
* @alpha
* Converts the old Angular value mappings to new react style
*/
export function convertOldAngularValueMappings(panel: any): ValueMapping[] {
export function convertOldAngularValueMappings(panel: any, migratedThresholds?: ThresholdsConfig): ValueMapping[] {
const mappings: ValueMapping[] = [];
// Guess the right type based on options
@@ -184,7 +184,6 @@ export function convertOldAngularValueMappings(panel: any): ValueMapping[] {
mappingType = 2;
}
}
if (mappingType === 1) {
for (let i = 0; i < panel.valueMaps.length; i++) {
const map = panel.valueMaps[i];
@@ -195,7 +194,7 @@ export function convertOldAngularValueMappings(panel: any): ValueMapping[] {
id: i, // used for order
type: MappingType.ValueToText,
},
panel.fieldConfig?.defaults?.thresholds
panel.fieldConfig?.defaults?.thresholds || migratedThresholds
)
);
}
@@ -209,7 +208,7 @@ export function convertOldAngularValueMappings(panel: any): ValueMapping[] {
id: i, // used for order
type: MappingType.RangeToText,
},
panel.fieldConfig?.defaults?.thresholds
panel.fieldConfig?.defaults?.thresholds || migratedThresholds
)
);
}