From c35fc5c41e0e0b7d6730e00f97ed844598bce5ef Mon Sep 17 00:00:00 2001
From: William Fitzjohn <78922151+WilliamFitzjohn@users.noreply.github.com>
Date: Tue, 9 Sep 2025 07:14:42 -0400
Subject: [PATCH] Fix: [#2042] replaceAlias function ordering in the query
 editor causing buggy ui interactions (#2043)

Resolves #2042
Fixed a bug that caused strange behaviour when adding multiple
replaceAlias functions
---
 .../components/QueryEditor/QueryFunctionsEditor.tsx  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/datasource/components/QueryEditor/QueryFunctionsEditor.tsx b/src/datasource/components/QueryEditor/QueryFunctionsEditor.tsx
index 518f53b..1b2eb1f 100644
--- a/src/datasource/components/QueryEditor/QueryFunctionsEditor.tsx
+++ b/src/datasource/components/QueryEditor/QueryFunctionsEditor.tsx
@@ -70,13 +70,7 @@ export const QueryFunctionsEditor = ({ query, onChange }: Props) => {
 };
 
 function moveAliasFuncLast(functions: MetricFunc[]) {
-  const aliasFuncIndex = functions.findIndex((func) => func.def.category === 'Alias');
-
-  console.log(aliasFuncIndex);
-  if (aliasFuncIndex >= 0) {
-    const aliasFunc = functions[aliasFuncIndex];
-    functions.splice(aliasFuncIndex, 1);
-    functions.push(aliasFunc);
-  }
-  return functions;
+  const aliasFuncs = functions.filter((func) => func.def.category === 'Alias');
+  const nonAliasFuncs = functions.filter((func) => func.def.category !== 'Alias');
+  return [...nonAliasFuncs, ...aliasFuncs];
 }