Add kcpPath to Luigi context configuration and processing (#98)

gkrajniak · gkrajniaksap · web-flow · commit ed2a14c4e839 · 2025-11-04T09:44:10.000Z
* Add `entityName` and `accountPath` to Luigi context configuration and processing

* Add `entityName` and `accountPath` to Luigi context configuration and processing

* Add kcpPath to node context

* Add kcpPath to node context

* Add kcpPath to node context

* fix tests

* fix tests

* Adjust kcp path calculation

* fix tests

* Add kcpPath to Luigi context configuration and processing

* Adjust kcp path calculation

* fix tests

---------

Co-authored-by: Grzegorz Krajniak &lt;grzegorz.krajniak@sap.com&gt;
diff --git a/projects/lib/portal-options/models/luigi-context.ts b/projects/lib/portal-options/models/luigi-context.ts
@@ -17,6 +17,7 @@ export interface PortalNodeContext extends NodeContext {
   translationTable?: any;
   namespaceId?: string;
   entity?: Resource;
+  entityName?: string;
   entityId?: string;
   entityContext?: PortalEntityContext;
 }
diff --git a/projects/lib/portal-options/models/luigi-node.ts b/projects/lib/portal-options/models/luigi-node.ts
@@ -2,6 +2,6 @@ import { PortalNodeContext } from './luigi-context';
 import { LuigiNode } from '@openmfp/portal-ui-lib';
 
 export interface PortalLuigiNode extends LuigiNode {
-  context?: PortalNodeContext;
+  context: PortalNodeContext;
   parent?: PortalLuigiNode;
 }
diff --git a/projects/lib/portal-options/services/crd-gateway-kcp-patch-resolver.service.spec.ts b/projects/lib/portal-options/services/crd-gateway-kcp-patch-resolver.service.spec.ts
@@ -61,17 +61,26 @@ describe('CrdGatewayKcpPatchResolver', () => {
     ).toHaveBeenCalledWith(`${kcpRootOrgsPath}:org1:acc1:acc2:acc3`);
   });
 
