@sap-ux/preview-middleware 0.17.30 → 0.17.32

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

@@ -1,11 +1,26 @@
 "use strict";
 
-sap.ui.define(["sap/ui/rta/command/CommandFactory", "../../../utils/version"], function (CommandFactory, _____utils_version) {
+sap.ui.define(["sap/ui/rta/command/CommandFactory", "../../../utils/version", "sap/ui/core/Component"], function (CommandFactory, _____utils_version, Component) {
   "use strict";
 
   const getUi5Version = _____utils_version["getUi5Version"];
   const isLowerThanMinimalUi5Version = _____utils_version["isLowerThanMinimalUi5Version"];
   const isVersionEqualOrHasNewerPatch = _____utils_version["isVersionEqualOrHasNewerPatch"];
+  /**
+   * Gets app component of a v2 project.
+   *
+   * @param control - ManagedObject.
+   * @returns AppComponent.
+   */
+  function getV2AppComponent(control) {
+    const ownerComponent = Component.getOwnerComponentFor(control);
+    let result;
+    if (ownerComponent?.isA('sap.suite.ui.generic.template.lib.TemplateComponent')) {
+      result = ownerComponent.getAppComponent();
+    }
+    return result;
+  }
+
   /**
    * Prepares the change for the manifest setting.
    *
@@ -22,9 +37,11 @@ sap.ui.define(["sap/ui/rta/command/CommandFactory", "../../../utils/version"], f
     const {
       flexSettings
     } = context;
+    const appComponent = getV2AppComponent(control);
     const modifiedValue = {
       changeType: 'appdescr_ui_generic_app_changePageConfiguration',
       reference: flexSettings.projectId,
+      appComponent,
       parameters: {
         parentPage: {
           component,
@@ -92,6 +109,7 @@ sap.ui.define(["sap/ui/rta/command/CommandFactory", "../../../utils/version"], f
   var __exports = {
     __esModule: true
   };
+  __exports.getV2AppComponent = getV2AppComponent;
   __exports.prepareManifestChange = prepareManifestChange;
   __exports.isManifestArrayStructured = isManifestArrayStructured;
   __exports.areManifestChangesSupported = areManifestChangesSupported;

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

@@ -5,6 +5,25 @@ import CommandFactory from 'sap/ui/rta/command/CommandFactory';
 import { QuickActionContext } from '../../../cpe/quick-actions/quick-action-definition';
 import { getUi5Version, isLowerThanMinimalUi5Version, isVersionEqualOrHasNewerPatch } from '../../../utils/version';
 import { Manifest } from 'sap/ui/rta/RuntimeAuthoring';
+import Component from 'sap/ui/core/Component';
+import type AppComponent from 'sap/suite/ui/generic/template/lib/AppComponent';
+import type ManagedObject from 'sap/ui/base/ManagedObject';
+import type TemplateComponent from 'sap/suite/ui/generic/template/lib/TemplateComponent';
+
+/**
+ * Gets app component of a v2 project.
+ *
+ * @param control - ManagedObject.
+ * @returns AppComponent.
+ */
+export function getV2AppComponent(control: ManagedObject): AppComponent | undefined {
+    const ownerComponent = Component.getOwnerComponentFor(control);
+    let result;
+    if (ownerComponent?.isA<TemplateComponent>('sap.suite.ui.generic.template.lib.TemplateComponent')) {
+        result = ownerComponent.getAppComponent();
+    }
+    return result;
+}
 
 /**
  * Prepares the change for the manifest setting.
@@ -27,10 +46,11 @@ export async function prepareManifestChange(
     propertyValue: object | string
 ): Promise<FlexCommand[]> {
     const { flexSettings } = context;
-
+    const appComponent = getV2AppComponent(control);
     const modifiedValue = {
         changeType: 'appdescr_ui_generic_app_changePageConfiguration',
         reference: flexSettings.projectId,
+        appComponent,
         parameters: {
             parentPage: {
                 component,
@@ -62,7 +82,6 @@ export function isManifestArrayStructured(manifest: Manifest): boolean {
     return Array.isArray(manifest['sap.ui.generic.app']?.pages);
 }
 
-
 /**
  * Checks if the current UI5 version and manifest structure is supported in v2 applications.
  *

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

@@ -4,7 +4,7 @@ sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../.
   "use strict";
 
   const getControlById = _____utils_core["getControlById"];
-  const getAppComponent = _____utils_fe_v4["getAppComponent"];
+  const getV4AppComponent = _____utils_fe_v4["getV4AppComponent"];
   const getPageName = _____utils_fe_v4["getPageName"];
   const getReference = _____utils_fe_v4["getReference"];
   async function executeToggleAction(context, isButtonEnabled, controlType, propertyPath) {
@@ -24,7 +24,7 @@ sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../.
       }
       const modifiedValue = {
         reference: getReference(modifiedControl),
-        appComponent: getAppComponent(modifiedControl),
+        appComponent: getV4AppComponent(modifiedControl),
         changeType: 'appdescr_fe_changePageConfiguration',
         parameters: {
           page: getPageName(parent),

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

@@ -2,7 +2,7 @@ import { getControlById } from '../../../utils/core';
 import FlexCommand from 'sap/ui/rta/command/FlexCommand';
 import { QuickActionContext } from '../../../cpe/quick-actions/quick-action-definition';
 import CommandFactory from 'sap/ui/rta/command/CommandFactory';
-import { getAppComponent, getPageName, getReference } from '../../../utils/fe-v4';
+import { getV4AppComponent, getPageName, getReference } from '../../../utils/fe-v4';
 
 export async function executeToggleAction(
     context: QuickActionContext,
@@ -26,7 +26,7 @@ export async function executeToggleAction(
 
         const modifiedValue = {
             reference: getReference(modifiedControl),
-            appComponent: getAppComponent(modifiedControl),
+            appComponent: getV4AppComponent(modifiedControl),
             changeType: 'appdescr_fe_changePageConfiguration',
             parameters: {
                 page: getPageName(parent),

package/dist/client/cpe/changes/service.js

@@ -50,8 +50,8 @@ sap.ui.define([
     const getConfigMapControlIdMap = ____utils_fe_v4['getConfigMapControlIdMap'];
     const TITLE_MAP = { appdescr_app_addAnnotationsToOData: 'Add New Annotation File' };
     const STACK_CHANGE_EVENT = 'STACK_CHANGED';
-    const PROPRTY_CHANGE = 'propertyChange';
-    const PROPRTY_BINDING_CHANGE = 'propertyBindingChange';
+    const PROPERTY_CHANGE = 'propertyChange';
+    const PROPERTY_BINDING_CHANGE = 'propertyBindingChange';
     const MANIFEST_V4_CHANGE = 'appdescr_fe_changePageConfiguration';
     function assertProperties(properties, target) {
         for (const property of properties) {
@@ -361,10 +361,10 @@ sap.ui.define([
         }
         prepareV2ConfigurationChange(command, fileName, index, inactiveCommandCount) {
             const {entityPropertyChange, page} = command.getProperty('parameters');
-            const propertyName = Object.keys(entityPropertyChange.propertyValue)[0];
-            const propertyValue = entityPropertyChange.propertyValue[propertyName];
-            const controlId = this.getCommandSelectorId(command) ?? '';
             const propertyPathSegments = entityPropertyChange.propertyPath.split('/');
+            const propertyName = Object.keys(entityPropertyChange.propertyValue)?.[0] ?? propertyPathSegments[propertyPathSegments.length - 1];
+            const propertyValue = entityPropertyChange.propertyValue?.[propertyName] ?? entityPropertyChange.propertyValue;
+            const controlId = this.getCommandSelectorId(command) ?? '';
             const key = getConfigMapControlIdMap(page, propertyPathSegments);
             const isActive = index >= inactiveCommandCount;
             const controlIds = this.configPropertyControlIdMap?.get(key) || [controlId];

package/dist/client/cpe/changes/service.ts

@@ -75,12 +75,12 @@ interface BaseChange {
     selector: ChangeSelector;
 }
 
-const PROPRTY_CHANGE = 'propertyChange';
-const PROPRTY_BINDING_CHANGE = 'propertyBindingChange';
+const PROPERTY_CHANGE = 'propertyChange';
+const PROPERTY_BINDING_CHANGE = 'propertyBindingChange';
 const MANIFEST_V4_CHANGE = 'appdescr_fe_changePageConfiguration';
 
 interface PropertyChange extends BaseChange {
-    changeType: typeof PROPRTY_CHANGE | typeof PROPRTY_BINDING_CHANGE;
+    changeType: typeof PROPERTY_CHANGE | typeof PROPERTY_BINDING_CHANGE;
     controlId: string;
     propertyName: string;
     content: ChangeContent;
@@ -578,10 +578,12 @@ export class ChangeService extends EventTarget {
             };
             page: string;
         };
-        const propertyName = Object.keys(entityPropertyChange.propertyValue)[0];
-        const propertyValue = entityPropertyChange.propertyValue[propertyName];
-        const controlId = this.getCommandSelectorId(command) ?? '';
         const propertyPathSegments = entityPropertyChange.propertyPath.split('/');
+        const propertyName =
+            Object.keys(entityPropertyChange.propertyValue)?.[0] ??
+            propertyPathSegments[propertyPathSegments.length - 1];
+        const propertyValue = entityPropertyChange.propertyValue?.[propertyName] ?? entityPropertyChange.propertyValue;
+        const controlId = this.getCommandSelectorId(command) ?? '';
 
         const key = getConfigMapControlIdMap(page, propertyPathSegments);
 

package/dist/client/utils/fe-v4.js

@@ -11,7 +11,7 @@ sap.ui.define(["sap/ui/core/Component", "./core", "sap/ui/rta/command/CommandFac
    * @param control - ManagedObject.
    * @returns AppComponent.
    */
-  function getAppComponent(control) {
+  function getV4AppComponent(control) {
     const ownerComponent = Component.getOwnerComponentFor(control);
     if (ownerComponent?.isA('sap.fe.core.TemplateComponent')) {
       return ownerComponent.getAppComponent();
@@ -26,7 +26,7 @@ sap.ui.define(["sap/ui/core/Component", "./core", "sap/ui/rta/command/CommandFac
    * @returns string.
    */
   function getReference(control) {
-    const manifest = getAppComponent(control)?.getManifest();
+    const manifest = getV4AppComponent(control)?.getManifest();
     return manifest?.['sap.app']?.id ?? '';
   }
 
@@ -109,7 +109,7 @@ sap.ui.define(["sap/ui/core/Component", "./core", "sap/ui/rta/command/CommandFac
   var __exports = {
     __esModule: true
   };
-  __exports.getAppComponent = getAppComponent;
+  __exports.getV4AppComponent = getV4AppComponent;
   __exports.getReference = getReference;
   __exports.getV4PageType = getV4PageType;
   __exports.getPageName = getPageName;

package/dist/client/utils/fe-v4.ts

@@ -16,7 +16,7 @@ import FlexCommand from 'sap/ui/rta/command/FlexCommand';
  * @param control - ManagedObject.
  * @returns AppComponent.
  */
-export function getAppComponent(control: ManagedObject): AppComponent | undefined {
+export function getV4AppComponent(control: ManagedObject): AppComponent | undefined {
     const ownerComponent = Component.getOwnerComponentFor(control);
     if (ownerComponent?.isA<TemplateComponent>('sap.fe.core.TemplateComponent')) {
         return ownerComponent.getAppComponent();
@@ -31,7 +31,7 @@ export function getAppComponent(control: ManagedObject): AppComponent | undefine
  * @returns string.
  */
 export function getReference(control: ManagedObject): string {
-    const manifest = getAppComponent(control)?.getManifest() as Manifest;
+    const manifest = getV4AppComponent(control)?.getManifest() as Manifest;
     return manifest?.['sap.app']?.id ?? '';
 }
 

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.17.30",
+  "version": "0.17.32",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -28,7 +28,7 @@
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/btp-utils": "1.0.1",
-    "@sap-ux/adp-tooling": "0.12.128",
+    "@sap-ux/adp-tooling": "0.12.129",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.37",
     "@sap-ux/project-access": "1.29.7"
   },
@@ -48,7 +48,7 @@
     "supertest": "6.3.3",
     "@sap-ux-private/playwright": "0.1.0",
     "dotenv": "16.3.1",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.61",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.62",
     "@sap-ux/axios-extension": "1.18.5",
     "@sap-ux/store": "1.0.0",
     "@sap-ux/ui5-info": "0.8.3",