opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 16:42:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

ConvertFieldType: Update "join with" to work on array of strings (#105074)

Browse Source 
* fix: update join with to work on array of strings

* chore: simplify

* chore: cleanup

* chore: add tests!

* fix: more robust check
This commit is contained in:
Alex Spencer
2025-05-15 08:17:57 -06:00
committed by GitHub
parent f7cad3a2fe
commit b77bf98890
3 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/grafana-data/src/transformations/transformers/convertFieldType.test.ts
View File

@ -359,7 +359,7 @@ describe('field convert types transformer', () => {
]);
});
it('will support custom join separators', () => {
it('will support custom join separators for field type other', () => {
const options = {
conversions: [{ targetField: 'vals', destinationType: FieldType.string, joinWith: '|' }],
};
@ -391,6 +391,38 @@ describe('field convert types transformer', () => {
]);
});
it('will support custom join separators for field type string', () => {
const options = {
conversions: [{ targetField: 'string_arrays', destinationType: FieldType.string, joinWith: '&' }],
};
const stringArrayValues = toDataFrame({
fields: [
{
name: 'string_arrays',
type: FieldType.string,
values: [
['a', 'b', 'c'],
['d', 'e', 'f'],
],
},
],
});
const stringified = convertFieldTypes(options, [stringArrayValues]);
expect(
stringified[0].fields.map(({ type, values }) => ({
type,
values,
}))
).toEqual([
{
type: FieldType.string,
values: ['a&b&c', 'd&e&f'],
},
]);
});
it('will convert time fields to strings', () => {
const options = {
conversions: [{ targetField: 'time', destinationType: FieldType.string, dateFormat: 'YYYY-MM' }],

5
packages/grafana-data/src/transformations/transformers/convertFieldType.ts
View File

@ -210,12 +210,15 @@ export function fieldToStringField(
values = values.map((v) => dateTimeParse(v, parseOptions).format(dateFormat));
break;
// Handle both "string" and "other" types to ensure compatibility across Grafana versions (10 & 11)
// In some cases fields are classified as 'other' in Grafana 10 but as 'string' in Grafana 11
case FieldType.string:
case FieldType.other:
values = values.map((v) => {
if (joinWith?.length && Array.isArray(v)) {
return v.join(joinWith);
}
return JSON.stringify(v); // will quote strings and avoid "object"
return field.type === FieldType.other ? JSON.stringify(v) : `${v}`;
});
break;