Merge branch 'main' into bug/fix-users-context

Author: gkrajniak

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@platform-mesh/portal-ui-lib",
-  "version": "0.21.11",
+  "version": "0.21.16",
   "repository": {
     "url": "git+https://github.com/platform-mesh/portal-ui-lib.git"
   },
@@ -26,16 +26,16 @@
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@angular-builders/jest": "20.0.0",
-    "@angular-devkit/build-angular": "20.3.8",
-    "@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",
+    "@angular-builders/jest": "^20.0.0",
+    "@angular-devkit/build-angular": "^20.3.13",
+    "@angular-eslint/builder": "^20.5.2",
+    "@angular/build": "^20.3.13",
+    "@angular/cli": "^20.3.13",
+    "@angular/compiler-cli": "^20.3.15",
+    "@angular/localize": "^20.3.15",
     "@briebug/jest-schematic": "6.0.0",
     "@openmfp/config-prettier": "0.9.2",
-    "@openmfp/portal-ui-lib": "0.184.11",
+    "@openmfp/portal-ui-lib": "0.184.15",
     "@types/jest": "30.0.0",
     "@types/jmespath": "0.15.2",
     "@types/jsonpath": "0.2.4",

package.json

@@ -12,6 +12,6 @@
   },
   "prettier": "@openmfp/config-prettier",
   "peerDependencies": {
-    "@openmfp/portal-ui-lib": "0.184.11"
+    "@openmfp/portal-ui-lib": "0.184.15"
   }
 }

projects/lib/package.json

@@ -2,7 +2,12 @@ import { kcpRootOrgsPath } from '../models/constants';
 import { PortalNodeContext } from '../models/luigi-context';
 import { PortalLuigiNode } from '../models/luigi-node';
 import { inject } from '@angular/core';
-import { CustomGlobalNodesService, I18nService } from '@openmfp/portal-ui-lib';
+import {
+  CustomGlobalNodesService,
+  EntityType,
+  I18nService,
+  NodeContext,
+} from '@openmfp/portal-ui-lib';
 
 export class CustomGlobalNodesServiceImpl implements CustomGlobalNodesService {
   private i18nService = inject(I18nService);
@@ -25,6 +30,28 @@ export class CustomGlobalNodesServiceImpl implements CustomGlobalNodesService {
           kcpPath: kcpRootOrgsPath,
         } as PortalNodeContext,
       },
