@sap-ux/preview-middleware 1.2.12 → 1.2.14

package/dist/client/adp/controllers/AddSubpage.controller.js

@@ -96,7 +96,7 @@ sap.ui.define(["sap/ui/model/json/JSONModel", "../../i18n", "../command-executor
             },
             targetPage: {
               type: 'Component',
-              id: `${targetEntitySet}ObjectPage`,
+              id: `${navProperty}|${targetEntitySet}ObjectPage`,
               name: 'sap.fe.templates.ObjectPage',
               routePattern,
               settings: {

package/dist/client/adp/controllers/AddSubpage.controller.ts

@@ -154,7 +154,7 @@ export default class AddSubpage extends BaseDialog<AddSubpageModel> {
                     },
                     targetPage: {
                         type: 'Component',
-                        id: `${targetEntitySet}ObjectPage`,
+                        id: `${navProperty}|${targetEntitySet}ObjectPage`,
                         name: 'sap.fe.templates.ObjectPage',
                         routePattern,
                         settings: {

package/dist/client/adp/quick-actions/fe-v4/add-new-subpage.js

@@ -10,6 +10,7 @@ sap.ui.define(["../../../utils/fe-v4", "../add-new-subpage-quick-action-base", "
   const getUi5Version = _____utils_versionjs["getUi5Version"];
   const isLowerThanMinimalUi5Version = _____utils_versionjs["isLowerThanMinimalUi5Version"];
   const getPageId = ___utilsjs["getPageId"];
+  const hasRouteForNavProperty = ___utilsjs["hasRouteForNavProperty"];
   const OBJECT_PAGE_COMPONENT_NAME_V4 = 'sap.fe.templates.ObjectPage.ObjectPage';
 
   /**
@@ -105,11 +106,20 @@ sap.ui.define(["../../../utils/fe-v4", "../add-new-subpage-quick-action-base", "
       }
       const entityTypePath = entitySet.$Type;
       const entitySetNavigationKeys = Object.keys(entitySet.$NavigationPropertyBinding);
+      const pageId = getPageId(this.context);
+      if (!pageId) {
+        return;
+      }
       for (const navigationProperty of entitySetNavigationKeys) {
-        const associationEnd = await metaModel.requestObject(`/${entityTypePath}/${navigationProperty}`);
+        const associationEnd = await metaModel.requestObject(`/${entityTypePath}/${navigationProperty}`); // NO SONAR;
         if (associationEnd?.$isCollection) {
           const targetEntitySet = entitySet.$NavigationPropertyBinding[navigationProperty];
-          await this.addNavigationOptionIfAvailable(metaModel, targetEntitySet, navigationProperty);
+          if (targetEntitySet && !hasRouteForNavProperty(this.context.manifest, pageId, navigationProperty)) {
+            this.navProperties.push({
+              entitySet: targetEntitySet,
+              navProperty: navigationProperty
+            });
+          }
         }
       }
     }

package/dist/client/adp/quick-actions/fe-v4/add-new-subpage.ts

@@ -10,7 +10,7 @@ import FEObjectPageComponent from 'sap/fe/templates/ObjectPage/Component';
 import FEListReportComponent from 'sap/fe/templates/ListReport/Component';
 import { getUi5Version, isLowerThanMinimalUi5Version } from '../../../utils/version.js';
 import { PageDescriptorV4 } from '../../controllers/types.js';
-import { getPageId } from './utils.js';
+import { getPageId, hasRouteForNavProperty } from './utils.js';
 
 export const OBJECT_PAGE_COMPONENT_NAME_V4 = 'sap.fe.templates.ObjectPage.ObjectPage';
 
@@ -142,16 +142,22 @@ export class AddNewSubpage extends AddNewSubpageBase<ODataMetaModelV4> {
         }
         const entityTypePath = entitySet.$Type;
         const entitySetNavigationKeys = Object.keys(entitySet.$NavigationPropertyBinding);
+        const pageId = getPageId(this.context);
+        if (!pageId) {
+            return;
+        }
 
         for (const navigationProperty of entitySetNavigationKeys) {
             const associationEnd = (await metaModel.requestObject(`/${entityTypePath}/${navigationProperty}`)) as {
                 $Type: string;
                 $isCollection: boolean;
                 $kind: 'NavigationProperty';
-            };
+            }; // NO SONAR;
             if (associationEnd?.$isCollection) {
                 const targetEntitySet = entitySet.$NavigationPropertyBinding[navigationProperty];
-                await this.addNavigationOptionIfAvailable(metaModel, targetEntitySet, navigationProperty);
+                if (targetEntitySet && !hasRouteForNavProperty(this.context.manifest, pageId, navigationProperty)) {
+                    this.navProperties.push({ entitySet: targetEntitySet, navProperty: navigationProperty });
+                }
             }
         }
     }

package/dist/client/adp/quick-actions/fe-v4/utils.js

@@ -134,6 +134,13 @@ sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../.
     }
     return undefined;
   }
+  function hasRouteForNavProperty(manifest, sourcePageId, navigationProperty) {
+    const targets = manifest['sap.ui5']?.routing?.targets ?? {};
+    const sourceTarget = targets[sourcePageId];
+
+    // Check if a route exists from the source page for the specified navigation property.
+    return !!sourceTarget?.options?.settings?.navigation?.[navigationProperty]?.detail?.route;
+  }
 
   /**
    * Return the line item annotation that defines the table.
@@ -173,6 +180,7 @@ sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../.
   __exports.generateRoutePattern = generateRoutePattern;
   __exports.getLineItemAnnotation = getLineItemAnnotation;
   __exports.getPropertyPath = getPropertyPath;
+  __exports.hasRouteForNavProperty = hasRouteForNavProperty;
   return __exports;
 });
 //# sourceMappingURL=utils.js.map

package/dist/client/adp/quick-actions/fe-v4/utils.ts

@@ -5,6 +5,7 @@ import CommandFactory from 'sap/ui/rta/command/CommandFactory';
 import { getV4AppComponent, getPageName, getReference, isMacroTable } from '../../../utils/fe-v4.js';
 import UI5Element from 'sap/ui/core/Element';
 import type AppComponent from 'sap/fe/core/AppComponent';
+import { Manifest } from 'sap/ui/rta/RuntimeAuthoring';
 
 interface ViewDataType {
     stableId: string;
@@ -165,6 +166,18 @@ export function getPropertyPath(table: UI5Element, property: 'actions' | 'column
     return undefined;
 }
 
+export function hasRouteForNavProperty(
+    manifest: Manifest,
+    sourcePageId: string,
+    navigationProperty: string
+): boolean {
+    const targets = manifest['sap.ui5']?.routing?.targets ?? {};
+    const sourceTarget = targets[sourcePageId];
+
+    // Check if a route exists from the source page for the specified navigation property.
+    return !!sourceTarget?.options?.settings?.navigation?.[navigationProperty]?.detail?.route;
+}
+
 /**
  * Return the line item annotation that defines the table.
  * This may come from a Presentation Variant, a Selection Presentation Variant or the default.

package/package.json

@@ -10,7 +10,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Apreview-middleware"
   },
-  "version": "1.2.12",
+  "version": "1.2.14",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -28,13 +28,13 @@
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
     "@sap/bas-sdk": "3.13.10",
-    "@sap-ux/adp-tooling": "1.0.53",
+    "@sap-ux/adp-tooling": "1.0.54",
     "@sap-ux/btp-utils": "2.0.6",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@1.0.11",
     "@sap-ux/feature-toggle": "1.0.5",
     "@sap-ux/logger": "1.0.3",
     "@sap-ux/project-access": "2.2.0",
-    "@sap-ux/system-access": "1.0.13",
+    "@sap-ux/system-access": "1.0.14",
     "@sap-ux/i18n": "1.0.3"
   },
   "devDependencies": {
@@ -54,9 +54,9 @@
     "nock": "14.0.16",
     "npm-run-all2": "9.0.2",
     "supertest": "7.2.2",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@1.2.12",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@1.2.14",
     "@sap-ux-private/playwright": "1.0.6",
-    "@sap-ux/axios-extension": "2.0.10",
+    "@sap-ux/axios-extension": "2.1.0",
     "@sap-ux/store": "2.0.7",
     "@sap-ux/ui5-info": "1.0.6"
   },