From 66057462273e4b5d3d4c8f08d6e9d79ef850db64 Mon Sep 17 00:00:00 2001
From: Develer <yeryomin.igor@gmail.com>
Date: Tue, 7 Oct 2025 15:36:03 +0200
Subject: [PATCH] fix(frame): handle empty values correctly in DataFrame
 sorting

---
 .../src/dataframe/processDataFrame.ts            | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts
index 4a028b6b4fd..14621547725 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.ts
@@ -429,18 +429,20 @@ export function sortDataFrame(data: DataFrame, sortIndex?: number, reverse = fal
 
   return {
     ...data,
-    fields: data.fields.map((f) => {
-      const newF = {
-        ...f,
-        values: f.values.map((v, i) => f.values[index[i]]),
+    fields: data.fields.map((field) => {
+      const newValues = Array.from({ length: field.values.length }, (_, i) => field.values[index[i]]);
+
+      const newField = {
+        ...field,
+        values: newValues,
       };
 
       // only add .nanos if it exists
-      const { nanos } = f;
+      const { nanos } = field;
       if (nanos !== undefined) {
-        newF.nanos = nanos.map((n, i) => nanos[index[i]]);
+        newField.nanos = Array.from({ length: nanos.length }, (_, i) => nanos[index[i]]);
       }
-      return newF;
+      return newField;
     }),
   };
 }