@sap-ux/preview-middleware 0.23.155 → 0.24.0

package/dist/base/config.js

@@ -184,10 +184,6 @@ function getFlexSettings() {
             applyConnector: localConnectorPath,
             writeConnector: localConnectorPath,
             custom: true
-        },
-        {
-            connector: 'LocalStorageConnector',
-            layers: ['CUSTOMER', 'USER']
         }
     ];
 }

package/dist/base/flp.js

@@ -875,7 +875,7 @@ class FlpSandbox {
             const manifest = this.setupCfBuildMode(config.cfBuildPath);
             configureRta(this.rta, layer, variant.id, false, true);
             await this.init(manifest, variant.reference);
-            this.setupAdpCommonHandlers(adp);
+            await this.setupAdpCommonHandlers(adp);
             return;
         }
         configureRta(this.rta, layer, variant.id, adp.projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY);
@@ -883,17 +883,19 @@ class FlpSandbox {
         const { name, manifest } = descriptor;
         await this.init(manifest, name, adp.resources, adp);
         this.router.use(adp.descriptor.url, adp.proxy.bind(adp));
-        this.setupAdpCommonHandlers(adp);
+        await this.setupAdpCommonHandlers(adp);
     }
     /**
      * Setup common ADP middleware and handlers.
      *
      * @param adp AdpPreview instance
      */
