From e433833e62b831474e19060b34e982cd5cc4ecbf Mon Sep 17 00:00:00 2001
From: Piyush Bhaskar <102078527+Piyush-r-bhaskar@users.noreply.github.com>
Date: Fri, 19 Dec 2025 18:55:13 +0530
Subject: [PATCH] fix(core): prevent default namespace from being applied to
 filters without namespace key (#13767)

---
 ui/src/components/filter/composables/useDefaultFilter.ts | 5 +++--
 ui/src/components/filter/composables/useFilters.ts       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/filter/composables/useDefaultFilter.ts b/ui/src/components/filter/composables/useDefaultFilter.ts
index 46c2369dba..a63f8eba6a 100644
--- a/ui/src/components/filter/composables/useDefaultFilter.ts
+++ b/ui/src/components/filter/composables/useDefaultFilter.ts
@@ -4,7 +4,7 @@ import {useMiscStore} from "override/stores/misc";
 import {defaultNamespace} from "../../../composables/useNamespaces";
 
 interface DefaultFilterOptions {
-    namespace?: string;
+    namespace?: string | null;
     includeTimeRange?: boolean;
     includeScope?: boolean;
     legacyQuery?: boolean;
@@ -29,7 +29,8 @@ export function applyDefaultFilters(
     const query = {...currentQuery};
     let change = false;
    
-    if (namespace === undefined && defaultNamespace() && !hasFilterKey(query, NAMESPACE_FILTER_PREFIX)) {
+
+    if (namespace !== null && defaultNamespace() && !hasFilterKey(query, NAMESPACE_FILTER_PREFIX)) {
         query[legacyQuery ? "namespace" : `${NAMESPACE_FILTER_PREFIX}[PREFIX]`] = defaultNamespace();
         change = true;
     }
diff --git a/ui/src/components/filter/composables/useFilters.ts b/ui/src/components/filter/composables/useFilters.ts
index 8514960601..5642758491 100644
--- a/ui/src/components/filter/composables/useFilters.ts
+++ b/ui/src/components/filter/composables/useFilters.ts
@@ -399,6 +399,7 @@ export function useFilters(
 
     const {resetDefaultFilter} = useDefaultFilter({
         legacyQuery,
+        namespace: configuration.keys?.some((k) => k.key === "namespace") ? undefined : null,
         includeScope: defaultScope ?? configuration.keys?.some((k) => k.key === "scope"),
         includeTimeRange: defaultTimeRange ?? configuration.keys?.some((k) => k.key === "timeRange"),
     });