@sap-ux/preview-middleware 0.17.48 → 0.18.1

package/dist/base/flp.d.ts

@@ -139,7 +139,7 @@ export declare class FlpSandbox {
     /**
      * Read the sandbox template file based on the given UI5 version.
      *
-     * @param ui5MajorVersion - the major version of UI5
+     * @param ui5Version - the UI5 version
      * @returns the template for the sandbox HTML file
      */
     private getSandboxTemplate;

package/dist/base/flp.js

@@ -160,7 +160,7 @@ class FlpSandbox {
         if (ui5Version.major === 1 && ui5Version.minor <= 71) {
             this.removeAsyncHintsRequests();
         }
-        return (0, ejs_1.render)(this.getSandboxTemplate(ui5Version.major), config);
+        return (0, ejs_1.render)(this.getSandboxTemplate(ui5Version), config);
     }
     /**
      * Sets application dependencies in the template configuration.
@@ -291,7 +291,7 @@ class FlpSandbox {
             'protocol' in req
                 ? req.protocol
                 : req.headers.referer?.substring(0, req.headers.referer.indexOf(':')) ?? 'http', req.headers.host, 'ui5-patched-router' in req ? req['ui5-patched-router']?.baseUrl : undefined);
-            const html = (0, ejs_1.render)(this.getSandboxTemplate(ui5Version.major), this.templateConfig);
+            const html = (0, ejs_1.render)(this.getSandboxTemplate(ui5Version), this.templateConfig);
             this.sendResponse(res, 'text/html', 200, html);
         }
     }
@@ -335,21 +335,25 @@ class FlpSandbox {
             this.logger.error('Could not get UI5 version of application. Using 1.121.0 as fallback.');
             version = '1.121.0';
         }
-        const [major, minor] = version.split('.').map((versionPart) => parseInt(versionPart, 10));
+        const [major, minor, patch] = version.split('.').map((versionPart) => parseInt(versionPart, 10));
+        const label = version.split(/-(.*)/s)?.[1];
         return {
             major,
-            minor
+            minor,
+            patch,
+            label
         };
     }
     /**
      * Read the sandbox template file based on the given UI5 version.
      *
-     * @param ui5MajorVersion - the major version of UI5
+     * @param ui5Version - the UI5 version
      * @returns the template for the sandbox HTML file
      */
-    getSandboxTemplate(ui5MajorVersion) {
-        this.logger.info(`Using sandbox template for UI5 major version ${ui5MajorVersion}.`);
-        return (0, fs_1.readFileSync)((0, path_1.join)(__dirname, `../../templates/flp/sandbox${ui5MajorVersion === 1 ? '' : ui5MajorVersion}.html`), 'utf-8');
+    getSandboxTemplate(ui5Version) {
+        this.logger.info(`Using sandbox template for UI5 version ${ui5Version.major}.${ui5Version.minor}.${ui5Version.patch}${ui5Version.label ? `-${ui5Version.label}` : ''}.`);
+        const filePrefix = ui5Version.major > 1 || ui5Version.label?.includes('legacy-free') ? '2' : '';
+        return (0, fs_1.readFileSync)((0, path_1.join)(__dirname, `../../templates/flp/sandbox${filePrefix}.html`), 'utf-8');
     }
     /**
      * For UI5 version 1.71 and below, the asyncHints.requests need to be removed from the template configuration

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

@@ -32,6 +32,7 @@ export interface CodeExtResponse {
     controllerPath: string;
     controllerPathFromRoot: string;
     isRunningInBAS: boolean;
+    isTsSupported: boolean;
 }
 
 export interface AnnotationFileDetails {

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

@@ -10,7 +10,6 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
   const ValueState = sap_ui_core_library["ValueState"];
   /** sap.ui.base */
   const getExistingController = ___api_handler["getExistingController"];
-  const getManifestAppdescr = ___api_handler["getManifestAppdescr"];
   const readControllers = ___api_handler["readControllers"];
   const writeChange = ___api_handler["writeChange"];
   const writeController = ___api_handler["writeController"];
@@ -104,18 +103,12 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
         controllerName,
         viewId
       } = getControllerInfo(overlayControl);
-      const existingController = await this.getExistingController(controllerName);
-      if (existingController) {
-        const {
-          controllerExists,
-          controllerPath,
-          controllerPathFromRoot,
-          isRunningInBAS
-        } = existingController;
-        if (controllerExists) {
-          this.updateModelForExistingController(controllerExists, controllerPath, controllerPathFromRoot, isRunningInBAS);
+      const data = await this.getExistingController(controllerName);
+      if (data) {
+        if (data?.controllerExists) {
+          this.updateModelForExistingController(data);
         } else {
-          this.updateModelForNewController(viewId);
+          this.updateModelForNewController(viewId, data.isTsSupported);
           await this.getControllers();
         }
       }
@@ -123,12 +116,15 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
     /**
      * Updates the model properties for an existing controller.
      *
-     * @param {boolean} controllerExists - Whether the controller exists.
-     * @param {string} controllerPath - The controller path.
-     * @param {string} controllerPathFromRoot - The controller path from the project root.
-     * @param {boolean} isRunningInBAS - Whether the environment is BAS or VS Code.
+     * @param {CodeExtResponse} data - Existing controller data from the server.
      */
-    updateModelForExistingController: function _updateModelForExistingController(controllerExists, controllerPath, controllerPathFromRoot, isRunningInBAS) {
+    updateModelForExistingController: function _updateModelForExistingController(data) {
+      const {
+        controllerExists,
+        controllerPath,
+        controllerPathFromRoot,
+        isRunningInBAS
+      } = data;
       this.model.setProperty('/controllerExists', controllerExists);
       this.model.setProperty('/controllerPath', controllerPath);
       this.model.setProperty('/controllerPathFromRoot', controllerPathFromRoot);
@@ -147,16 +143,18 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
     /**
      * Updates the model property for a new controller.
      *
-     * @param viewId The view ID
+     * @param {string} viewId - The view ID.
+     * @param {boolean} isTsSupported - Whether TypeScript supported for the current project.
      */
-    updateModelForNewController: function _updateModelForNewController(viewId) {
+    updateModelForNewController: function _updateModelForNewController(viewId, isTsSupported) {
       this.model.setProperty('/viewId', viewId);
+      this.model.setProperty('/controllerExtension', isTsSupported ? '.ts' : '.js');
     },
     /**
      * Retrieves existing controller data if found in the project's workspace.
      *
-     * @param controllerName Controller name that exists in the view
-     * @returns Returnsexisting controller data
+     * @param controllerName Controller name that exists in the view.
+     * @returns Returns existing controller data.
      */
     getExistingController: async function _getExistingController(controllerName) {
       let data;
@@ -188,10 +186,8 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
      */
     createNewController: async function _createNewController(controllerName, viewId) {
       try {
-        const manifest = await getManifestAppdescr();
         await writeController({
-          controllerName,
-          projectId: manifest.id
+          controllerName
         });
         const controllerRef = {
           codeRef: `coding/${controllerName}.js`,

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

@@ -24,13 +24,7 @@ import type SimpleForm from 'sap/ui/layout/form/SimpleForm';
 import type ElementOverlay from 'sap/ui/dt/ElementOverlay';
 
 import type { CodeExtResponse, ControllersResponse } from '../api-handler';
-import {
-    getExistingController,
-    getManifestAppdescr,
-    readControllers,
-    writeChange,
-    writeController
-} from '../api-handler';
+import { getExistingController, readControllers, writeChange, writeController } from '../api-handler';
 import BaseDialog from './BaseDialog.controller';
 import { getControllerInfo } from '../utils';
 
@@ -44,6 +38,7 @@ type ControllerModel = JSONModel & {
     getProperty(sPath: '/newControllerName'): string;
     getProperty(sPath: '/viewId'): string;
     getProperty(sPath: '/controllerPath'): string;
+    getProperty(sPath: '/controllerExtension'): string;
 };
 
 /**
@@ -158,20 +153,13 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
         const overlayControl = sap.ui.getCore().byId(selectorId) as unknown as ElementOverlay;
 
         const { controllerName, viewId } = getControllerInfo(overlayControl);
-        const existingController = await this.getExistingController(controllerName);
-
-        if (existingController) {
-            const { controllerExists, controllerPath, controllerPathFromRoot, isRunningInBAS } = existingController;
-
-            if (controllerExists) {
-                this.updateModelForExistingController(
-                    controllerExists,
-                    controllerPath,
-                    controllerPathFromRoot,
-                    isRunningInBAS
-                );
+        const data = await this.getExistingController(controllerName);
+
+        if (data) {
+            if (data?.controllerExists) {
+                this.updateModelForExistingController(data);
             } else {
-                this.updateModelForNewController(viewId);
+                this.updateModelForNewController(viewId, data.isTsSupported);
 
                 await this.getControllers();
             }
@@ -180,17 +168,11 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
     /**
      * Updates the model properties for an existing controller.
      *
-     * @param {boolean} controllerExists - Whether the controller exists.
-     * @param {string} controllerPath - The controller path.
-     * @param {string} controllerPathFromRoot - The controller path from the project root.
-     * @param {boolean} isRunningInBAS - Whether the environment is BAS or VS Code.
+     * @param {CodeExtResponse} data - Existing controller data from the server.
      */
-    private updateModelForExistingController(
-        controllerExists: boolean,
-        controllerPath: string,
-        controllerPathFromRoot: string,
-        isRunningInBAS: boolean
-    ): void {
+    private updateModelForExistingController(data: CodeExtResponse): void {
+        const { controllerExists, controllerPath, controllerPathFromRoot, isRunningInBAS } = data;
+
         this.model.setProperty('/controllerExists', controllerExists);
         this.model.setProperty('/controllerPath', controllerPath);
         this.model.setProperty('/controllerPathFromRoot', controllerPathFromRoot);
@@ -214,17 +196,19 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
     /**
      * Updates the model property for a new controller.
      *
-     * @param viewId The view ID
+     * @param {string} viewId - The view ID.
+     * @param {boolean} isTsSupported - Whether TypeScript supported for the current project.
      */
-    private updateModelForNewController(viewId: string): void {
+    private updateModelForNewController(viewId: string, isTsSupported: boolean): void {
         this.model.setProperty('/viewId', viewId);
+        this.model.setProperty('/controllerExtension', isTsSupported ? '.ts' : '.js');
     }
 
     /**
      * Retrieves existing controller data if found in the project's workspace.
      *
-     * @param controllerName Controller name that exists in the view
-     * @returns Returnsexisting controller data
+     * @param controllerName Controller name that exists in the view.
+     * @returns Returns existing controller data.
      */
     private async getExistingController(controllerName: string): Promise<CodeExtResponse | undefined> {
         let data: CodeExtResponse | undefined;
@@ -257,8 +241,7 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
      */
     private async createNewController(controllerName: string, viewId: string): Promise<void> {
         try {
-            const manifest = await getManifestAppdescr();
-            await writeController({ controllerName, projectId: manifest.id });
+            await writeController({ controllerName });
 
             const controllerRef = {
                 codeRef: `coding/${controllerName}.js`,

package/dist/client/adp/ui/ControllerExtension.fragment.xml

@@ -16,8 +16,8 @@
                 <Label text="Controller Name" />
                 <Input 
                     id="controllerName"
-                    description=".js" 
-                    value="{/newControllerName}" 
+                    description="{/controllerExtension}"
+                    value="{/newControllerName}"
                     liveChange="onControllerNameInputChange">
                 </Input>
             </f:content>

package/dist/client/utils/version.js

@@ -41,10 +41,12 @@ sap.ui.define(["sap/ui/VersionInfo", "sap/base/Log"], function (VersionInfo, Log
       version = '1.121.0';
     }
     const [major, minor, patch] = version.split('.').map(versionPart => parseInt(versionPart, 10));
+    const label = version.split(/-(.*)/s)?.[1];
     return {
-      major: major,
-      minor: minor,
-      patch: patch
+      major,
+      minor,
+      patch,
+      label
     };
   }
 

package/dist/client/utils/version.ts

@@ -12,6 +12,7 @@ export type Ui5VersionInfo = {
     major: number;
     minor: number;
     patch?: number;
+    label?: string;
 };
 
 /**
@@ -51,11 +52,13 @@ export async function getUi5Version(library: string = 'sap.ui.core'): Promise<Ui
         version = '1.121.0';
     }
     const [major, minor, patch] = version.split('.').map((versionPart) => parseInt(versionPart, 10));
+    const label = version.split(/-(.*)/s)?.[1];
 
     return {
-        major: major,
-        minor: minor,
-        patch: patch
+        major,
+        minor,
+        patch,
+        label
     } satisfies Ui5VersionInfo;
 }
 

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.48",
+  "version": "0.18.1",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -28,9 +28,9 @@
     "@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.138",
+    "@sap-ux/adp-tooling": "0.13.1",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.37",
-    "@sap-ux/project-access": "1.29.8"
+    "@sap-ux/project-access": "1.29.9"
   },
   "devDependencies": {
     "connect": "^3.7.0",
@@ -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.69",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.12.1",
     "@sap-ux/axios-extension": "1.18.6",
     "@sap-ux/store": "1.0.0",
     "@sap-ux/ui5-info": "0.8.3",