-    setupAdpCommonHandlers(adp) {
+    async setupAdpCommonHandlers(adp) {
         this.addOnChangeRequestHandler(adp.onChangeRequest.bind(adp));
         this.router.use((0, express_1.json)());
         adp.addApis(this.router);
+        // Register i18n store route for ADP projects (used by OVP bridge functions)
+        await this.addStoreI18nKeysRoute();
     }
     /**
      * Setup the CF build path mode for the ADP project.

package/dist/client/adp/api-handler.js

@@ -11,6 +11,9 @@ sap.ui.define(["../utils/error"], function (___utils_error) {
     ApiEndpoints["CODE_EXT"] = "/adp/api/code_ext";
     ApiEndpoints["ANNOTATION_FILE"] = "/adp/api/annotation";
     ApiEndpoints["MANIFEST_APP_DESCRIPTOR"] = "/manifest.appdescr_variant";
+    ApiEndpoints["OVP_DATA_SOURCES"] = "/adp/api/ovp/datasources";
+    ApiEndpoints["OVP_METAMODEL"] = "/adp/api/ovp/metamodel";
+    ApiEndpoints["I18N_STORE"] = "/editor/i18n";
     return ApiEndpoints;
   }(ApiEndpoints || {});
   var RequestMethod = /*#__PURE__*/function (RequestMethod) {

package/dist/client/adp/api-handler.ts

@@ -7,7 +7,10 @@ export const enum ApiEndpoints {
     CONTROLLER = '/adp/api/controller',
     CODE_EXT = '/adp/api/code_ext',
     ANNOTATION_FILE = '/adp/api/annotation',
-    MANIFEST_APP_DESCRIPTOR = '/manifest.appdescr_variant'
+    MANIFEST_APP_DESCRIPTOR = '/manifest.appdescr_variant',
+    OVP_DATA_SOURCES = '/adp/api/ovp/datasources',
+    OVP_METAMODEL = '/adp/api/ovp/metamodel',
+    I18N_STORE = '/editor/i18n'
 }
 
 export const enum RequestMethod {

package/dist/client/adp/init.js

@@ -67,8 +67,17 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
       const extPointService = new ExtensionPointService(rta);
       extPointService.init();
     }
-    const applicationType = getApplicationType(rta.getRootControlInstance().getManifest());
+    const manifest = rta.getRootControlInstance().getManifest();
+    const applicationType = getApplicationType(manifest);
     const quickActionRegistries = await loadDefinitions(applicationType);
+
+    // Initialize OVP bridge functions if the application is an OVP app
+    if (manifest['sap.ovp']) {
+      const {
+        initOvpWindowFunctions
+      } = await __ui5_require_async('open/ux/preview/client/adp/ovp-window-functions');
+      initOvpWindowFunctions();
+    }
     await init(rta, quickActionRegistries);
 
     // Register synchronious views detection and warning

package/dist/client/adp/init.ts

@@ -50,9 +50,16 @@ export default async function (rta: RuntimeAuthoring) {
         extPointService.init();
     }
 
-    const applicationType = getApplicationType(rta.getRootControlInstance().getManifest());
+    const manifest = rta.getRootControlInstance().getManifest();
+    const applicationType = getApplicationType(manifest);
     const quickActionRegistries = await loadDefinitions(applicationType);
 
+    // Initialize OVP bridge functions if the application is an OVP app
+    if (manifest['sap.ovp']) {
+        const { initOvpWindowFunctions } = await import('open/ux/preview/client/adp/ovp-window-functions');
+        initOvpWindowFunctions();
+    }
+
     await init(rta, quickActionRegistries);
 
     // Register synchronious views detection and warning

package/dist/client/adp/ovp-window-functions.js

@@ -0,0 +1,130 @@
+"use strict";
+
+sap.ui.define(["sap/base/Log", "sap/ui/model/odata/v2/ODataModel"], function (log, ODataModel) {
+  "use strict";
+
+  /**
+   * Returns the base URL for API requests.
+   *
+   * @returns Base URL string
+   */
+  function getBaseUrl() {
+    return document.getElementById('root')?.dataset.openUxPreviewBaseUrl ?? '';
+  }
+
+  /**
+   * Creates a UI5 ODataModel with annotation URLs and returns its metamodel
+   * with entity containers, schema, and model information.
+   *
+   * @param serviceInfo Service URL and annotation details from the server
+   * @returns Promise resolving to a metamodel object
+   */
+  async function buildMetaModel(serviceInfo) {
+    const annotationUris = serviceInfo.annotations.map(a => a.Uri);
+    const model = new ODataModel(serviceInfo.serviceUrl, {
+      annotationURI: annotationUris,
+      loadAnnotationsJoined: true,
+      skipMetadataAnnotationParsing: false,
+      json: true
+    });
+    const metaModel = model.getMetaModel();
+    await metaModel.loaded();
+    return {
+      oEntityContainers: metaModel.getODataEntityContainer(),
+      oSchema: metaModel.getObject('/dataServices/schema'),
+      modelInformation: serviceInfo.modelInformation
+    };
+  }
+
+  /**
+   * Writes i18n entries to the adaptation project's i18n properties file.
+   * Fire-and-forget: the OVP runtime does not await the result.
+   *
+   * @param _path - i18n path (ignored; server resolves from project context)
+   * @param properties - Array of i18n key-value entries to write
+   */
+  function writeToI18n(_path, properties) {
+    const entries = properties.map(p => ({
+      key: p.key,
+      value: p.value,
+      annotation: p.textType
+    }));
+    fetch(`${getBaseUrl()}/editor/i18n`, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json'
+      },
+      body: JSON.stringify(entries)
+    }).catch(error => {
+      log.error('OVP writeToI18n failed', error);
+    });
+  }
+
+  /**
+   * Fetches available OData V2 services from the ABAP system catalog.
+   *
+   * @param _path - Application path (ignored; server uses its own provider)
+   * @returns Promise resolving to an object with a results array of service metadata
+   */
+  async function getNewDataSources(_path) {
+    const response = await fetch(`${getBaseUrl()}/adp/api/ovp/datasources`);
+    if (!response.ok) {
+      throw new Error(`Failed to fetch data sources: ${response.status}`);
+    }
+    return response.json();
+  }
+
+  /**
+   * Fetches the OData metadata model for a selected data source service.
+   * Creates a real UI5 ODataModel with annotations to build a full metamodel
+   * compatible with the OVP dialog.
+   *
+   * @param selectedDataSources - Array of selected data source objects
+   * @param _path - Application path (ignored; server uses its own provider)
+   * @returns Promise resolving to a metamodel object
+   */
+  async function getMetaModelForNewDataSource(selectedDataSources, _path) {
+    const response = await fetch(`${getBaseUrl()}/adp/api/ovp/metamodel`, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json'
+      },
+      body: JSON.stringify({
+        dataSource: selectedDataSources[0]
+      })
+    });
+    if (!response.ok) {
+      throw new Error(`Failed to fetch metamodel: ${response.status}`);
+    }
+    const serviceInfo = await response.json();
+    if (!serviceInfo) {
+      return undefined;
+    }
+    return buildMetaModel(serviceInfo);
+  }
+
+  /**
+   * Initializes OVP bridge functions required by the sap.ovp library for the
+   * "Add New Card" flow in the adaptation editor.
+   *
+   * These bridge functions are registered as globals on the window object
+   * and connect the OVP runtime (in the preview iframe) to the server-side
+   * adaptation tooling middleware via fetch requests.
+   */
+  function initOvpWindowFunctions() {
+    // OVP runtime expects these as window globals
+    // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-global-define
+    window.writeToI18n = writeToI18n;
+    // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-global-define
+    window.getNewDataSources = getNewDataSources;
+    // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-global-define
+    window.getMetaModelForNewDataSource = getMetaModelForNewDataSource;
+    log.info('OVP bridge functions initialized (writeToI18n, getNewDataSources, getMetaModelForNewDataSource)');
+  }
+  var __exports = {
+    __esModule: true
+  };
+  __exports.initOvpWindowFunctions = initOvpWindowFunctions;
+  return __exports;
+});
+//# sourceMappingURL=ovp-window-functions.js.map

