@platform-mesh/portal-server-lib 0.6.33 → 0.6.35

package/dist/portal-options/utils/account-hierarchy-resolver.js

@@ -1,3 +1,4 @@
+import { replaceStringDeep } from './replace-string-deep.js';
 const ACCOUNT_ENTITY_TYPE = 'core_platform-mesh_io_account';
 export const updateEntityTypeFromAccountPath = (contentConfiguration, accountPath) => {
     contentConfiguration.luigiConfigFragment.data.nodes.forEach((node) => {
@@ -6,7 +7,8 @@ export const updateEntityTypeFromAccountPath = (contentConfiguration, accountPat
         }
         const accountPathParts = accountPath
             .split(':')
-            .map((_, i) => `${ACCOUNT_ENTITY_TYPE}:${i + 1}`)
+            .filter(Boolean)
+            .map(() => ACCOUNT_ENTITY_TYPE)
             .join('.');
         node.entityType = node.entityType.replace(ACCOUNT_ENTITY_TYPE, accountPathParts);
     });
@@ -14,14 +16,11 @@ export const updateEntityTypeFromAccountPath = (contentConfiguration, accountPat
 };
 export const updateAccountNodeChildren = (contentConfiguration, accountPath) => {
     const accountChildrenNode = contentConfiguration.luigiConfigFragment.data.nodes[0]?.children?.[0];
-    const nextHierarchyLevel = accountPath.split(':').length + 1;
     if (accountChildrenNode) {
-        accountChildrenNode.defineEntity.id = `${ACCOUNT_ENTITY_TYPE}:${nextHierarchyLevel}`;
-        accountChildrenNode.context.accountId = `:${ACCOUNT_ENTITY_TYPE}Id:${nextHierarchyLevel}`;
-        accountChildrenNode.context[`${ACCOUNT_ENTITY_TYPE}Id`] =
-            `:${ACCOUNT_ENTITY_TYPE}Id:${nextHierarchyLevel}`;
-        accountChildrenNode.context.resourceId = `:${ACCOUNT_ENTITY_TYPE}Id:${nextHierarchyLevel}`;
-        accountChildrenNode.pathSegment = `:${ACCOUNT_ENTITY_TYPE}Id:${nextHierarchyLevel}`;
+        const nextHierarchyLevel = accountPath.split(':').filter(Boolean).length + 1;
+        const previousPathSegment = accountChildrenNode.pathSegment;
+        const nextPathSegment = `:${ACCOUNT_ENTITY_TYPE}Id:${nextHierarchyLevel}`;
+        replaceStringDeep(accountChildrenNode, previousPathSegment, nextPathSegment);
     }
     return contentConfiguration;
 };

package/dist/portal-options/utils/account-hierarchy-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"account-hierarchy-resolver.js","sourceRoot":"","sources":["../../../src/portal-options/utils/account-hierarchy-resolver.ts"],"names":[],"mappings":"AAEA,MAAM,mBAAmB,GAAG,+BAA+B,CAAC;AAE5D,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAC7C,oBAA0C,EAC1C,WAAmB,EACG,EAAE;IACxB,oBAAoB,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACnE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACnD,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,WAAW;aACjC,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,mBAAmB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;aAChD,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CACvC,mBAAmB,EACnB,gBAAgB,CACjB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,oBAA0C,EAC1C,WAAmB,EACG,EAAE;IACxB,MAAM,mBAAmB,GACvB,oBAAoB,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IACxE,MAAM,kBAAkB,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAE7D,IAAI,mBAAmB,EAAE,CAAC;QACxB,mBAAmB,CAAC,YAAY,CAAC,EAAE,GAAG,GAAG,mBAAmB,IAAI,kBAAkB,EAAE,CAAC;QACrF,mBAAmB,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,mBAAmB,MAAM,kBAAkB,EAAE,CAAC;QAC1F,mBAAmB,CAAC,OAAO,CAAC,GAAG,mBAAmB,IAAI,CAAC;YACrD,IAAI,mBAAmB,MAAM,kBAAkB,EAAE,CAAC;QACpD,mBAAmB,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,mBAAmB,MAAM,kBAAkB,EAAE,CAAC;QAC3F,mBAAmB,CAAC,WAAW,GAAG,IAAI,mBAAmB,MAAM,kBAAkB,EAAE,CAAC;IACtF,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8CAA8C,GAAG,CAC5D,oBAA0C,EAC1C,OAA4B,EACN,EAAE;IACxB,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACxE,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,oBAAoB,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC7C,yBAAyB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,+BAA+B,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"account-hierarchy-resolver.js","sourceRoot":"","sources":["../../../src/portal-options/utils/account-hierarchy-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,MAAM,mBAAmB,GAAG,+BAA+B,CAAC;AAE5D,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAC7C,oBAA0C,EAC1C,WAAmB,EACG,EAAE;IACxB,oBAAoB,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACnE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACnD,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,WAAW;aACjC,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CAAC,OAAO,CAAC;aACf,GAAG,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC;aAC9B,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CACvC,mBAAmB,EACnB,gBAAgB,CACjB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,oBAA0C,EAC1C,WAAmB,EACG,EAAE;IACxB,MAAM,mBAAmB,GACvB,oBAAoB,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAExE,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,kBAAkB,GACtB,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACpD,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,WAAW,CAAC;QAC5D,MAAM,eAAe,GAAG,IAAI,mBAAmB,MAAM,kBAAkB,EAAE,CAAC;QAE1E,iBAAiB,CACf,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,CAChB,CAAC;IACJ,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8CAA8C,GAAG,CAC5D,oBAA0C,EAC1C,OAA4B,EACN,EAAE;IACxB,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACxE,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,oBAAoB,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC7C,yBAAyB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,+BAA+B,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC,CAAC"}

package/dist/portal-options/utils/replace-string-deep.d.ts

@@ -0,0 +1 @@
+export declare const replaceStringDeep: (target: unknown, previousValue: string, nextValue: string) => void;

package/dist/portal-options/utils/replace-string-deep.js

@@ -0,0 +1,28 @@
+const processValue = (currentValue, valueToReplace, newValue, setValue) => {
+    if (typeof currentValue === 'string' && currentValue === valueToReplace) {
+        setValue(newValue);
+        return;
+    }
+    if (currentValue && typeof currentValue === 'object') {
+        replaceStringDeep(currentValue, valueToReplace, newValue);
+    }
+};
+export const replaceStringDeep = (target, previousValue, nextValue) => {
+    if (target === null || typeof target !== 'object') {
+        return;
+    }
+    if (Array.isArray(target)) {
+        target.forEach((item, index) => {
+            processValue(item, previousValue, nextValue, (updatedValue) => {
+                target[index] = updatedValue;
+            });
+        });
+        return;
+    }
+    Object.entries(target).forEach(([key, value]) => {
+        processValue(value, previousValue, nextValue, (updatedValue) => {
+            target[key] = updatedValue;
+        });
+    });
+};
+//# sourceMappingURL=replace-string-deep.js.map

package/dist/portal-options/utils/replace-string-deep.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"replace-string-deep.js","sourceRoot":"","sources":["../../../src/portal-options/utils/replace-string-deep.ts"],"names":[],"mappings":"AAAA,MAAM,YAAY,GAAG,CACnB,YAAqB,EACrB,cAAsB,EACtB,QAAgB,EAChB,QAAiC,EAC3B,EAAE;IACR,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,KAAK,cAAc,EAAE,CAAC;QACxE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACnB,OAAO;IACT,CAAC;IAED,IAAI,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;QACrD,iBAAiB,CAAC,YAAY,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,MAAe,EACf,aAAqB,EACrB,SAAiB,EACX,EAAE;IACR,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAClD,OAAO;IACT,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC7B,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,YAAY,EAAE,EAAE;gBAC5D,MAAM,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;YAC/B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9C,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,YAAY,EAAE,EAAE;YAC7D,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platform-mesh/portal-server-lib",
-  "version": "0.6.33",
+  "version": "0.6.35",
   "author": "Platform Mesh",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -57,7 +57,7 @@
     "@nestjs/testing": "11.1.14",
     "@openmfp/config-prettier": "0.9.2",
     "@types/jest": "30.0.0",
-    "@types/node": "24.10.14",
+    "@types/node": "24.10.15",
     "@types/supertest": "7.2.0",
     "eslint": "10.0.2",
     "eslint-config-prettier": "10.1.8",

package/src/portal-options/service-providers/content-configuration-service-providers.service.spec.ts

@@ -208,7 +208,7 @@ describe('ContentConfigurationServiceProvidersService', () => {
     expect(
       result.rawServiceProviders[0].contentConfiguration[0].luigiConfigFragment
         .data.nodes[0].entityType,
-    ).toBe('core_platform-mesh_io_account:1');
+    ).toBe('core_platform-mesh_io_account');
   });
 
   it('applies processContentConfigurationForAccountHierarchy with multi-level accountPath', async () => {
@@ -253,7 +253,7 @@ describe('ContentConfigurationServiceProvidersService', () => {
       result.rawServiceProviders[0].contentConfiguration[0].luigiConfigFragment
         .data.nodes[0].entityType,
     ).toBe(
-      'core_platform-mesh_io_account:1.core_platform-mesh_io_account:2.core_platform-mesh_io_account:3',
+      'core_platform-mesh_io_account.core_platform-mesh_io_account.core_platform-mesh_io_account',
     );
   });
 
@@ -308,7 +308,7 @@ describe('ContentConfigurationServiceProvidersService', () => {
       result.rawServiceProviders[0].contentConfiguration[0].luigiConfigFragment
         .data.nodes[0].children[0];
 
-    expect(childNode.defineEntity.id).toBe('core_platform-mesh_io_account:2');
+    expect(childNode.defineEntity.id).toBe('old-id');
     expect(childNode.pathSegment).toBe(':core_platform-mesh_io_accountId:2');
   });
 

package/src/portal-options/service-providers/kubernetes-service-providers.service.spec.ts

@@ -453,7 +453,7 @@ describe('KubernetesServiceProvidersService', () => {
     expect(
       res.rawServiceProviders[0].contentConfiguration[0].luigiConfigFragment
         .data.nodes[0].entityType,
-    ).toBe('core_platform-mesh_io_account:1');
+    ).toBe('core_platform-mesh_io_account');
   });
 
   it('should apply processContentConfigurationForAccountHierarchy with multi-level accountPath', async () => {
@@ -488,7 +488,7 @@ describe('KubernetesServiceProvidersService', () => {
       res.rawServiceProviders[0].contentConfiguration[0].luigiConfigFragment
         .data.nodes[0].entityType,
     ).toBe(
-      'core_platform-mesh_io_account:1.core_platform-mesh_io_account:2.core_platform-mesh_io_account:3',
+      'core_platform-mesh_io_account.core_platform-mesh_io_account.core_platform-mesh_io_account',
     );
   });
 
@@ -535,7 +535,7 @@ describe('KubernetesServiceProvidersService', () => {
       res.rawServiceProviders[0].contentConfiguration[0].luigiConfigFragment
         .data.nodes[0].children[0];
 
-    expect(childNode.defineEntity.id).toBe('core_platform-mesh_io_account:2');
+    expect(childNode.defineEntity.id).toBe('old-id');
     expect(childNode.pathSegment).toBe(':core_platform-mesh_io_accountId:2');
   });
 

package/src/portal-options/utils/account-hierarchy-resolver.spec.ts

@@ -31,7 +31,7 @@ describe('updateEntityTypeFromAccountPath', () => {
     const result = updateEntityTypeFromAccountPath(config, 'acc1');
 
     expect(result.luigiConfigFragment.data.nodes[0].entityType).toBe(
-      'core_platform-mesh_io_account:1',
+      'core_platform-mesh_io_account',
     );
   });
 
@@ -47,7 +47,7 @@ describe('updateEntityTypeFromAccountPath', () => {
     const result = updateEntityTypeFromAccountPath(config, 'acc1:acc2:acc3');
 
     expect(result.luigiConfigFragment.data.nodes[0].entityType).toBe(
-      'core_platform-mesh_io_account:1.core_platform-mesh_io_account:2.core_platform-mesh_io_account:3',
+      'core_platform-mesh_io_account.core_platform-mesh_io_account.core_platform-mesh_io_account',
     );
   });
 
@@ -66,10 +66,10 @@ describe('updateEntityTypeFromAccountPath', () => {
     const result = updateEntityTypeFromAccountPath(config, 'acc1:acc2');
 
     expect(result.luigiConfigFragment.data.nodes[0].entityType).toBe(
-      'core_platform-mesh_io_account:1.core_platform-mesh_io_account:2',
+      'core_platform-mesh_io_account.core_platform-mesh_io_account',
     );
     expect(result.luigiConfigFragment.data.nodes[1].entityType).toBe(
-      'core_platform-mesh_io_account:1.core_platform-mesh_io_account:2',
+      'core_platform-mesh_io_account.core_platform-mesh_io_account',
     );
   });
 
@@ -128,17 +128,143 @@ describe('updateAccountNodeChildren', () => {
     const childNode = result.luigiConfigFragment.data.nodes[0]
       .children?.[0] as any;
 
-    expect(childNode.defineEntity.id).toBe('core_platform-mesh_io_account:2');
-    expect(childNode.context.accountId).toBe(
+    expect(childNode.defineEntity.id).toBe('old-id');
+    expect(childNode.pathSegment).toBe(':core_platform-mesh_io_accountId:2');
+  });
+
+  it('should replace all additional fields equal to previous pathSegment', () => {
+    const oldPathSegment = ':core_platform-mesh_io_accountId';
+    const config = createMockContentConfiguration({
+      luigiConfigFragment: {
+        data: {
+          nodes: [
+            {
+              children: [
+                {
+                  defineEntity: {
+                    id: 'old-id',
+                    contextKey: oldPathSegment,
+                    additionalContextKeys: [oldPathSegment],
+                  } as any,
+                  context: {
+                    accountId: oldPathSegment,
+                    customPath: oldPathSegment,
+                    nested: [{ deepPath: oldPathSegment }],
+                  },
+                  pathSegment: oldPathSegment,
+                  navHeader: {
+                    label: oldPathSegment,
+                  },
+                },
+              ],
+            },
+          ],
+        },
+      },
+    });
+
+    const result = updateAccountNodeChildren(config, 'acc1');
+    const childNode = result.luigiConfigFragment.data.nodes[0]
+      .children?.[0] as any;
+
+    expect(childNode.pathSegment).toBe(':core_platform-mesh_io_accountId:2');
+    expect(childNode.defineEntity.contextKey).toBe(
       ':core_platform-mesh_io_accountId:2',
     );
-    expect(childNode.context['core_platform-mesh_io_accountId']).toBe(
+    expect(childNode.defineEntity.additionalContextKeys[0]).toBe(
       ':core_platform-mesh_io_accountId:2',
     );
-    expect(childNode.context.resourceId).toBe(
+    expect(childNode.context.customPath).toBe(':core_platform-mesh_io_accountId:2');
+    expect(childNode.context.nested[0].deepPath).toBe(
       ':core_platform-mesh_io_accountId:2',
     );
-    expect(childNode.pathSegment).toBe(':core_platform-mesh_io_accountId:2');
+    expect(childNode.navHeader.label).toBe(':core_platform-mesh_io_accountId:2');
+  });
+
+  it('should keep defineEntity.id controlled only by explicit assignment', () => {
+    const oldPathSegment = ':core_platform-mesh_io_accountId';
+    const config = createMockContentConfiguration({
+      luigiConfigFragment: {
+        data: {
+          nodes: [
+            {
+              children: [
+                {
+                  defineEntity: {
+                    id: oldPathSegment,
+                  },
+                  context: {},
+                  pathSegment: oldPathSegment,
+                },
+              ],
+            },
+          ],
+        },
+      },
+    });
+
+    const result = updateAccountNodeChildren(config, 'acc1');
+    const childNode = result.luigiConfigFragment.data.nodes[0]
+      .children?.[0] as any;
+
+    expect(childNode.defineEntity.id).toBe(':core_platform-mesh_io_accountId:2');
+  });
+
+  it('should not replace strings that only partially match previous pathSegment', () => {
+    const oldPathSegment = ':core_platform-mesh_io_accountId';
+    const config = createMockContentConfiguration({
+      luigiConfigFragment: {
+        data: {
+          nodes: [
+            {
+              children: [
+                {
+                  defineEntity: { id: 'old-id' },
+                  context: {
+                    exact: oldPathSegment,
+                    partial: `${oldPathSegment}:suffix`,
+                  },
+                  pathSegment: oldPathSegment,
+                },
+              ],
+            },
+          ],
+        },
+      },
+    });
+
+    const result = updateAccountNodeChildren(config, 'acc1');
+    const childNode = result.luigiConfigFragment.data.nodes[0]
+      .children?.[0] as any;
+
+    expect(childNode.context.exact).toBe(':core_platform-mesh_io_accountId:2');
+    expect(childNode.context.partial).toBe(':core_platform-mesh_io_accountId:suffix');
+  });
+
+  it('should not set pathSegment when previous pathSegment is missing', () => {
+    const config = createMockContentConfiguration({
+      luigiConfigFragment: {
+        data: {
+          nodes: [
+            {
+              children: [
+                {
+                  defineEntity: { id: 'old-id' },
+                  context: {},
+                },
+              ],
+            },
+          ],
+        },
+      },
+    });
+
+    const result = updateAccountNodeChildren(config, 'acc1');
+    const childNode = result.luigiConfigFragment.data.nodes[0]
+      .children?.[0] as any;
+
+    expect(childNode.pathSegment).toBeUndefined();
+    expect(childNode.defineEntity.id).toBe('old-id');
   });
 
   it('should update children node for multi-level account path', () => {
@@ -164,10 +290,7 @@ describe('updateAccountNodeChildren', () => {
     const childNode = result.luigiConfigFragment.data.nodes[0]
       .children?.[0] as any;
 
-    expect(childNode.defineEntity.id).toBe('core_platform-mesh_io_account:4');
-    expect(childNode.context.accountId).toBe(
-      ':core_platform-mesh_io_accountId:4',
-    );
+    expect(childNode.defineEntity.id).toBe('old-id');
     expect(childNode.pathSegment).toBe(':core_platform-mesh_io_accountId:4');
   });
 
@@ -266,9 +389,9 @@ describe('processContentConfigurationForAccountHierarchy', () => {
     const childNode = result.luigiConfigFragment.data.nodes[0]
       .children?.[0] as any;
 
-    expect(childNode.defineEntity.id).toBe('core_platform-mesh_io_account:2');
+    expect(childNode.defineEntity.id).toBe('old-id');
     expect(result.luigiConfigFragment.data.nodes[0].entityType).toBe(
-      'core_platform-mesh_io_account:1',
+      'core_platform-mesh_io_account',
     );
   });
 
@@ -301,7 +424,7 @@ describe('processContentConfigurationForAccountHierarchy', () => {
 
     expect(childNode.defineEntity.id).toBe('old-id');
     expect(result.luigiConfigFragment.data.nodes[0].entityType).toBe(
-      'core_platform-mesh_io_account:1',
+      'core_platform-mesh_io_account',
     );
   });
 
@@ -320,7 +443,7 @@ describe('processContentConfigurationForAccountHierarchy', () => {
     });
 
     expect(result.luigiConfigFragment.data.nodes[0].entityType).toBe(
-      'core_platform-mesh_io_account:1.core_platform-mesh_io_account:2',
+      'core_platform-mesh_io_account.core_platform-mesh_io_account',
     );
   });
 

package/src/portal-options/utils/account-hierarchy-resolver.ts

@@ -1,3 +1,4 @@
+import { replaceStringDeep } from './replace-string-deep.js';
 import { ContentConfiguration } from '@openmfp/portal-server-lib';
 
 const ACCOUNT_ENTITY_TYPE = 'core_platform-mesh_io_account';
@@ -13,7 +14,8 @@ export const updateEntityTypeFromAccountPath = (
 
     const accountPathParts = accountPath
       .split(':')
-      .map((_, i) => `${ACCOUNT_ENTITY_TYPE}:${i + 1}`)
+      .filter(Boolean)
+      .map(() => ACCOUNT_ENTITY_TYPE)
       .join('.');
 
     node.entityType = node.entityType.replace(
@@ -31,15 +33,18 @@ export const updateAccountNodeChildren = (
 ): ContentConfiguration => {
   const accountChildrenNode =
     contentConfiguration.luigiConfigFragment.data.nodes[0]?.children?.[0];
-  const nextHierarchyLevel = accountPath.split(':').length + 1;
 
   if (accountChildrenNode) {
-    accountChildrenNode.defineEntity.id = `${ACCOUNT_ENTITY_TYPE}:${nextHierarchyLevel}`;
-    accountChildrenNode.context.accountId = `:${ACCOUNT_ENTITY_TYPE}Id:${nextHierarchyLevel}`;
-    accountChildrenNode.context[`${ACCOUNT_ENTITY_TYPE}Id`] =
-      `:${ACCOUNT_ENTITY_TYPE}Id:${nextHierarchyLevel}`;
-    accountChildrenNode.context.resourceId = `:${ACCOUNT_ENTITY_TYPE}Id:${nextHierarchyLevel}`;
-    accountChildrenNode.pathSegment = `:${ACCOUNT_ENTITY_TYPE}Id:${nextHierarchyLevel}`;
+    const nextHierarchyLevel =
+      accountPath.split(':').filter(Boolean).length + 1;
+    const previousPathSegment = accountChildrenNode.pathSegment;
+    const nextPathSegment = `:${ACCOUNT_ENTITY_TYPE}Id:${nextHierarchyLevel}`;
+
+    replaceStringDeep(
+      accountChildrenNode,
+      previousPathSegment,
+      nextPathSegment,
+    );
   }
 
   return contentConfiguration;

package/src/portal-options/utils/replace-string-deep.spec.ts

@@ -0,0 +1,41 @@
+import { replaceStringDeep } from './replace-string-deep.js';
+
+describe('replaceStringDeep', () => {
+  it('replaces matching strings in nested objects and arrays', () => {
+    const target = {
+      direct: ':accountId',
+      nested: {
+        list: [':accountId', { deep: ':accountId' }],
+      },
+    };
+
+    replaceStringDeep(target, ':accountId', ':accountId:2');
+
+    expect(target).toEqual({
+      direct: ':accountId:2',
+      nested: {
+        list: [':accountId:2', { deep: ':accountId:2' }],
+      },
+    });
+  });
+
+  it('does not replace partial string matches', () => {
+    const target = {
+      exact: ':accountId',
+      partial: ':accountId:suffix',
+    };
+
+    replaceStringDeep(target, ':accountId', ':accountId:2');
+
+    expect(target.exact).toBe(':accountId:2');
+    expect(target.partial).toBe(':accountId:suffix');
+  });
+
+  it('supports root arrays', () => {
+    const target = [':accountId', { value: ':accountId' }, ['other']];
+
+    replaceStringDeep(target, ':accountId', ':accountId:2');
+
+    expect(target).toEqual([':accountId:2', { value: ':accountId:2' }, ['other']]);
+  });
+});

package/src/portal-options/utils/replace-string-deep.ts

@@ -0,0 +1,40 @@
+const processValue = (
+  currentValue: unknown,
+  valueToReplace: string,
+  newValue: string,
+  setValue: (value: string) => void,
+): void => {
+  if (typeof currentValue === 'string' && currentValue === valueToReplace) {
+    setValue(newValue);
+    return;
+  }
+
+  if (currentValue && typeof currentValue === 'object') {
+    replaceStringDeep(currentValue, valueToReplace, newValue);
+  }
+};
+
+export const replaceStringDeep = (
+  target: unknown,
+  previousValue: string,
+  nextValue: string,
+): void => {
+  if (target === null || typeof target !== 'object') {
+    return;
+  }
+
+  if (Array.isArray(target)) {
+    target.forEach((item, index) => {
+      processValue(item, previousValue, nextValue, (updatedValue) => {
+        target[index] = updatedValue;
+      });
+    });
+    return;
+  }
+
+  Object.entries(target).forEach(([key, value]) => {
+    processValue(value, previousValue, nextValue, (updatedValue) => {
+      target[key] = updatedValue;
+    });
+  });
+};