fix(ui): ApplicationSet detail view for non-default namespace (#27928) (#27931)

Signed-off-by: Asif Draxi <asifdraxi@gmail.com>

Author: AsifAd

ui/src/app/shared/services/applications-service.namespace.test.ts

@@ -0,0 +1,22 @@
+import {namespaceQuery, namespaceQueryKey} from './applications-service.namespace';
+
+describe('ApplicationSet namespace query params', () => {
+    it('uses appNamespace for applications', () => {
+        expect(namespaceQueryKey('application')).toBe('appNamespace');
+        expect(namespaceQuery('application', 'team-platform')).toEqual({appNamespace: 'team-platform'});
+    });
+
+    it('uses appsetNamespace for ApplicationSet GET/resource-tree', () => {
+        expect(namespaceQueryKey('applicationset')).toBe('appsetNamespace');
+        expect(namespaceQuery('applicationset', 'team-platform')).toEqual({appsetNamespace: 'team-platform'});
+    });
+
+    it('uses appSetNamespace for ApplicationSet watch stream', () => {
+        expect(namespaceQueryKey('applicationset', true)).toBe('appSetNamespace');
+        expect(namespaceQuery('applicationset', 'team-platform', true)).toEqual({appSetNamespace: 'team-platform'});
+    });
+
+    it('returns empty object when namespace is empty', () => {
+        expect(namespaceQuery('applicationset', '')).toEqual({});
+    });
+});

ui/src/app/shared/services/applications-service.namespace.ts

@@ -0,0 +1,11 @@
+/** Application API uses appNamespace; ApplicationSet API uses appsetNamespace (appSetNamespace for watch stream). */
+export function namespaceQueryKey(objectListKind: string, forWatch = false): string {
+    return objectListKind === 'application' ? 'appNamespace' : forWatch ? 'appSetNamespace' : 'appsetNamespace';
+}
+
+export function namespaceQuery(objectListKind: string, namespace: string, forWatch = false): {[key: string]: string} {
+    if (!namespace) {
+        return {};
+    }
+    return {[namespaceQueryKey(objectListKind, forWatch)]: namespace};
+}

ui/src/app/shared/services/applications-service.ts

@@ -6,6 +6,7 @@ import * as models from '../models';
 import {isValidURL} from '../utils';
 import requests from './requests';
 import {getRootPathByApp, isApp} from '../../applications/components/utils';
+import {namespaceQuery, namespaceQueryKey} from './applications-service.namespace';
 
 interface QueryOptions {
     fields: string[];
@@ -59,15 +60,12 @@ export class ApplicationsService {
     }
 
     public get(name: string, appNamespace: string, objectListKind: string, refresh?: 'normal' | 'hard'): Promise<models.AbstractApplication> {
-        const query: {[key: string]: string} = {};
+        const query: {[key: string]: string} = {...namespaceQuery(objectListKind, appNamespace)};
         const isApplication = objectListKind === 'application';
         const endpoint = isApplication ? '/applications' : '/applicationsets';
         if (refresh) {
             query.refresh = refresh;
         }
-        if (appNamespace) {
-            query.appNamespace = appNamespace;
-        }
         return requests
             .get(`${endpoint}/${name}`)
             .query(query)
@@ -119,7 +117,7 @@ export class ApplicationsService {
         const endpoint = isApplication ? '/applications' : '/applicationsets';
         return requests
             .get(`${endpoint}/${name}/resource-tree`)
-            .query({appNamespace})
+            .query(namespaceQuery(objectListKind, appNamespace))
             .then(res => res.body as models.AbstractApplicationTree);
     }
 
@@ -247,14 +245,16 @@ export class ApplicationsService {
                 search.set('resourceVersion', query.resourceVersion);
             }
             if (query.appNamespace) {
-                search.set('appNamespace', query.appNamespace);
+                search.set(namespaceQueryKey(objectListKind, true), query.appNamespace);
             }
         }
         if (options) {
             const searchOptions = optionsToSearch(options);
             search.set('fields', searchOptions.fields);
             search.set('selector', searchOptions.selector);
-            search.set('appNamespace', searchOptions.appNamespace);
+            if (searchOptions.appNamespace) {
+                search.set(namespaceQueryKey(objectListKind, true), searchOptions.appNamespace);
+            }
             if (isApplication) {
                 query?.projects?.forEach(project => search.append('projects', project));
             }