@sap-ux/ui5-test-writer 1.2.19 → 1.2.20

package/dist/types.d.ts

@@ -101,10 +101,13 @@ export interface FFOPAConfig {
     ui5Theme?: string;
     useVirtualPreviewEndpoints?: boolean;
 }
+export type ObjectPageNavigationParent = {
+    name: string;
+    navigationProperty: string;
+};
 export type ObjectPageNavigationParents = {
     parentLRName?: string;
-    parentOPName?: string;
-    parentOPTableSection?: string;
+    parentOPs: ObjectPageNavigationParent[];
 };
 export type SectionFormField = {
     property: string;

package/dist/utils/objectPageUtils.js

@@ -60,26 +60,40 @@ export function getObjectPages(applicationModel) {
     return objectPages;
 }
 /**
- * Finds parent pages for the object page, and returns their identifiers.
+ * Finds the chain of parent Object Pages leading from the List Report down to the target page.
  *
  * @param targetObjectPageKey - key of the target object page
  * @param objectPages - the array of object pages extracted from the application model
  * @param listReportPageKey - the key of the List Report page in the application model, used to find navigation routes to object pages
- * @returns navigation data including parent page identifiers
+ * @returns navigation data including the ordered ancestor Object Page chain
  */
 function getObjectPageNavigationParents(targetObjectPageKey, objectPages, listReportPageKey) {
-    const navigationParents = {
-        parentLRName: listReportPageKey ?? '' // app is possibly malformed if no LR found
-    };
-    objectPages.forEach((objectPage) => {
-        const navigationRoutes = getNavigationRoutes(objectPage);
-        const routeToTargetOP = navigationRoutes.find((nav) => nav.route === targetObjectPageKey);
-        if (routeToTargetOP) {
-            navigationParents.parentOPName = objectPage.name;
-            navigationParents.parentOPTableSection = routeToTargetOP.identifier;
+    const parentOPs = [];
+    const visited = new Set([targetObjectPageKey]); // guard against infinite loop in case of invalid manifest entries
+    let cursor = targetObjectPageKey;
+    while (true) {
+        const childKey = cursor;
+        let parent;
+        let parentNavigationProperty;
+        for (const objectPage of objectPages) {
+            const route = getNavigationRoutes(objectPage).find((navigation) => navigation.route === childKey);
+            if (route) {
+                parent = objectPage;
+                parentNavigationProperty = route.identifier;
+                break;
+            }
         }
-    });
-    return navigationParents;
+        if (!parent?.name || !parentNavigationProperty || visited.has(parent.name)) {
+            break;
+        }
+        visited.add(parent.name);
+        parentOPs.unshift({ name: parent.name, navigationProperty: parentNavigationProperty });
+        cursor = parent.name;
+    }
+    return {
+        parentLRName: listReportPageKey ?? '', // app is possibly malformed if no LR found
+        parentOPs
+    };
 }
 /**
  *  Extracts header sections data from an object page model.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/ui5-test-writer",
   "description": "SAP UI5 tests writer",
-  "version": "1.2.19",
+  "version": "1.2.20",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",

package/templates/v4/integration/ObjectPageJourney.js

@@ -33,11 +33,11 @@ sap.ui.define([
             Then.onThe<%- navigationParents.parentLRName%>Generated.onTable().iCheckRows();
             When.onThe<%- navigationParents.parentLRName%>Generated.onTable().iPressRow(0);
 <% } -%>
-<% if(navigationParents.parentOPName) { %>
-            Then.onThe<%- navigationParents.parentOPName%>Generated.iSeeThisPage();
-            Then.onThe<%- navigationParents.parentOPName%>Generated.onTable({ property: "<%- navigationParents.parentOPTableSection %>" }).iCheckRows();
-            When.onThe<%- navigationParents.parentOPName%>Generated.onTable({ property: "<%- navigationParents.parentOPTableSection %>" }).iPressRow(0);
-<% } %>
+<% navigationParents.parentOPs.forEach(function(parent) { %>
+            Then.onThe<%- parent.name %>Generated.iSeeThisPage();
+            Then.onThe<%- parent.name %>Generated.onTable({ property: "<%- parent.navigationProperty %>" }).iCheckRows();
+            When.onThe<%- parent.name %>Generated.onTable({ property: "<%- parent.navigationProperty %>" }).iPressRow(0);
+<% }); %>
             Then.onThe<%- name%>Generated.iSeeThisPage();
         });
 

package/templates/v4/integration/ObjectPageJourney.ts

@@ -52,11 +52,11 @@ function journey() {
         Then.onThe<%- navigationParents.parentLRName%>Generated.onTable("").iCheckRows();
         When.onThe<%- navigationParents.parentLRName%>Generated.onTable("").iPressRow(0);
 <% } -%>
-<% if(navigationParents.parentOPName) { %>
-        Then.onThe<%- navigationParents.parentOPName%>Generated.iSeeThisPage();
-        Then.onThe<%- navigationParents.parentOPName%>Generated.onTable({ property: "<%- navigationParents.parentOPTableSection %>" }).iCheckRows();
-        When.onThe<%- navigationParents.parentOPName%>Generated.onTable({ property: "<%- navigationParents.parentOPTableSection %>" }).iPressRow(0);
-<% } %>
+<% navigationParents.parentOPs.forEach(function(parent) { %>
+        Then.onThe<%- parent.name %>Generated.iSeeThisPage();
+        Then.onThe<%- parent.name %>Generated.onTable({ property: "<%- parent.navigationProperty %>" }).iCheckRows();
+        When.onThe<%- parent.name %>Generated.onTable({ property: "<%- parent.navigationProperty %>" }).iPressRow(0);
+<% }); %>
         Then.onThe<%- name%>Generated.iSeeThisPage();
     });