@sap-ux/preview-middleware 0.20.44 → 0.20.46

package/dist/client/cpe/changes/generic-change.ts

@@ -129,7 +129,7 @@ export type GenericChange =
     | ConfigChange
     | V2ConfigChange;
 
-export type changeType = GenericChange['changeType'];
+export type ChangeType = GenericChange['changeType'];
 
 /**
  * Returns a shortened version of the given configuration path segments by removing excess segments,

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

@@ -36,7 +36,7 @@ import UI5Element from 'sap/ui/core/Element';
 import { setAdditionalChangeInfo } from '../../utils/additional-change-info';
 import {
     ChangeHandler,
-    changeType,
+    ChangeType,
     ConfigChange,
     GENERIC_CHANGE_HANDLER,
     getControlIdByChange,
@@ -444,7 +444,7 @@ export class ChangeService extends EventTarget {
 
         const changeDefinition = change.getDefinition ? change.getDefinition() : (change.getJson() as ChangeDefinition);
         const { fileName } = changeDefinition;
-        const handler = GENERIC_CHANGE_HANDLER[changeType as changeType] as unknown as ChangeHandler<GenericChange>;
+        const handler = GENERIC_CHANGE_HANDLER[changeType as ChangeType] as unknown as ChangeHandler<GenericChange>;
         if (handler) {
             const {
                 properties,

package/dist/client/cpe/utils.js

@@ -68,7 +68,7 @@ sap.ui.define(["sap/ui/core/mvc/XMLView", "sap/ui/core/UIComponent", "../utils/c
     }
     const manifestPropertiesValue = overlayData?.manifestSettingsValues(overlayData?.manifestSettings(control), control);
     const manifestProperties = overlayData?.manifestSettings(control).reduce((acc, item) => {
-      const propertyId = item.id;
+      const propertyId = item.path ?? item.id;
       const value = changeService.getConfigurationPropertyValue(control.getId(), propertyId);
       let propertyValue = value === 0 || value === false || value ? value : manifestPropertiesValue[propertyId];
       if (item?.type && ['boolean', 'number', 'string'].includes(item?.type)) {

package/dist/client/cpe/utils.ts

@@ -124,7 +124,7 @@ export function getManifestProperties(
             },
             item: DesigntimeSetting
         ) => {
-            const propertyId = item.id;
+            const propertyId = item.path ?? item.id;
             const value = changeService.getConfigurationPropertyValue(control.getId(), propertyId);
             let propertyValue = value === 0 || value === false || value ? value : manifestPropertiesValue[propertyId];
             if (item?.type && ['boolean', 'number', 'string'].includes(item?.type)) {

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

@@ -90,12 +90,22 @@ sap.ui.define(["sap/ui/core/Component", "./core", "sap/ui/rta/command/CommandFac
     if (!overlay) {
       return undefined;
     }
-    const overlayData = overlay?.getDesignTimeMetadata().getData();
+    const overlayData = overlay.getDesignTimeMetadata().getData();
+    const settings = overlayData.manifestSettings(modifiedControl);
     let manifestPropertyPath = overlayData.manifestPropertyPath(modifiedControl);
     if (propertyPathExtraSegments) {
       manifestPropertyPath += '/' + propertyPathExtraSegments.join('/');
     }
-    const [manifestPropertyChange] = overlayData.manifestPropertyChange(propertyChanges, manifestPropertyPath, modifiedControl);
+    const adjustedChanges = {};
+    for (const [key, value] of Object.entries(propertyChanges)) {
+      const setting = settings.find(s => s.id === key);
+      if (setting) {
+        adjustedChanges[setting.path ?? setting.id] = value;
+      } else {
+        adjustedChanges[key] = value;
+      }
+    }
+    const [manifestPropertyChange] = overlayData.manifestPropertyChange(adjustedChanges, manifestPropertyPath, modifiedControl);
     const modifiedValue = {
       reference: getReference(modifiedControl),
       appComponent: manifestPropertyChange.appComponent,

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

@@ -103,13 +103,24 @@ export async function createManifestPropertyChange(
     if (!overlay) {
         return undefined;
     }
-    const overlayData = overlay?.getDesignTimeMetadata().getData();
+    const overlayData = overlay.getDesignTimeMetadata().getData();
+    const settings = overlayData.manifestSettings(modifiedControl);
     let manifestPropertyPath = overlayData.manifestPropertyPath(modifiedControl);
     if (propertyPathExtraSegments) {
         manifestPropertyPath += '/' + propertyPathExtraSegments.join('/');
     }
+    const adjustedChanges: Record<string, string | string[] | boolean | number | object | undefined> = {};
+    for (const [key, value] of Object.entries(propertyChanges)) {
+        const setting = settings.find((s) => s.id === key);
+        if (setting) {
+            adjustedChanges[setting.path ?? setting.id] = value;
+        } else {
+            adjustedChanges[key] = value;
+        }
+        
+    }
     const [manifestPropertyChange] = overlayData.manifestPropertyChange(
-        propertyChanges,
+        adjustedChanges,
         manifestPropertyPath,
         modifiedControl
     );

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.20.44",
+  "version": "0.20.46",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -25,13 +25,13 @@
     "ejs": "3.1.10",
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
-    "@sap-ux/adp-tooling": "0.14.32",
+    "@sap-ux/adp-tooling": "0.14.33",
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.6.6",
+    "@sap-ux/feature-toggle": "0.3.0",
     "@sap-ux/logger": "0.7.0",
-    "@sap-ux/project-access": "1.30.3",
-    "@sap-ux/system-access": "0.6.9",
-    "@sap-ux/feature-toggle": "0.3.0"
+    "@sap-ux/project-access": "1.30.4",
+    "@sap-ux/system-access": "0.6.9"
   },
   "devDependencies": {
     "@sap-ux-private/playwright": "0.2.0",
@@ -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.14.8",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.14.9",
     "@sap-ux/axios-extension": "1.22.3",
     "@sap-ux/i18n": "0.3.1",
     "@sap-ux/store": "1.1.1",