fix: correct query merging order in BaseModelTable component

OneUptime · Jan 13, 2025 · fc0869d · fc0869d
1 parent fb5646e
commit fc0869d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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,