From 3a05320d005374012192844bca810cececb23f11 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 4 Aug 2021 20:39:29 +0100 Subject: [PATCH] Geomap: Use set to order labels in reducer (#37509) (#37561) * shared location config * shared locaiton config * shared locaiton config * remove file * add alpha annotations * chore: set is already ordered Co-authored-by: Ryan McKinley (cherry picked from commit 968817b15142e84f50568010ee99614bd5a0ba90) Co-authored-by: An --- .../src/transformations/transformers/reduce.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/grafana-data/src/transformations/transformers/reduce.ts b/packages/grafana-data/src/transformations/transformers/reduce.ts index ec229e60a7d..ca06076df40 100644 --- a/packages/grafana-data/src/transformations/transformers/reduce.ts +++ b/packages/grafana-data/src/transformations/transformers/reduce.ts @@ -156,21 +156,17 @@ export function reduceSeriesToRows( } export function getDistinctLabelKeys(frames: DataFrame[]): string[] { - const ordered: string[] = []; const keys = new Set(); for (const frame of frames) { for (const field of frame.fields) { if (field.labels) { for (const k of Object.keys(field.labels)) { - if (!keys.has(k)) { - ordered.push(k); - keys.add(k); - } + keys.add(k); } } } } - return ordered; + return [...keys]; } /**