Fix the kubeconfig download content (#67)

* Fix the kubeconfig download content

* fix tests

---------

Co-authored-by: Grzegorz Krajniak <[email protected]>

Author: gkrajniak

package-lock.json

@@ -29,7 +29,7 @@
     "@angular/compiler-cli": "^20.2.1",
     "@angular/localize": "^20.2.1",
     "@briebug/jest-schematic": "^6.0.0",
-    "@openmfp/portal-ui-lib": "^0.180.0",
+    "@openmfp/portal-ui-lib": ">=0.180.0",
     "@openmfp/config-prettier": "^0.8.1",
     "@types/jest": "^30.0.0",
     "@types/jmespath": "0.15.2",

package.json

@@ -6,7 +6,7 @@
   },
   "prettier": "@openmfp/config-prettier",
   "peerDependencies": {
-    "@openmfp/portal-ui-lib": ">=0.179.9",
+    "@openmfp/portal-ui-lib": ">=0.180.0",
     "@angular/common": "^19.0.0 || ^20.0.0",
     "@angular/compiler": "^19.0.0 || ^20.0.0",
     "@angular/core": "^19.0.0 || ^20.0.0",

projects/lib/package.json

@@ -13,5 +13,6 @@ export interface ResourceNodeContext extends Partial<NodeContext> {
   namespaceId?: string;
   portalContext: {
     crdGatewayApiUrl: string;
+    kcpWorkspaceUrl?: string;
   };
 }

projects/lib/services/resource/resource-node-context.ts

@@ -1,19 +1,23 @@
 import { DetailViewComponent } from './detail-view.component';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { EnvConfigService } from '@openmfp/portal-ui-lib';
 import {
   GatewayService,
   ResourceService,
 } from '@platform-mesh/portal-ui-lib/services';
+import { mock } from 'jest-mock-extended';
 import { of, throwError } from 'rxjs';
 
 describe('DetailViewComponent', () => {
   let component: DetailViewComponent;
   let fixture: ComponentFixture<DetailViewComponent>;
   let mockResourceService: any;
   let mockGatewayService: any;
+  let envConfigServiceMock: jest.Mocked<EnvConfigService>;
   let luigiClientLinkManagerNavigate = jest.fn();
 
   beforeEach(() => {
+    envConfigServiceMock = mock();
     mockResourceService = {
       read: jest.fn().mockReturnValue(of({ name: 'test-resource' })),
       readAccountInfo: jest.fn().mockReturnValue(of('mock-ca-data')),
@@ -27,6 +31,7 @@ describe('DetailViewComponent', () => {
       providers: [
         { provide: ResourceService, useValue: mockResourceService },
         { provide: GatewayService, useValue: mockGatewayService },
+        { provide: EnvConfigService, useValue: envConfigServiceMock },
       ],
     }).overrideComponent(DetailViewComponent, {
       set: { template: '<div></div>' },
@@ -47,6 +52,7 @@ describe('DetailViewComponent', () => {
           },
         },
       },
+      portalContext: { kcpWorkspaceUrl: 'https://example.com' },
       entity: {
         metadata: { name: 'test-resource' },
       },
@@ -66,9 +72,7 @@ describe('DetailViewComponent', () => {
   });
 
   afterEach(() => {
-    // Очищаем все моки после каждого теста
     jest.restoreAllMocks();
-    // Удаляем глобальные моки
     delete global.URL.createObjectURL;
   });
 
@@ -115,9 +119,11 @@ describe('DetailViewComponent', () => {
     const createElementSpy = jest
       .spyOn(document, 'createElement')
       .mockReturnValue(mockAnchorElement);
-    const createObjectURLSpy = jest.fn().mockReturnValue('blob-url');
-    global.URL.createObjectURL = createObjectURLSpy;
+    global.URL.createObjectURL = jest.fn().mockReturnValue('blob-url');
 
+    envConfigServiceMock.getEnvConfig.mockResolvedValue({
+      oidcIssuerUrl: 'oidcIssuerUrl',
+    } as any);
     await component.downloadKubeConfig();
 
     expect(createElementSpy).toHaveBeenCalledWith('a');

projects/wc/src/app/components/generic-ui/detail-view/detail-view.component.spec.ts

@@ -12,6 +12,7 @@ import {
   signal,
 } from '@angular/core';
 import { LuigiClient } from '@luigi-project/client/luigi-element';
+import { EnvConfigService } from '@openmfp/portal-ui-lib';
 import { FieldDefinition, Resource } from '@platform-mesh/portal-ui-lib/models';
 import {
   GatewayService,
@@ -44,7 +45,6 @@ const defaultFields: FieldDefinition[] = [
 
 @Component({
   selector: 'detail-view',
-  encapsulation: ViewEncapsulation.ShadowDom,
   standalone: true,
   imports: [
     DynamicPageComponent,
@@ -59,11 +59,13 @@ const defaultFields: FieldDefinition[] = [
   ],
   templateUrl: './detail-view.component.html',
   styleUrl: './detail-view.component.scss',
+  encapsulation: ViewEncapsulation.ShadowDom,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DetailViewComponent {
   private resourceService = inject(ResourceService);
   private gatewayService = inject(GatewayService);
+  private envConfigService = inject(EnvConfigService);
   protected readonly getResourceValueByJsonPath = getResourceValueByJsonPath;
 
   LuigiClient = input<LuigiClient>();
@@ -115,9 +117,16 @@ export class DetailViewComponent {
   }
 
   async downloadKubeConfig() {
+    const { oidcIssuerUrl } = await this.envConfigService.getEnvConfig();
+
     const kubeConfig = kubeConfigTemplate
       .replaceAll('<cluster-name>', this.context().accountId)
-      .replaceAll('<server-url>', this.workspacePath)
+      .replaceAll('<org-name>', this.context().organization)
+      .replaceAll(
+        '<server-url>',
+        `${this.context().portalContext.kcpWorkspaceUrl}:${this.context().accountId}`,
+      )
+      .replaceAll('<oidc-issuer-url>', oidcIssuerUrl)
       .replaceAll('<ca-data>', this.context().kcpCA)
       .replaceAll('<token>', this.context().token);
 

projects/wc/src/app/components/generic-ui/detail-view/detail-view.component.ts

@@ -5,7 +5,7 @@ export const kubeConfigTemplate = `
     - name: <cluster-name>
       cluster:
         certificate-authority-data: <ca-data>
-        server: "https://kcp.api.portal.cc-one.showroom.apeirora.eu/clusters/<server-url>"
+        server: <server-url>
     contexts:
     - name: <cluster-name>
       context:
@@ -20,8 +20,8 @@ export const kubeConfigTemplate = `
           args:
           - oidc-login
           - get-token
-          - --oidc-issuer-url=https://portal.cc-one.showroom.apeirora.eu/keycloak/realms/openmfp
-          - --oidc-client-id=openmfp-public
+          - --oidc-issuer-url=<oidc-issuer-url>
+          - --oidc-client-id=<org-name>
           - --oidc-extra-scope=email
           - --oidc-extra-scope=groups
           command: kubectl

projects/wc/src/app/components/generic-ui/detail-view/kubeconfig-template.ts

@@ -174,6 +174,7 @@ describe('OrganizationManagementComponent', () => {
         access_token: 'test-access-token',
         id_token: 'test-id-token',
       },
+      uiOptions: [],
     };
     envConfigServiceMock.getEnvConfig.mockResolvedValue(mockEnvConfig);
     component.organizationToSwitch.set('newOrg');
@@ -201,6 +202,7 @@ describe('OrganizationManagementComponent', () => {
         access_token: 'test-access-token',
         id_token: 'test-id-token',
       },
+      uiOptions: [],
     };
     envConfigServiceMock.getEnvConfig.mockResolvedValue(mockEnvConfig);
     component.organizationToSwitch.set('invalid-org-name-'); // Invalid: ends with hyphen
@@ -227,6 +229,7 @@ describe('OrganizationManagementComponent', () => {
         access_token: 'test-access-token',
         id_token: 'test-id-token',
       },
+      uiOptions: [],
     };
     envConfigServiceMock.getEnvConfig.mockResolvedValue(mockEnvConfig);
     component.organizationToSwitch.set('validorg');