jprdonnelly/kestra
1
0
Fork 0
mirror of https://github.com/kestra-io/kestra.git synced 2025-12-19 09:50:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): prevent default namespace from being applied to filters without namespace key (#13767)

Browse Source
This commit is contained in:
Piyush Bhaskar
2025-12-19 18:55:13 +05:30
committed by GitHub
parent d16a8de90f
commit e433833e62
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ui/src/components/filter/composables/useDefaultFilter.ts
View File

@@ -4,7 +4,7 @@ import {useMiscStore} from "override/stores/misc";
import {defaultNamespace} from "../../../composables/useNamespaces"; import {defaultNamespace} from "../../../composables/useNamespaces";
interface DefaultFilterOptions { interface DefaultFilterOptions {
namespace?: string; namespace?: string | null;
includeTimeRange?: boolean; includeTimeRange?: boolean;
includeScope?: boolean; includeScope?: boolean;
legacyQuery?: boolean; legacyQuery?: boolean;
@@ -29,7 +29,8 @@ export function applyDefaultFilters(
const query = {...currentQuery}; const query = {...currentQuery};
let change = false; 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(); query[legacyQuery ? "namespace" : `${NAMESPACE_FILTER_PREFIX}[PREFIX]`] = defaultNamespace();
change = true; change = true;
} }

1
ui/src/components/filter/composables/useFilters.ts
View File

@@ -399,6 +399,7 @@ export function useFilters(
const {resetDefaultFilter} = useDefaultFilter({ const {resetDefaultFilter} = useDefaultFilter({
legacyQuery, legacyQuery,
namespace: configuration.keys?.some((k) => k.key === "namespace") ? undefined : null,
includeScope: defaultScope ?? configuration.keys?.some((k) => k.key === "scope"), includeScope: defaultScope ?? configuration.keys?.some((k) => k.key === "scope"),
includeTimeRange: defaultTimeRange ?? configuration.keys?.some((k) => k.key === "timeRange"), includeTimeRange: defaultTimeRange ?? configuration.keys?.some((k) => k.key === "timeRange"),
}); });