package/dist/client/adp/ovp-window-functions.ts

@@ -0,0 +1,171 @@
+import log from 'sap/base/Log';
+import ODataModel from 'sap/ui/model/odata/v2/ODataModel';
+
+interface I18nProperty {
+    key: string;
+    value: string;
+    textType?: string;
+}
+
+interface DataSourceInfo {
+    ID: string;
+    Title: string;
+    Description?: string;
+    TechnicalServiceName?: string;
+    TechnicalServiceVersion?: number;
+    ServiceUrl?: string;
+    MetadataUrl?: string;
+}
+
+interface DataSourcesResponse {
+    results: DataSourceInfo[];
+}
+
+interface ServiceInfoResponse {
+    serviceUrl: string;
+    annotations: Array<{ TechnicalName: string; Uri: string }>;
+    modelInformation: OvpModelInformation;
+}
+
+interface OvpModelInformation {
+    serviceURI: string;
+    serviceAnnotation: string;
+    serviceAnnotationURI: string;
+}
+
+interface OvpMetaModelResult {
+    oEntityContainers: Record<string, unknown>;
+    oSchema: Record<string, unknown>[];
+    modelInformation: OvpModelInformation;
+}
+
+declare global {
+    interface Window {
+        writeToI18n: (path: string, properties: I18nProperty[]) => void;
+        getNewDataSources: (path: string) => Promise<DataSourcesResponse>;
+        getMetaModelForNewDataSource: (
+            selectedDataSources: DataSourceInfo[],
+            path: string
+        ) => Promise<OvpMetaModelResult | undefined>;
+    }
+}
+
+/**
+ * Returns the base URL for API requests.
+ *
+ * @returns Base URL string
+ */
+function getBaseUrl(): string {
+    return document.getElementById('root')?.dataset.openUxPreviewBaseUrl ?? '';
+}
+
+/**
+ * Creates a UI5 ODataModel with annotation URLs and returns its metamodel
+ * with entity containers, schema, and model information.
+ *
+ * @param serviceInfo Service URL and annotation details from the server
+ * @returns Promise resolving to a metamodel object
+ */
+async function buildMetaModel(serviceInfo: ServiceInfoResponse): Promise<OvpMetaModelResult> {
+    const annotationUris = serviceInfo.annotations.map((a) => a.Uri);
+
+    const model = new ODataModel(serviceInfo.serviceUrl, {
+        annotationURI: annotationUris,
+        loadAnnotationsJoined: true,
+        skipMetadataAnnotationParsing: false,
+        json: true
+    });
+
+    const metaModel = model.getMetaModel();
+    await metaModel.loaded();
+
+    return {
+        oEntityContainers: metaModel.getODataEntityContainer() as Record<string, unknown>,
+        oSchema: metaModel.getObject('/dataServices/schema') as Record<string, unknown>[],
+        modelInformation: serviceInfo.modelInformation
+    };
+}
+
+/**
+ * Writes i18n entries to the adaptation project's i18n properties file.
+ * Fire-and-forget: the OVP runtime does not await the result.
+ *
+ * @param _path - i18n path (ignored; server resolves from project context)
+ * @param properties - Array of i18n key-value entries to write
+ */
+function writeToI18n(_path: string, properties: I18nProperty[]): void {
+    const entries = properties.map((p) => ({
+        key: p.key,
+        value: p.value,
+        annotation: p.textType
+    }));
+    fetch(`${getBaseUrl()}/editor/i18n`, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify(entries)
+    }).catch((error) => {
+        log.error('OVP writeToI18n failed', error);
+    });
+}
+
+/**
+ * Fetches available OData V2 services from the ABAP system catalog.
+ *
+ * @param _path - Application path (ignored; server uses its own provider)
+ * @returns Promise resolving to an object with a results array of service metadata
+ */
+async function getNewDataSources(_path: string): Promise<DataSourcesResponse> {
+    const response = await fetch(`${getBaseUrl()}/adp/api/ovp/datasources`);
+    if (!response.ok) {
+        throw new Error(`Failed to fetch data sources: ${response.status}`);
+    }
+    return response.json();
+}
+
+/**
+ * Fetches the OData metadata model for a selected data source service.
+ * Creates a real UI5 ODataModel with annotations to build a full metamodel
+ * compatible with the OVP dialog.
+ *
+ * @param selectedDataSources - Array of selected data source objects
+ * @param _path - Application path (ignored; server uses its own provider)
+ * @returns Promise resolving to a metamodel object
+ */
+async function getMetaModelForNewDataSource(
+    selectedDataSources: DataSourceInfo[],
+    _path: string
+): Promise<OvpMetaModelResult | undefined> {
+    const response = await fetch(`${getBaseUrl()}/adp/api/ovp/metamodel`, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ dataSource: selectedDataSources[0] })
+    });
+    if (!response.ok) {
+        throw new Error(`Failed to fetch metamodel: ${response.status}`);
+    }
+    const serviceInfo = (await response.json()) as ServiceInfoResponse | null;
+    if (!serviceInfo) {
+        return undefined;
+    }
+    return buildMetaModel(serviceInfo);
+}
+
+/**
+ * Initializes OVP bridge functions required by the sap.ovp library for the
+ * "Add New Card" flow in the adaptation editor.
+ *
+ * These bridge functions are registered as globals on the window object
+ * and connect the OVP runtime (in the preview iframe) to the server-side
+ * adaptation tooling middleware via fetch requests.
+ */
+export function initOvpWindowFunctions(): void {
+    // OVP runtime expects these as window globals
+    // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-global-define
+    window.writeToI18n = writeToI18n;
+    // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-global-define
+    window.getNewDataSources = getNewDataSources;
+    // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-global-define
+    window.getMetaModelForNewDataSource = getMetaModelForNewDataSource;
+
+    log.info('OVP bridge functions initialized (writeToI18n, getNewDataSources, getMetaModelForNewDataSource)');
+}

