@sap-ux/preview-middleware 0.23.120 → 0.23.123

package/dist/base/flp.js

@@ -50,6 +50,7 @@ const cdm_1 = require("./cdm");
 const node_fs_1 = require("node:fs");
 const cards_1 = require("./utils/cards");
 const i18n_1 = require("@sap-ux/i18n");
+const axios_extension_1 = require("@sap-ux/axios-extension");
 const DEFAULT_LIVERELOAD_PORT = 35729;
 /**
  * Class handling preview of a sandbox FLP.
@@ -907,7 +908,7 @@ class FlpSandbox {
             this.setupAdpCommonHandlers(adp);
             return;
         }
-        configureRta(this.rta, layer, variant.id, adp.isCloudProject);
+        configureRta(this.rta, layer, variant.id, adp.projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY);
         const descriptor = adp.descriptor;
         const { name, manifest } = descriptor;
         await this.init(manifest, name, adp.resources, adp);

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

@@ -95,7 +95,11 @@ sap.ui.define(["sap/ui/model/json/JSONModel", "sap/ui/dt/OverlayRegistry", "../.
       } else {
         await this.createFragmentChange(modifiedValue);
       }
-      const templateName = getFragmentTemplateName(this.getRuntimeControl().getId(), targetAggregation);
+      const selector = {
+        id: this.getRuntimeControl().getId(),
+        idIsLocal: false
+      };
+      const templateName = getFragmentTemplateName(selector, targetAggregation);
       if (templateName) {
         CommunicationService.sendAction(setApplicationRequiresReload(true));
       }

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

@@ -20,6 +20,7 @@ import OverlayRegistry from 'sap/ui/dt/OverlayRegistry';
 
 /** sap.ui.fl */
 import { type AddFragmentChangeContentType } from 'sap/ui/fl/Change';
+import type Selector from 'sap/ui/fl/Selector';
 
 import { getResourceModel } from '../../i18n';
 
@@ -158,7 +159,8 @@ export default class AddFragment extends BaseDialog<AddFragmentModel> {
             await this.createFragmentChange(modifiedValue);
         }
 
-        const templateName = getFragmentTemplateName(this.getRuntimeControl().getId(), targetAggregation);
+        const selector: Selector = { id: this.getRuntimeControl().getId(), idIsLocal: false };
+        const templateName = getFragmentTemplateName(selector, targetAggregation);
         if (templateName) {
             CommunicationService.sendAction(setApplicationRequiresReload(true));
         }

package/dist/client/cpe/additional-change-info/add-xml-additional-info.js

