Skip to content

Commit 2fe8982

Browse files
authored
Merge pull request #2775 from headlamp-k8s/allowed-namespaces-fix
frontend: Fix namespace selection when allowed namespaces is set
2 parents f47b2a8 + 1d60400 commit 2fe8982

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

frontend/src/lib/k8s/api/v2/useKubeObjectList.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,12 +348,13 @@ export function makeListRequests(
348348
clusters: string[],
349349
getAllowedNamespaces: (cluster: string | null) => string[],
350350
isResourceNamespaced: boolean,
351-
requestedNamespaces?: string[]
351+
requestedNamespaces: string[] = []
352352
): Array<{ cluster: string; namespaces?: string[] }> {
353353
return clusters.map(cluster => {
354354
const allowedNamespaces = getAllowedNamespaces(cluster);
355355

356-
let namespaces = requestedNamespaces ?? allowedNamespaces;
356+
let namespaces = requestedNamespaces.length > 0 ? requestedNamespaces : allowedNamespaces;
357+
357358
if (allowedNamespaces.length) {
358359
namespaces = namespaces.filter(ns => allowedNamespaces.includes(ns));
359360
}

0 commit comments

Comments
 (0)