From fc0869d9feb87cf78f60a0ceb0607f8180ce4b3d Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Mon, 13 Jan 2025 10:50:50 +0000
Subject: [PATCH] fix: correct query merging order in BaseModelTable component

---
 Common/UI/Components/ModelTable/BaseModelTable.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Common/UI/Components/ModelTable/BaseModelTable.tsx b/Common/UI/Components/ModelTable/BaseModelTable.tsx
index 472767f6f6c..7ea6443f806 100644
--- a/Common/UI/Components/ModelTable/BaseModelTable.tsx
+++ b/Common/UI/Components/ModelTable/BaseModelTable.tsx
@@ -661,8 +661,8 @@ const BaseModelTable: <TBaseModel extends BaseModel | AnalyticsBaseModel>(
           | DatabaseBaseModelType
           | AnalyticsBaseModelType,
         query: {
-          ...query,
           ...props.query,
+          ...query,
         },
         limit: LIMIT_PER_PROJECT,
         skip: 0,
@@ -700,8 +700,8 @@ const BaseModelTable: <TBaseModel extends BaseModel | AnalyticsBaseModel>(
           | DatabaseBaseModelType
           | AnalyticsBaseModelType,
         query: {
-          ...query,
           ...props.query,
+          ...query,
         },
         groupBy: {
           ...props.groupBy,