@@ -3,18 +3,18 @@
 sap.ui.define(["../../utils/core", "../../adp/quick-actions/control-types"], function (____utils_core, ____adp_quick_actions_control_types) {
   "use strict";
 
-  const getControlById = ____utils_core["getControlById"];
+  const getControlBySelector = ____utils_core["getControlBySelector"];
   const findViewByControl = ____utils_core["findViewByControl"];
   const ANALYTICAL_TABLE_TYPE = ____adp_quick_actions_control_types["ANALYTICAL_TABLE_TYPE"];
   const GRID_TABLE_TYPE = ____adp_quick_actions_control_types["GRID_TABLE_TYPE"];
   const MDC_TABLE_TYPE = ____adp_quick_actions_control_types["MDC_TABLE_TYPE"];
   const TREE_TABLE_TYPE = ____adp_quick_actions_control_types["TREE_TABLE_TYPE"];
-  function getAddXMLAdditionalInfo(change) {
-    const selectorId = change.getSelector()?.id ?? '';
+  function getAddXMLAdditionalInfo(change, appComponent) {
+    const selector = change.getSelector();
     const targetAggregation = change.getContent()?.targetAggregation ?? '';
-    const targetControl = getControlById(selectorId);
+    const targetControl = getControlBySelector(selector, appComponent);
     const controlType = targetControl?.getMetadata().getName() ?? '';
-    const templateName = getFragmentTemplateName(selectorId, targetAggregation);
+    const templateName = getFragmentTemplateName(selector, targetAggregation, appComponent);
     const viewName = targetControl ? findViewByControl(targetControl)?.getViewName() ?? '' : '';
     const result = {};
     if (templateName) {
@@ -27,8 +27,8 @@ sap.ui.define(["../../utils/core", "../../adp/quick-actions/control-types"], fun
     }
     return Object.keys(result).length > 0 ? result : undefined;
   }
-  function getFragmentTemplateName(selectorId, targetAggregation) {
-    const control = getControlById(selectorId);
+  function getFragmentTemplateName(selector, targetAggregation, appComponent) {
+    const control = getControlBySelector(selector, appComponent);
     if (!control) {
       return '';
     }

package/dist/client/cpe/additional-change-info/add-xml-additional-info.ts

@@ -1,5 +1,5 @@
 import FlexChange from 'sap/ui/fl/Change';
-import { getControlById, findViewByControl } from '../../utils/core';
+import { getControlBySelector, findViewByControl } from '../../utils/core';
 import {
     ANALYTICAL_TABLE_TYPE,
     GRID_TABLE_TYPE,
@@ -7,6 +7,8 @@ import {
     TREE_TABLE_TYPE
 } from '../../adp/quick-actions/control-types';
 import Element from 'sap/ui/core/Element';
+import type Component from 'sap/ui/core/Component';
+import type Selector from 'sap/ui/fl/Selector';
 
 export type AddXMLAdditionalInfo = {
     templateName?: string;
@@ -19,12 +21,15 @@ export type AddXMLChangeContent = {
     targetAggregation?: string;
 };
 
-export function getAddXMLAdditionalInfo(change: FlexChange<AddXMLChangeContent>): AddXMLAdditionalInfo | undefined {
-    const selectorId = change.getSelector()?.id ?? '';
+export function getAddXMLAdditionalInfo(
+    change: FlexChange<AddXMLChangeContent>,
+    appComponent?: Component
+): AddXMLAdditionalInfo | undefined {
+    const selector = change.getSelector();
     const targetAggregation = change.getContent()?.targetAggregation ?? '';
-    const targetControl = getControlById(selectorId);
+    const targetControl = getControlBySelector(selector, appComponent);
     const controlType = targetControl?.getMetadata().getName() ?? '';
-    const templateName = getFragmentTemplateName(selectorId, targetAggregation);
+    const templateName = getFragmentTemplateName(selector, targetAggregation, appComponent);
     const viewName = targetControl ? (findViewByControl(targetControl)?.getViewName() ?? '') : '';
 
     const result: AddXMLAdditionalInfo = {};
@@ -40,8 +45,12 @@ export function getAddXMLAdditionalInfo(change: FlexChange<AddXMLChangeContent>)
     return Object.keys(result).length > 0 ? result : undefined;
 }
 
-export function getFragmentTemplateName(selectorId: string, targetAggregation: string): string {
-    const control = getControlById(selectorId);
+export function getFragmentTemplateName(
+    selector: Selector | undefined,
+    targetAggregation: string,
+    appComponent?: Component
+): string {
+    const control = getControlBySelector(selector, appComponent);
 
     if (!control) {
         return '';

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

@@ -354,7 +354,7 @@ sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
      * @returns {Promise<void>} A promise that resolves when the command is handled.
      */
     async handleCommand(command, inactiveCommandCount, index, pendingChanges) {
-      setAdditionalChangeInfo(command?.getPreparedChange?.());
+      setAdditionalChangeInfo(command?.getPreparedChange?.(), this.options.rta.getRootControlInstance());
       const pendingChange = await this.prepareChangeType(command, inactiveCommandCount, index);
       if (pendingChange) {
         pendingChanges.push(pendingChange);

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

@@ -416,7 +416,7 @@ export class ChangeService extends EventTarget {
         index: number,
         pendingChanges: PendingChange[]
     ): Promise<void> {
-        setAdditionalChangeInfo(command?.getPreparedChange?.());
+        setAdditionalChangeInfo(command?.getPreparedChange?.(), this.options.rta.getRootControlInstance());
         const pendingChange = await this.prepareChangeType(command, inactiveCommandCount, index);
         if (pendingChange) {
             pendingChanges.push(pendingChange);

package/dist/client/utils/additional-change-info.js

@@ -10,15 +10,16 @@ sap.ui.define(["../cpe/additional-change-info/add-xml-additional-info"], functio
    * This function is used to set additional change information for a given change.
    *
    * @param change - The change object for which additional information is to be set.
+   * @param appComponent - The app component (optional), used to resolve controls in projects with local IDs.
    */
-  function setAdditionalChangeInfo(change) {
+  function setAdditionalChangeInfo(change, appComponent) {
     if (!change) {
       return;
     }
     let additionalChangeInfo;
     const key = change.getDefinition().fileName;
     if (change?.getChangeType?.() === 'addXML') {
-      additionalChangeInfo = getAddXMLAdditionalInfo(change);
+      additionalChangeInfo = getAddXMLAdditionalInfo(change, appComponent);
     }
     if (additionalChangeInfo) {
       const existingInfo = additionalChangeInfoMap.get(key);

package/dist/client/utils/additional-change-info.ts

@@ -5,6 +5,7 @@ import {
     type AddXMLChangeContent
 } from '../cpe/additional-change-info/add-xml-additional-info';
 import { FlexChange as Change } from '../flp/common';
+import type Component from 'sap/ui/core/Component';
 
 export type AdditionalChangeInfo = AddXMLAdditionalInfo | undefined;
 
@@ -14,8 +15,12 @@ const additionalChangeInfoMap = new Map<string, AdditionalChangeInfo>();
  * This function is used to set additional change information for a given change.
  *
  * @param change - The change object for which additional information is to be set.
+ * @param appComponent - The app component (optional), used to resolve controls in projects with local IDs.
  */
-export function setAdditionalChangeInfo(change: FlexChange<AddXMLChangeContent> | undefined): void {
+export function setAdditionalChangeInfo(
+    change: FlexChange<AddXMLChangeContent> | undefined,
+    appComponent?: Component
+): void {
     if (!change) {
         return;
     }
@@ -23,7 +28,7 @@ export function setAdditionalChangeInfo(change: FlexChange<AddXMLChangeContent>
     let additionalChangeInfo;
     const key = change.getDefinition().fileName;
     if (change?.getChangeType?.() === 'addXML') {
-        additionalChangeInfo = getAddXMLAdditionalInfo(change);
+        additionalChangeInfo = getAddXMLAdditionalInfo(change, appComponent);
     }
 
     if (additionalChangeInfo) {

package/dist/client/utils/core.js

@@ -1,8 +1,9 @@
 "use strict";
 
-sap.ui.define(["sap/ui/core/Component", "sap/ui/core/Element"], function (Component, Element) {
+sap.ui.define(["sap/ui/core/Component", "sap/ui/core/Element", "sap/ui/core/util/reflection/JsControlTreeModifier", "sap/base/Log", "./error"], function (Component, Element, JsControlTreeModifier, Log, ___error) {
   "use strict";
 
+  const getError = ___error["getError"];
   /**
    * Gets Component by id.
    *
@@ -35,6 +36,29 @@ sap.ui.define(["sap/ui/core/Component", "sap/ui/core/Element"], function (Compon
     }
   }
 
+  /**
+   * Gets target control by trying getControlById first, then falling back to JsControlTreeModifier.bySelector
+   * for projects where the control may not be found by global ID.
+   *
+   * @param selector - The selector object from the change.
+   * @param appComponent - The app component (optional).
+   * @returns The target control element or undefined.
+   */
+  function getControlBySelector(selector, appComponent) {
+    if (!selector?.id) {
+      return undefined;
+    }
+    let control = getControlById(selector.id);
+    if (!control && appComponent && selector) {
+      try {
+        control = JsControlTreeModifier.bySelector(selector, appComponent);
+      } catch (error) {
+        Log.warning('Failed to get control by selector:', getError(error));
+      }
+    }
+    return control;
+  }
+
   /**
    * Checks wether this object is an instance of a ManagedObject.
    *
@@ -109,6 +133,7 @@ sap.ui.define(["sap/ui/core/Component", "sap/ui/core/Element"], function (Compon
   };
   __exports.getComponent = getComponent;
   __exports.getControlById = getControlById;
+  __exports.getControlBySelector = getControlBySelector;
   __exports.isManagedObject = isManagedObject;
   __exports.isA = isA;
   __exports.hasParent = hasParent;

package/dist/client/utils/core.ts

@@ -3,6 +3,10 @@ import type { ID } from 'sap/ui/core/library';
 import type ManagedObject from 'sap/ui/base/ManagedObject';
 import Element from 'sap/ui/core/Element';
 import View from 'sap/ui/core/mvc/View';
+import type Selector from 'sap/ui/fl/Selector';
+import JsControlTreeModifier from 'sap/ui/core/util/reflection/JsControlTreeModifier';
+import Log from 'sap/base/Log';
+import { getError } from './error';
 
 /**
  * Gets Component by id.
@@ -36,6 +40,34 @@ export function getControlById<T extends Element = Element>(id: string): T | und
     }
 }
 
+/**
+ * Gets target control by trying getControlById first, then falling back to JsControlTreeModifier.bySelector
+ * for projects where the control may not be found by global ID.
+ *
+ * @param selector - The selector object from the change.
+ * @param appComponent - The app component (optional).
+ * @returns The target control element or undefined.
+ */
+export function getControlBySelector<T extends Element = Element>(
+    selector: Selector | undefined,
+    appComponent?: Component
+): T | undefined {
+    if (!selector?.id) {
+        return undefined;
+    }
+
+    let control = getControlById<T>(selector.id);
+    if (!control && appComponent && selector) {
+        try {
+            control = JsControlTreeModifier.bySelector(selector, appComponent) as unknown as T | undefined;
+        } catch (error) {
+            Log.warning('Failed to get control by selector:', getError(error));
+        }
+    }
+
+    return control;
+}
+
 /**
  * Checks wether this object is an instance of a ManagedObject.
  *
@@ -110,4 +142,4 @@ export function findNestedElements(
 ): Element[] {
     const ownerId = ownerElement.getId();
     return candidates.filter((item) => hasParent(item, ownerId));
-}
+}

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.23.120",
+  "version": "0.23.123",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -26,15 +26,15 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
-    "@sap/bas-sdk": "3.13.2",
-    "@sap-ux/adp-tooling": "0.18.63",
-    "@sap-ux/btp-utils": "1.1.8",
+    "@sap/bas-sdk": "3.13.3",
+    "@sap-ux/adp-tooling": "0.18.65",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.11",
     "@sap-ux/feature-toggle": "0.3.6",
+    "@sap-ux/btp-utils": "1.1.9",
+    "@sap-ux/project-access": "1.35.4",
+    "@sap-ux/i18n": "0.3.7",
     "@sap-ux/logger": "0.8.1",
-    "@sap-ux/project-access": "1.35.3",
-    "@sap-ux/system-access": "0.6.51",
-    "@sap-ux/i18n": "0.3.7"
+    "@sap-ux/system-access": "0.6.53"
   },
   "devDependencies": {
     "@sap-ux-private/playwright": "0.2.6",
@@ -53,10 +53,10 @@
     "nock": "13.4.0",
     "npm-run-all2": "6.2.0",
     "supertest": "7.1.4",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.18.17",
-    "@sap-ux/axios-extension": "1.25.11",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.18.18",
     "@sap-ux/store": "1.5.6",
-    "@sap-ux/ui5-info": "0.13.12"
+    "@sap-ux/ui5-info": "0.13.12",
+    "@sap-ux/axios-extension": "1.25.13"
   },
   "peerDependencies": {
     "express": "4"