upd catalog list

Author: ikethecoder

src/controllers/v3/OrgProductController.ts

@@ -31,6 +31,9 @@ import { ProductCatalog, ProductCatalogOperation } from './types-extra';
 import { gql } from 'graphql-request';
 import { Environment } from '../../services/keystone/types';
 import YAML from 'yaml';
+import { getGwaProductEnvironment } from '../../services/workflow';
+import { NamespaceService } from '../../services/org-groups';
+import { OrgNamespace } from '../../services/org-groups/types';
 
 @injectable()
 @Route('/organizations')
@@ -60,9 +63,10 @@ export class OrgProductController extends Controller {
       (e: Environment) => e.product.organization != null
     );
 
-    return envs.map((env: any) => {
+    const output = envs.map((env: any) => {
       const spec = YAML.parse(env.spec?.blob || '{}');
 
+      
       const operations = spec?.paths && Object.keys(spec.paths).map((path) => {
         return Object.keys(spec.paths[path]).map((method) => {
           const op = spec.paths[path][method];
@@ -100,6 +104,15 @@ export class OrgProductController extends Controller {
         },
       };
     });
+
+    const promises = output.filter((env:any) => env.product.namespace).map(async (env: any) => {
+      const nsAttributes = await getNamespaceAttributes(
+        env.product.namespace
+      );
+      env.ns = nsAttributes;
+    });
+    await Promise.all(promises);
+    return output;
   }
 
   /**
@@ -178,10 +191,21 @@ const list = gql`
       }
       product {
         name
+        namespace
         organization {
           name
         }
       }
     }
   }
 `;
+
+
+async function getNamespaceAttributes(ns: string) : Promise<OrgNamespace> {
+      const prodEnv = await getGwaProductEnvironment(this.keystone.sudo(), false);
+      const envConfig = prodEnv.issuerEnvConfig;
+  
+      const svc = new NamespaceService(envConfig.issuerUrl);
+      await svc.login(envConfig.clientId, envConfig.clientSecret);
+      return await svc.getNamespaceOrganizationDetails(ns);
+}

src/controllers/v3/openapi.yaml

@@ -731,11 +731,37 @@ components:
                         - organization
                         - name
                     type: object
+                ns:
+                    properties:
+                        updatedAt:
+                            type: number
+                            format: double
+                        enabled:
+                            type: boolean
+                        permDomains:
+                            items:
+                                type: string
+                            type: array
+                        permDataPlane:
+                            type: string
+                        orgUnit:
+                            type: string
+                        name:
+                            type: string
+                    required:
+                        - updatedAt
+                        - enabled
+                        - permDomains
+                        - permDataPlane
+                        - orgUnit
+                        - name
+                    type: object
             required:
                 - appId
                 - name
                 - spec
                 - product
+                - ns
             type: object
             additionalProperties: false
         DraftDatasetRefID:

src/controllers/v3/routes.ts

@@ -424,6 +424,7 @@ const models: TsoaRoute.Models = {
             "name": {"dataType":"string","required":true},
             "spec": {"dataType":"nestedObjectLiteral","nestedProperties":{"operations":{"dataType":"array","array":{"dataType":"refObject","ref":"ProductCatalogOperation"},"required":true},"description":{"dataType":"string","required":true},"version":{"dataType":"string","required":true},"title":{"dataType":"string","required":true}},"required":true},
             "product": {"dataType":"nestedObjectLiteral","nestedProperties":{"organization":{"dataType":"nestedObjectLiteral","nestedProperties":{"name":{"dataType":"string","required":true}},"required":true},"name":{"dataType":"string","required":true}},"required":true},
+            "ns": {"dataType":"nestedObjectLiteral","nestedProperties":{"updatedAt":{"dataType":"double","required":true},"enabled":{"dataType":"boolean","required":true},"permDomains":{"dataType":"array","array":{"dataType":"string"},"required":true},"permDataPlane":{"dataType":"string","required":true},"orgUnit":{"dataType":"string","required":true},"name":{"dataType":"string","required":true}},"required":true},
         },
         "additionalProperties": false,
     },

src/controllers/v3/types-extra.ts

@@ -100,4 +100,12 @@ export interface ProductCatalog {
       name: string;
     }
   }
+  ns: {
+    name: string;
+    orgUnit: string;
+    permDataPlane: string;
+    permDomains: string[];
+    enabled: boolean;
+    updatedAt: number;
+  }
 }

src/services/org-groups/namespace.ts

@@ -184,10 +184,10 @@ export class NamespaceService {
   async getNamespaceOrganizationDetails(ns: string): Promise<OrgNamespace> {
     const nsGroup = await this.groupService.findByName('ns', ns, false);
 
-    if ('org' in nsGroup.attributes && 'org-unit' in nsGroup.attributes) {
+    if ('org' in nsGroup.attributes) {
       return {
         name: nsGroup.attributes['org'].pop(),
-        orgUnit: nsGroup.attributes['org-unit'].pop(),
+        orgUnit: 'org-unit' in nsGroup.attributes ? nsGroup.attributes['org-unit'].pop() : '',
         permDataPlane:
           'perm-data-plane' in nsGroup.attributes
             ? nsGroup.attributes['perm-data-plane'] : '',