-  it('should use kcpPath from node context if provided', async () => {
+  it('should set kcpPath for node context if not provided', async () => {
+    const node: PortalLuigiNode = {
+      context: {},
+      parent: undefined,
+    } as any;
+
+    await resolver.resolveCrdGatewayKcpPath(node);
+
+    expect(node.context.kcpPath).toEqual('root:orgs:org1');
+  });
+
+  it('should not set kcpPath for node context if present', async () => {
     const node: PortalLuigiNode = {
       context: { kcpPath: 'customPath' },
       parent: undefined,
     } as any;
 
     await resolver.resolveCrdGatewayKcpPath(node);
 
-    expect(
-      gatewayServiceMock.updateCrdGatewayUrlWithEntityPath,
-    ).toHaveBeenCalledWith('customPath');
+    expect(node.context.kcpPath).toEqual('customPath');
   });
 
   it('should handle node without entity metadata', async () => {
@@ -84,43 +93,7 @@ describe('CrdGatewayKcpPatchResolver', () => {
     ).toHaveBeenCalledWith(`${kcpRootOrgsPath}:org1`);
   });
 
-  describe('resolveCrdGatewayKcpPathForNextAccountEntity', () => {
-    it('should return early if kind is not Account', async () => {
-      const nextNode: PortalLuigiNode = {
-        context: {},
-        parent: undefined,
-      } as any;
-
-      await resolver.resolveCrdGatewayKcpPathForNextAccountEntity(
-        'leafAcc',
-        'Project',
-        nextNode,
-      );
-
-      expect(
-        gatewayServiceMock.updateCrdGatewayUrlWithEntityPath,
-      ).not.toHaveBeenCalled();
-      expect(envConfigServiceMock.getEnvConfig).not.toHaveBeenCalled();
-    });
-
-    it('should return early if entityId is empty', async () => {
-      const nextNode: PortalLuigiNode = {
-        context: {},
-        parent: undefined,
-      } as any;
-
-      await resolver.resolveCrdGatewayKcpPathForNextAccountEntity(
-        '',
-        'Account',
-        nextNode,
-      );
-
-      expect(
-        gatewayServiceMock.updateCrdGatewayUrlWithEntityPath,
-      ).not.toHaveBeenCalled();
-      expect(envConfigServiceMock.getEnvConfig).not.toHaveBeenCalled();
-    });
-
+  describe('resolveCrdGatewayKcpPath', () => {
     it('should aggregate parent Account entities and append entityId', async () => {
       const nextNode: PortalLuigiNode = {
         context: {},
@@ -142,38 +115,12 @@ describe('CrdGatewayKcpPatchResolver', () => {
         },
       } as any;
 
-      await resolver.resolveCrdGatewayKcpPathForNextAccountEntity(
-        'leafAcc',
-        'Account',
-        nextNode,
-      );
+      await resolver.resolveCrdGatewayKcpPath(nextNode, 'leafAcc', 'Account');
 
       expect(envConfigServiceMock.getEnvConfig).toHaveBeenCalled();
       expect(
         gatewayServiceMock.updateCrdGatewayUrlWithEntityPath,
       ).toHaveBeenCalledWith(`${kcpRootOrgsPath}:org1:acc1:acc2:leafAcc`);
     });
-
-    it('should use kcpPath from node context if provided (override)', async () => {
-      const nextNode: PortalLuigiNode = {
-        context: { kcpPath: 'overridePath' },
-        parent: {
-          context: {
-            entity: { metadata: { name: 'accParent' }, __typename: 'Account' },
-          },
-          parent: undefined,
-        },
-      } as any;
-
-      await resolver.resolveCrdGatewayKcpPathForNextAccountEntity(
-        'leafAcc',
-        'Account',
-        nextNode,
-      );
-
-      expect(
-        gatewayServiceMock.updateCrdGatewayUrlWithEntityPath,
-      ).toHaveBeenCalledWith('overridePath');
-    });
   });
 });
diff --git a/projects/lib/portal-options/services/crd-gateway-kcp-patch-resolver.service.ts b/projects/lib/portal-options/services/crd-gateway-kcp-patch-resolver.service.ts
@@ -9,18 +9,20 @@ export class CrdGatewayKcpPatchResolver {
   private gatewayService = inject(GatewayService);
   private envConfigService = inject(EnvConfigService);
 
-  public async resolveCrdGatewayKcpPathForNextAccountEntity(
-    entityId: string,
-    kind: string,
+  public async resolveCrdGatewayKcpPath(
     nextNode: PortalLuigiNode,
+    entityId?: string,
+    kind?: string,
   ) {
-    if (kind !== 'Account' || !entityId) {
-      return;
+    if (nextNode.context.kcpPath) {
+      this.gatewayService.updateCrdGatewayUrlWithEntityPath(
+        nextNode.context.kcpPath,
+      );
+      return nextNode.context.kcpPath;
     }
 
-    let entityKcpPath = `:${entityId}`;
-    let node: PortalLuigiNode | undefined = nextNode.parent;
-
+    let entityKcpPath = kind !== 'Account' || !entityId ? '' : `:${entityId}`;
+    let node: PortalLuigiNode | undefined = nextNode;
     do {
       const entity = node?.context?.entity;
       if (entity?.metadata?.name && entity['__typename'] === 'Account') {
@@ -30,25 +32,12 @@ export class CrdGatewayKcpPatchResolver {
     } while (node);
 
     const org = (await this.envConfigService.getEnvConfig()).idpName;
-    const kcpPath =
-      nextNode.context?.kcpPath || `${kcpRootOrgsPath}:${org}${entityKcpPath}`;
+    const kcpPath = `${kcpRootOrgsPath}:${org}${entityKcpPath}`;
     this.gatewayService.updateCrdGatewayUrlWithEntityPath(kcpPath);
-  }
 
-  public async resolveCrdGatewayKcpPath(nextNode: PortalLuigiNode) {
-    let entityKcpPath = '';
-    let node: PortalLuigiNode | undefined = nextNode;
-    do {
-      const entity = node.context?.entity;
-      if (entity?.metadata?.name && entity['__typename'] === 'Account') {
-        entityKcpPath = `:${entity.metadata.name}${entityKcpPath}`;
-      }
-      node = node.parent;
-    } while (node);
-
-    const org = (await this.envConfigService.getEnvConfig()).idpName;
-    const kcpPath =
-      nextNode.context?.kcpPath || `${kcpRootOrgsPath}:${org}${entityKcpPath}`;
-    this.gatewayService.updateCrdGatewayUrlWithEntityPath(kcpPath);
+    if (!nextNode.context.kcpPath) {
+      nextNode.context.kcpPath = kcpPath;
+    }
+    return kcpPath;
   }
 }
diff --git a/projects/lib/portal-options/services/custom-global-nodes.service.ts b/projects/lib/portal-options/services/custom-global-nodes.service.ts
@@ -30,19 +30,17 @@ export class CustomGlobalNodesServiceImpl implements CustomGlobalNodesService {
         showBreadcrumbs: false,
         hideSideNav: true,
         hideFromNav: true,
+        context: {} as PortalNodeContext,
         entityType: 'global',
         children: [
           {
-            context: {
-              profileUserId: ':profileUserId',
-            } as unknown as PortalNodeContext,
+            pathSegment: ':userId',
+            hideSideNav: true,
+            hideFromNav: true,
             defineEntity: {
               id: 'user',
-              contextKey: 'profileUserId',
             },
-            pathSegment: ':profileUserId',
-            hideSideNav: true,
-            hideFromNav: true,
+            context: {} as PortalNodeContext,
             children: [
               {
                 pathSegment: 'overview',
diff --git a/projects/lib/portal-options/services/luigi-extended-global-context-config.service.spec.ts b/projects/lib/portal-options/services/luigi-extended-global-context-config.service.spec.ts
@@ -88,8 +88,10 @@ describe('LuigiExtendedGlobalContextConfigServiceImpl', () => {
     expect(result).toEqual({
       organizationId: 'originClusterId/test-org',
       kcpCA: 'dW5kZWZpbmVk',
+      kcpPath: 'root:orgs:test-org',
       organization: 'test-org',
       entityId: 'originClusterId/test-org',
+      entityName: 'test-org',
     });
 
     expect(mockResourceService.readAccountInfo).toHaveBeenCalledWith({
diff --git a/projects/lib/portal-options/services/luigi-extended-global-context-config.service.ts b/projects/lib/portal-options/services/luigi-extended-global-context-config.service.ts
@@ -1,3 +1,4 @@
+import { kcpRootOrgsPath } from '../models/constants';
 import { Injectable, inject } from '@angular/core';
 import {
   AuthService,
@@ -48,7 +49,9 @@ export class LuigiExtendedGlobalContextConfigServiceImpl
         organization: entityId,
         organizationId: `${organizationOriginClusterId}/${entityId}`,
         kcpCA: btoa(accountInfo?.spec?.clusterInfo?.ca),
+        kcpPath: `${kcpRootOrgsPath}:${entityId}`,
         entityId: `${organizationOriginClusterId}/${entityId}`, // if no entity selected the entityId is the same as the organizationId
+        entityName: entityId,
       };
     } catch (e) {
       console.error(`Failed to read entity ${entityId} from ${operation}`, e);
diff --git a/projects/lib/portal-options/services/node-context-processing.service.spec.ts b/projects/lib/portal-options/services/node-context-processing.service.spec.ts
@@ -18,7 +18,7 @@ describe('NodeContextProcessingServiceImpl', () => {
     } as unknown as jest.Mocked<ResourceService>;
 
     mockCrdGatewayKcpPatchResolver = {
-      resolveCrdGatewayKcpPathForNextAccountEntity: jest.fn(),
+      resolveCrdGatewayKcpPath: jest.fn(),
     } as unknown as jest.Mocked<CrdGatewayKcpPatchResolver>;
 
     TestBed.configureTestingModule({
@@ -65,8 +65,8 @@ describe('NodeContextProcessingServiceImpl', () => {
       await service.processNodeContext(entityId, entityNode, ctx);
 
       expect(
-        mockCrdGatewayKcpPatchResolver.resolveCrdGatewayKcpPathForNextAccountEntity,
-      ).toHaveBeenCalledWith(entityId, 'TestKind', entityNode);
+        mockCrdGatewayKcpPatchResolver.resolveCrdGatewayKcpPath,
+      ).toHaveBeenCalledWith(entityNode, entityId, 'TestKind');
       expect(mockResourceService.read).toHaveBeenCalled();
     });
   });
@@ -431,4 +431,4 @@ describe('NodeContextProcessingServiceImpl', () => {
       );
     });
   });
-});
+});
diff --git a/projects/lib/portal-options/services/node-context-processing.service.ts b/projects/lib/portal-options/services/node-context-processing.service.ts
@@ -7,7 +7,6 @@ import { ResourceService } from '@platform-mesh/portal-ui-lib/services';
 import { replaceDotsAndHyphensWithUnderscores } from '@platform-mesh/portal-ui-lib/utils';
 import { firstValueFrom } from 'rxjs';
 
-
 @Injectable({
   providedIn: 'root',
 })
@@ -30,11 +29,12 @@ export class NodeContextProcessingServiceImpl
       return;
     }
 
-    await this.crdGatewayKcpPatchResolver.resolveCrdGatewayKcpPathForNextAccountEntity(
-      entityId,
-      kind,
-      entityNode,
-    );
+    const kcpPath =
+      await this.crdGatewayKcpPatchResolver.resolveCrdGatewayKcpPath(
+        entityNode,
+        entityId,
+        kind,
+      );
 
     const operation = replaceDotsAndHyphensWithUnderscores(group);
     const namespaceId =
@@ -66,13 +66,15 @@ export class NodeContextProcessingServiceImpl
       );
 
       // update the current already calculated by Luigi context for a node
+      ctx.kcpPath = kcpPath;
       ctx.entity = entity;
+      ctx.entityName = entityId;
       ctx.entityId = `${entity.metadata?.annotations?.['kcp.io/cluster']}/${entityId}`;
       // update the node context of sa node to contain the entity for future context calculations
-      if (entityNode.context) {
-        entityNode.context.entity = entity;
-        entityNode.context.entityId = ctx.entityId;
-      }
+      entityNode.context.kcpPath = kcpPath;
+      entityNode.context.entity = entity;
+      entityNode.context.entityName = ctx.entityName;
+      entityNode.context.entityId = ctx.entityId;
     } catch (e) {
       console.error(`Not able to read entity ${entityId} from ${operation}`);
     }
diff --git a/projects/lib/services/resource/gateway.service.spec.ts b/projects/lib/services/resource/gateway.service.spec.ts
@@ -2,7 +2,6 @@ import { GatewayService } from './gateway.service';
 import { TestBed } from '@angular/core/testing';
 import { LuigiCoreService } from '@openmfp/portal-ui-lib';
 
-
 describe('GatewayService', () => {
   let service: GatewayService;
   let mockLuigiCoreService: any;
@@ -85,7 +84,6 @@ describe('GatewayService', () => {
         },
         token: 'token',
         accountId: 'entityId',
-        kcpPath: ':org1',
       };
       const result = service.resolveKcpPath(nodeContext, true);
       expect(result).toBe(':org1');
@@ -130,8 +128,6 @@ describe('GatewayService', () => {
     });
 
     it('should show error alert and return empty string for invalid URL', () => {
-      const showAlertSpy = jest.spyOn(mockLuigiCoreService, 'showAlert');
-
       const nodeContext = {
         portalContext: {
           crdGatewayApiUrl: 'https://example.com/invalid-url',
@@ -143,15 +139,9 @@ describe('GatewayService', () => {
       const result = service.resolveKcpPath(nodeContext);
 
       expect(result).toBe('');
-      expect(showAlertSpy).toHaveBeenCalledWith({
-        text: 'Could not get current KCP path from gateway URL',
-        type: 'error',
-      });
     });
 
     it('should show error alert and return empty string for URL without /graphql suffix', () => {
-      const showAlertSpy = jest.spyOn(mockLuigiCoreService, 'showAlert');
-
       const nodeContext = {
         portalContext: {
           crdGatewayApiUrl: 'https://example.com/:org1:acc1/api',
@@ -163,15 +153,9 @@ describe('GatewayService', () => {
       const result = service.resolveKcpPath(nodeContext);
 
       expect(result).toBe('');
-      expect(showAlertSpy).toHaveBeenCalledWith({
-        text: 'Could not get current KCP path from gateway URL',
-        type: 'error',
-      });
     });
 
     it('should show error alert and return empty string for empty URL', () => {
-      const showAlertSpy = jest.spyOn(mockLuigiCoreService, 'showAlert');
-
       const nodeContext = {
         portalContext: {
           crdGatewayApiUrl: '',
@@ -183,10 +167,6 @@ describe('GatewayService', () => {
       const result = service.resolveKcpPath(nodeContext);
 
       expect(result).toBe('');
-      expect(showAlertSpy).toHaveBeenCalledWith({
-        text: 'Could not get current KCP path from gateway URL',
-        type: 'error',
-      });
     });
   });
 });
diff --git a/projects/lib/services/resource/gateway.service.ts b/projects/lib/services/resource/gateway.service.ts
diff --git a/projects/lib/services/resource/resource.service.ts b/projects/lib/services/resource/resource.service.ts
diff --git a/projects/wc/src/app/components/organization-management/organization-management.component.ts b/projects/wc/src/app/components/organization-management/organization-management.component.ts

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ export interface PortalNodeContext extends NodeContext {`
`17`	`17`	`translationTable?: any;`
`18`	`18`	`namespaceId?: string;`
`19`	`19`	`entity?: Resource;`
	`20`	`+ entityName?: string;`
`20`	`21`	`entityId?: string;`
`21`	`22`	`entityContext?: PortalEntityContext;`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ import { PortalNodeContext } from './luigi-context';`
`2`	`2`	`import { LuigiNode } from '@openmfp/portal-ui-lib';`
`3`	`3`
`4`	`4`	`export interface PortalLuigiNode extends LuigiNode {`
`5`		`- context?: PortalNodeContext;`
	`5`	`+ context: PortalNodeContext;`
`6`	`6`	`parent?: PortalLuigiNode;`
`7`	`7`	`}`