@sap-ux/preview-middleware 0.19.10 → 0.19.11

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

@@ -37,9 +37,9 @@ sap.ui.define(["sap/ui/model/json/JSONModel", "../api-handler", "./BaseDialog.co
      * @param event Event
      */
     onCreateBtnPress: async function _onCreateBtnPress(event) {
-      await BaseDialog.prototype.onCreateBtnPressHandler.call(this);
       const source = event.getSource();
       source.setEnabled(false);
+      await BaseDialog.prototype.onCreateBtnPressHandler.call(this);
       const fragmentName = this.model.getProperty('/newFragmentName');
       this.createExtensionPointFragmentChange(fragmentName);
       notifyUser(`Note: The '${fragmentName}.fragment.xml' fragment will be created once you save the change.`, 8000);

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

@@ -61,10 +61,11 @@ export default class ExtensionPoint extends BaseDialog<ExtensionPointModel> {
      * @param event Event
      */
     async onCreateBtnPress(event: Event) {
-        await super.onCreateBtnPressHandler();
         const source = event.getSource<Button>();
         source.setEnabled(false);
 
+        await super.onCreateBtnPressHandler();
+
         const fragmentName = this.model.getProperty('/newFragmentName');
 
         this.createExtensionPointFragmentChange(fragmentName);

package/dist/client/adp/quick-actions/add-new-subpage-quick-action-base.js

@@ -60,7 +60,7 @@ sap.ui.define(["sap/ui/core/Component", "sap/ui/dt/OverlayRegistry", "../../cpe/
         return Promise.resolve();
       }
       const component = Component.getOwnerComponentFor(modifiedControl);
-      const entitySetName = this.getEntitySetNameFromPageComponent(component);
+      const entitySetName = await this.getEntitySetNameFromPageComponent(component, metaModel);
       if (!entitySetName) {
         return Promise.resolve();
       }
@@ -69,7 +69,7 @@ sap.ui.define(["sap/ui/core/Component", "sap/ui/dt/OverlayRegistry", "../../cpe/
       if (!this.isCurrentObjectPage()) {
         await this.addNavigationOptionIfAvailable(metaModel, this.entitySet);
       } else {
-        await this.prepareNavigationData(entitySetName, metaModel);
+        await this.prepareNavigationData(metaModel);
       }
       this.control = modifiedControl;
       return Promise.resolve();

package/dist/client/adp/quick-actions/add-new-subpage-quick-action-base.ts

@@ -60,8 +60,11 @@ export abstract class AddNewSubpageBase<ODataMetaModelType>
     protected abstract getApplicationPages(): ApplicationPageData[];
     protected abstract isPageExists(targetEntitySet: string, metaModel: ODataMetaModelType): boolean | Promise<boolean>;
     protected abstract isCurrentObjectPage(): boolean;
-    protected abstract getEntitySetNameFromPageComponent(component: Component | undefined): string;
-    protected abstract prepareNavigationData(entitySetName: string, metaModel: ODataMetaModelType): Promise<void>;
+    protected abstract getEntitySetNameFromPageComponent(
+        component: Component | undefined,
+        metaModel: ODataMetaModelType
+    ): Promise<string | undefined>;
+    protected abstract prepareNavigationData(metaModel: ODataMetaModelType): Promise<void>;
     protected abstract getODataMetaModel(): ODataMetaModelType | undefined;
 
     protected async addNavigationOptionIfAvailable(
@@ -101,7 +104,7 @@ export abstract class AddNewSubpageBase<ODataMetaModelType>
         }
 
         const component = Component.getOwnerComponentFor(modifiedControl);
-        const entitySetName = this.getEntitySetNameFromPageComponent(component);
+        const entitySetName = await this.getEntitySetNameFromPageComponent(component, metaModel);
         if (!entitySetName) {
             return Promise.resolve();
         }
@@ -111,7 +114,7 @@ export abstract class AddNewSubpageBase<ODataMetaModelType>
         if (!this.isCurrentObjectPage()) {
             await this.addNavigationOptionIfAvailable(metaModel, this.entitySet);
         } else {
-            await this.prepareNavigationData(entitySetName, metaModel);
+            await this.prepareNavigationData(metaModel);
         }
         this.control = modifiedControl;
 

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

@@ -47,12 +47,12 @@ sap.ui.define(["../../../utils/fe-v2", "../add-new-subpage-quick-action-base", "
       if (!isA('sap.suite.ui.generic.template.lib.TemplateComponent', component)) {
         throw new Error('Unexpected type of page owner component');
       }
-      return component.getEntitySet();
+      return Promise.resolve(component.getEntitySet());
     }
-    async prepareNavigationData(entitySetName, metaModel) {
-      const entitySet = metaModel.getODataEntitySet(entitySetName);
+    async prepareNavigationData(metaModel) {
+      const entitySet = metaModel.getODataEntitySet(this.entitySet);
       const entityType = metaModel.getODataEntityType(entitySet.entityType);
-      for (const navProp of entityType?.navigationProperty || []) {
+      for (const navProp of entityType?.navigationProperty ?? []) {
         const associationEnd = metaModel.getODataAssociationEnd(entityType, navProp.name);
         if (associationEnd?.multiplicity !== '*') {
           continue;

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

@@ -52,18 +52,18 @@ export class AddNewSubpage extends AddNewSubpageBase<ODataMetaModelV2> {
         return (this.context.rta.getRootControlInstance().getModel() as ODataModelV2)?.getMetaModel();
     }
 
-    protected getEntitySetNameFromPageComponent(component: Component | undefined): string {
+    protected getEntitySetNameFromPageComponent(component: Component | undefined): Promise<string> {
         if (!isA<TemplateComponent>('sap.suite.ui.generic.template.lib.TemplateComponent', component)) {
             throw new Error('Unexpected type of page owner component');
         }
-        return component.getEntitySet();
+        return Promise.resolve(component.getEntitySet());
     }
 
-    protected async prepareNavigationData(entitySetName: string, metaModel: ODataMetaModelV2): Promise<void> {
-        const entitySet = metaModel.getODataEntitySet(entitySetName) as EntitySet;
+    protected async prepareNavigationData(metaModel: ODataMetaModelV2): Promise<void> {
+        const entitySet = metaModel.getODataEntitySet(this.entitySet!) as EntitySet;
         const entityType = metaModel.getODataEntityType(entitySet.entityType) as EntityType;
 
-        for (const navProp of entityType?.navigationProperty || []) {
+        for (const navProp of entityType?.navigationProperty ?? []) {
             const associationEnd = metaModel.getODataAssociationEnd(entityType, navProp.name);
             if (associationEnd?.multiplicity !== '*') {
                 continue;

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

@@ -85,14 +85,22 @@ sap.ui.define(["../../../utils/fe-v4", "../add-new-subpage-quick-action-base", "
     getODataMetaModel() {
       return this.context.rta.getRootControlInstance().getModel()?.getMetaModel();
     }
-    getEntitySetNameFromPageComponent(component) {
+    async getEntitySetNameFromPageComponent(component, metaModel) {
       if (!isA('sap.fe.templates.ListReport.Component', component) && !isA('sap.fe.templates.ObjectPage.Component', component)) {
         throw new Error('Unexpected type of page owner component');
       }
-      return component.getEntitySet();
+      let entitySet = component.getEntitySet();
+      let contextPath = component.getContextPath();
+      if (contextPath) {
+        entitySet = await this.resolveContextPathTargetName(contextPath, metaModel);
+      }
+      return entitySet;
     }
-    async prepareNavigationData(entitySetName, metaModel) {
-      const entitySet = await metaModel.requestObject(`/${entitySetName}`); // NO SONAR;
+    async prepareNavigationData(metaModel) {
+      const entitySet = await metaModel.requestObject(`/${this.entitySet}`); // NO SONAR;
+      if (!entitySet) {
+        return;
+      }
       const entityTypePath = entitySet.$Type;
       const entitySetNavigationKeys = Object.keys(entitySet.$NavigationPropertyBinding);
       for (const navigationProperty of entitySetNavigationKeys) {

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

@@ -117,21 +117,32 @@ export class AddNewSubpage extends AddNewSubpageBase<ODataMetaModelV4> {
         return (this.context.rta.getRootControlInstance().getModel() as ODataModelV4)?.getMetaModel();
     }
 
-    protected getEntitySetNameFromPageComponent(component: Component | undefined): string {
+    protected async getEntitySetNameFromPageComponent(
+        component: Component | undefined,
+        metaModel: ODataMetaModelV4
+    ): Promise<string | undefined> {
         if (
             !isA<FEObjectPageComponent>('sap.fe.templates.ListReport.Component', component) &&
             !isA<FEListReportComponent>('sap.fe.templates.ObjectPage.Component', component)
         ) {
             throw new Error('Unexpected type of page owner component');
         }
-        return component.getEntitySet();
+        let entitySet: string | undefined = component.getEntitySet();
+        let contextPath = component.getContextPath();
+        if (contextPath) {
+            entitySet = await this.resolveContextPathTargetName(contextPath, metaModel);
+        }
+        return entitySet;
     }
 
-    protected async prepareNavigationData(entitySetName: string, metaModel: ODataMetaModelV4) {
-        const entitySet = (await metaModel.requestObject(`/${entitySetName}`)) as {
+    protected async prepareNavigationData(metaModel: ODataMetaModelV4) {
+        const entitySet = (await metaModel.requestObject(`/${this.entitySet}`)) as {
             $Type: string;
             $NavigationPropertyBinding: { [key: string]: string };
         }; // NO SONAR;
+        if (!entitySet) {
+            return;
+        }
         const entityTypePath = entitySet.$Type;
         const entitySetNavigationKeys = Object.keys(entitySet.$NavigationPropertyBinding);
 

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Apreview-middleware"
   },
-  "version": "0.19.10",
+  "version": "0.19.11",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -26,9 +26,9 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "@sap-ux/adp-tooling": "0.13.22",
-    "@sap-ux/btp-utils": "1.0.2",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.6.2",
     "@sap-ux/feature-toggle": "0.2.3",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.6.2",
+    "@sap-ux/btp-utils": "1.0.2",
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-access": "1.29.18",
     "@sap-ux/system-access": "0.5.34"
@@ -49,7 +49,7 @@
     "nock": "13.4.0",
     "npm-run-all2": "6.2.0",
     "supertest": "6.3.3",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.13.12",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.13.13",
     "@sap-ux/axios-extension": "1.19.2",
     "@sap-ux/i18n": "0.2.3",
     "@sap-ux/store": "1.0.0",