Merge branch 'main' into renovate/fundamental-ngx-and-angular

Author: gkrajniak

docs/readme-generic-ui.md

@@ -52,6 +52,14 @@ Each field definition supports the following properties:
 
 - `"label"`: Display name for the field
 - `"property"`: JSON path to the resource property (string or array of strings for fallback values)
+- `"propertyField"`: In case the property is a scalar value that represents an object, this property can be used to specify the field to be used for display within that object
+  - `"key"`: The name of the field to be used for display
+  - `"transform"`: An array of text manipulations to be applied to the value, the available are:  
+    | 'uppercase'
+    | 'lowercase'
+    | 'capitalize'
+    | 'decode'
+    | 'encode'
 - `"jsonPathExpression"`: Alternative JSONPath expression for complex data access (takes precedence over `property`)
 - `"required"`: Boolean flag indicating if the field is mandatory (for create views)
 - `"values"`: Array of predefined values for selection
@@ -106,7 +114,7 @@ Below is an example content-configuration for an accounts node using the generic
               "namespace": null,
               "readyCondition": {
                 "jsonPathExpression": "status.conditions[?(@.type=='Ready' && @.status=='True')]",
-                "property": ["status.conditions.status", "status.conditions.type"],
+                "property": ["status.conditions.status", "status.conditions.type"]
               },
               "ui": {
                 "logoUrl": "https://www.kcp.io/icons/logo.svg",
@@ -120,6 +128,14 @@ Below is an example content-configuration for an accounts node using the generic
                       "label": "Display Name",
                       "property": "spec.displayName"
                     },
+                    {
+                      "label": "Key",
+                      "property": "data",
+                      "propertyField": {
+                        "key": "OPENAI_API_KEY",
+                        "transform": ["uppercase", "encode"]
+                      }
+                    },
                     {
                       "label": "Type",
                       "property": "spec.type",
@@ -213,7 +229,7 @@ Below is an example content-configuration for an accounts node using the generic
                         "operation": "cities",
                         "gqlQuery": "subscription { cities { data { id name } } }",
                         "value": "data.id",
-                        "key": "data.name",
+                        "key": "data.name"
                       }
                     }
                   ]

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@platform-mesh/portal-ui-lib",
-  "version": "0.18.8",
+  "version": "0.18.13",
   "repository": {
     "url": "git+https://github.com/platform-mesh/portal-ui-lib.git"
   },
@@ -34,19 +34,19 @@
     "@angular/compiler-cli": "20.3.9",
     "@angular/localize": "20.3.9",
     "@briebug/jest-schematic": "6.0.0",
-    "@openmfp/portal-ui-lib": "0.182.12",
+    "@openmfp/portal-ui-lib": "0.183.0",
     "@openmfp/config-prettier": "0.9.1",
     "@types/jest": "30.0.0",
     "@types/jmespath": "0.15.2",
     "@types/jsonpath": "0.2.4",
     "@ui5/webcomponents-ngx": "0.5.6",
-    "kubernetes-types": "1.30.0",
     "cpx2": "8.0.0",
     "jest": "29.7.0",
     "jest-jasmine2": "29.7.0",
     "jest-junit": "16.0.0",
     "jest-mock-extended": "3.0.7",
     "jmespath": "0.16.0",
+    "kubernetes-types": "1.30.0",
     "mkdirp": "3.0.1",
     "move-cli": "2.0.0",
     "ng-packagr": "20.3.0",

package.json

@@ -10,7 +10,7 @@ module.exports = {
       branches: 90,
       functions: 95,
       lines: 95,
-      statements: -3,
+      statements: -4,
     },
   },
   moduleNameMapper: {

projects/lib/jest.config.js

@@ -1,6 +1,5 @@
 import { Condition, ObjectMeta } from 'kubernetes-types/meta/v1';
 
-
 export interface LabelDisplay {
   backgroundColor?: string;
   color?: string;
@@ -10,9 +9,22 @@ export interface LabelDisplay {
   textTransform?: string;
 }
 
+export type TransformType =
+  | 'uppercase'
+  | 'lowercase'
+  | 'capitalize'
+  | 'decode'
+  | 'encode';
+
+export interface PropertyField {
+  key: string;
+  transform?: TransformType[];
+}
+
 export interface FieldDefinition {
   label?: string;
   property: string | string[];
+  propertyField?: PropertyField;
   jsonPathExpression?: string;
   required?: boolean;
   values?: string[];
@@ -56,6 +68,7 @@ export interface Resource extends Record<string, any> {
   status?: ResourceStatus;
   __typename?: string;
   ready?: boolean;
+  data?: Record<string, any>;
 }
 
 export interface ResourceDefinition {
@@ -83,4 +96,4 @@ export interface UIDefinition {
   detailView?: UiView;
 }
 
-export type KubernetesScope = 'Cluster' | 'Namespaced';
+export type KubernetesScope = 'Cluster' | 'Namespaced';

projects/lib/models/models/resource.ts

@@ -12,7 +12,7 @@
   },
   "prettier": "@openmfp/config-prettier",
   "peerDependencies": {
-    "@openmfp/portal-ui-lib": "0.182.12",
+    "@openmfp/portal-ui-lib": "0.183.0",
     "@angular/common": "20.3.9",
     "@angular/compiler": "20.3.9",
     "@angular/core": "20.3.9",

projects/lib/package.json

@@ -17,6 +17,7 @@ export interface PortalNodeContext extends NodeContext {
   translationTable?: any;
   namespaceId?: string;
   entity?: Resource;
+  entityName?: string;
   entityId?: string;
   entityContext?: PortalEntityContext;
 }

projects/lib/portal-options/models/luigi-context.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;
 }

projects/lib/portal-options/models/luigi-node.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');
-    });
   });
 });

projects/lib/portal-options/services/crd-gateway-kcp-patch-resolver.service.spec.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;
   }
 }