+      {
+        pathSegment: 'error',
+        order: '1000',
+        hideFromNav: true,
+        context: {} as PortalNodeContext,
+        children: [
+          {
+            pathSegment: ':id',
+            entityType: EntityType.ENTITY_ERROR,
+            hideFromNav: true,
+            hideSideNav: true,
+            viewUrl: '/assets/platform-mesh-portal-ui-wc.js#error-component',
+            context: {
+              id: ':id',
+              translationTable: this.i18nService.translationTable,
+            } as any as NodeContext,
+            webcomponent: {
+              selfRegistered: true,
+            },
+          },
+        ],
+      },
       {
         pathSegment: 'users',
         showBreadcrumbs: false,

projects/lib/portal-options/services/custom-global-nodes.service.ts

@@ -92,7 +92,7 @@ describe('CustomRoutingConfigServiceImpl', () => {
       const result = await config.pageNotFoundHandler();
 
       expect(result).toEqual({
-        redirectTo: 'welcome',
+        redirectTo: 'error/404',
         keepURL: true,
       });
     });
@@ -111,7 +111,7 @@ describe('CustomRoutingConfigServiceImpl', () => {
       const result = await config.pageNotFoundHandler();
 
       expect(result).toEqual({
-        redirectTo: 'error/404',
+        redirectTo: 'welcome',
         keepURL: true,
       });
     });
@@ -171,7 +171,7 @@ describe('CustomRoutingConfigServiceImpl', () => {
       const result = await config.pageNotFoundHandler();
 
       expect(result).toEqual({
-        redirectTo: 'error/404',
+        redirectTo: 'welcome',
         keepURL: true,
       });
     });
@@ -190,7 +190,7 @@ describe('CustomRoutingConfigServiceImpl', () => {
       const result = await config.pageNotFoundHandler();
 
       expect(result).toEqual({
-        redirectTo: 'welcome',
+        redirectTo: 'error/404',
         keepURL: true,
       });
     });
@@ -215,7 +215,7 @@ describe('CustomRoutingConfigServiceImpl', () => {
       const result = await config.pageNotFoundHandler();
 
       expect(result).toEqual({
-        redirectTo: 'error/404',
+        redirectTo: 'welcome',
         keepURL: true,
       });
     });

projects/lib/portal-options/services/router-config.service.spec.ts

@@ -20,12 +20,12 @@ export class CustomRoutingConfigServiceImpl implements RoutingConfigService {
 
   getRoutingConfig(): any {
     return {
-      pageNotFoundHandler: async () => {
+      pageNotFoundHandler: () => {
         if (!this.envConfig?.baseDomain) {
           return this.redirectTo('error/404');
         }
 
-        if (window.location.hostname !== this.envConfig.baseDomain) {
+        if (window.location.hostname === this.envConfig.baseDomain) {
           return this.redirectTo('welcome');
         }
 

projects/lib/portal-options/services/router-config.service.ts

@@ -47,6 +47,17 @@ describe('getResourceValueByJsonPath', () => {
     expect(result).toBe('test-result');
   });
 
+  it('should query resource using jsonPathExpression', () => {
+    (jsonpath.query as jest.Mock).mockReturnValue(['test-result']);
+
+    const result = getResourceValueByJsonPath(mockResource, {
+      jsonPathExpression: '$.spec.value',
+    });
+
+    expect(jsonpath.query).toHaveBeenCalledWith(mockResource, '$.spec.value');
+    expect(result).toBe('test-result');
+  });
+
   it('should query resource using property', () => {
     (jsonpath.query as jest.Mock).mockReturnValue(['property-result']);
 

projects/lib/utils/utils/resource-field-by-path.spec.ts

@@ -25,7 +25,8 @@ export const getResourceValueByJsonPath = (
     return undefined;
   }
 
-  const queryResult = jsonpath.query(resource, `$.${property}`);
+  const prefix = property.startsWith('$.') ? '' : '$.';
+  const queryResult = jsonpath.query(resource, `${prefix}${property}`);
   const value = queryResult.length ? queryResult[0] : undefined;
 
   if (value && field.propertyField) {

projects/lib/utils/utils/resource-field-by-path.ts

@@ -40,4 +40,26 @@ jest.mock('@ui5/webcomponents-icons/dist/hide.js', () => ({}), {
 });
 jest.mock('@ui5/webcomponents-icons/dist/show.js', () => ({}), {
   virtual: true,
-});
+});
+
+jest.mock(
+  '@ui5/webcomponents-fiori/dist/illustrations/NoEntries.js',
+  () => ({}),
+  {
+    virtual: true,
+  },
+);
+jest.mock(
+  '@ui5/webcomponents-fiori/dist/illustrations/UnableToLoad.js',
+  () => ({}),
+  {
+    virtual: true,
+  },
+);
+jest.mock(
+  '@ui5/webcomponents-fiori/dist/illustrations/tnt/UnsuccessfulAuth.js',
+  () => ({}),
+  {
+    virtual: true,
+  },
+);

projects/wc/_mocks_/ui5-mock.ts

@@ -0,0 +1,23 @@
+@let configVM = config();
+@if (configVM.scene) {
+    <div class="page">
+      <div class="container">
+        <ui5-illustrated-message [name]="configVM.scene">
+          <ui5-title slot="title" level="H1">{{configVM.illustratedMessageTitle}}</ui5-title>
+          <div slot="subtitle">
+            <p>{{configVM.illustratedMessageText}}</p>
+          </div>
+          <div>
+              @for (button of configVM.buttons; track button.url) {
+                  <ui5-button
+                    design="Transparent"
+                    (click)="goTo(button)"
+                  >
+                    {{ button.label }}
+                  </ui5-button>
+              }
+          </div>
+        </ui5-illustrated-message>
+      </div>
+    </div>
+}