package/dist/client/flp/WorkspaceConnector.js

@@ -88,6 +88,7 @@ sap.ui.define(["sap/base/util/merge", "sap/ui/fl/write/api/connectors/ObjectStor
       if (settings?.scenario === 'ADAPTATION_PROJECT') {
         features.isVariantAdaptationEnabled = true;
       }
+      features.isAnnotationChangeEnabled = false;
       return features;
     }
   });

package/dist/client/flp/WorkspaceConnector.ts

@@ -92,6 +92,8 @@ const connector = merge({}, ObjectStorageConnector, {
             features.isVariantAdaptationEnabled = true;
         }
 
+        features.isAnnotationChangeEnabled = false;
+
         return features;
     }
 }) as typeof ObjectStorageConnector;

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.155",
+  "version": "0.24.0",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -27,14 +27,14 @@
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
     "@sap/bas-sdk": "3.13.3",
-    "@sap-ux/adp-tooling": "0.18.93",
-    "@sap-ux/btp-utils": "1.1.10",
+    "@sap-ux/adp-tooling": "0.18.94",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.22",
     "@sap-ux/feature-toggle": "0.3.7",
     "@sap-ux/logger": "0.8.2",
     "@sap-ux/project-access": "1.35.13",
+    "@sap-ux/i18n": "0.3.9",
     "@sap-ux/system-access": "0.6.66",
-    "@sap-ux/i18n": "0.3.9"
+    "@sap-ux/btp-utils": "1.1.10"
   },
   "devDependencies": {
     "@sap-ux-private/playwright": "0.2.12",
@@ -53,10 +53,10 @@
     "nock": "14.0.11",
     "npm-run-all2": "8.0.4",
     "supertest": "7.2.2",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.18.26",
+    "@sap-ux/ui5-info": "0.13.15",
     "@sap-ux/axios-extension": "1.25.24",
     "@sap-ux/store": "1.5.10",
-    "@sap-ux/ui5-info": "0.13.15"
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.19.0"
   },
   "peerDependencies": {
     "express": "4"