Merge branch 'main' into renovate/major-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.1",
+  "version": "0.18.16",
   "repository": {
     "url": "git+https://github.com/platform-mesh/portal-ui-lib.git"
   },
@@ -28,31 +28,31 @@
   "devDependencies": {
     "@angular-builders/jest": "20.0.0",
     "@angular-devkit/build-angular": "20.3.8",
-    "@angular-eslint/builder": "20.5.0",
+    "@angular-eslint/builder": "20.5.1",
     "@angular/build": "20.3.8",
     "@angular/cli": "20.3.8",
     "@angular/compiler-cli": "20.3.9",
     "@angular/localize": "20.3.9",
     "@briebug/jest-schematic": "6.0.0",
-    "@openmfp/portal-ui-lib": "0.182.7",
+    "@openmfp/portal-ui-lib": "0.183.1",
     "@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": "30.2.0",
     "jest-jasmine2": "30.2.0",
     "jest-junit": "16.0.0",
     "jest-mock-extended": "4.0.0",
     "jmespath": "0.16.0",
+    "kubernetes-types": "1.30.0",
     "mkdirp": "3.0.1",
     "move-cli": "2.0.0",
     "ng-packagr": "20.3.0",
     "ngx-build-plus": "20.0.0",
     "nodemon": "3.1.10",
-    "rimraf": "6.0.1",
+    "rimraf": "6.1.0",
     "ts-jest": "29.4.5",
     "typescript": "5.9.3"
   }

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.7",
+    "@openmfp/portal-ui-lib": "0.183.1",
     "@angular/common": "20.3.9",
     "@angular/compiler": "20.3.9",
     "@angular/core": "20.3.9",
@@ -24,7 +24,7 @@
     "@ui5/webcomponents-ngx": "0.5.6",
     "apollo-angular": "12.1.0",
     "gql-query-builder": "3.8.0",
-    "graphql": "16.11.0",
+    "graphql": "16.12.0",
     "graphql-sse": "2.6.0",
     "rxjs": "7.8.2",
     "zone.js": "0.15.1",

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;
 }