@sap-ux/preview-middleware 0.19.35 → 0.19.36

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

@@ -124,7 +124,11 @@ sap.ui.define(["../utils/error"], function (___utils_error) {
    * @returns {CodeExtResponse} Returns path to existing controller if found
    */
   async function getExistingController(controllerName) {
-    return request(`${ApiEndpoints.CODE_EXT}/${controllerName}`, RequestMethod.GET);
+    const params = new URLSearchParams({
+      name: controllerName
+    });
+    const url = `${ApiEndpoints.CODE_EXT}?${params.toString()}`;
+    return request(url, RequestMethod.GET);
   }
 
   /**

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

@@ -171,7 +171,9 @@ export async function getDataSourceAnnotationFileMap(): Promise<AnnotationDataSo
  * @returns {CodeExtResponse} Returns path to existing controller if found
  */
 export async function getExistingController(controllerName: string): Promise<CodeExtResponse> {
-    return request<CodeExtResponse>(`${ApiEndpoints.CODE_EXT}/${controllerName}` as ApiEndpoints, RequestMethod.GET);
+    const params = new URLSearchParams({ name: controllerName });
+    const url = `${ApiEndpoints.CODE_EXT}?${params.toString()}` as ApiEndpoints;
+    return request<CodeExtResponse>(url, RequestMethod.GET);
 }
 
 /**

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

@@ -57,7 +57,7 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
         this.model.setProperty('/newControllerName', null);
         return;
       }
-      const fileExists = controllerList.some(f => f.controllerName === `${controllerName}.js`);
+      const fileExists = controllerList.some(f => f.controllerName === controllerName);
       if (fileExists) {
         updateDialogState(ValueState.Error, 'Enter a different name. The controller name that you entered already exists in your project.');
         return;

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

@@ -33,8 +33,15 @@ interface ControllerExtensionService {
     add: (codeRef: string, viewId: string) => Promise<{ creation: string }>;
 }
 
+type ControllerList = {
+    /**
+     * File name without extension
+     */
+    controllerName: string;
+}[];
+
 type ControllerModel = JSONModel & {
-    getProperty(sPath: '/controllersList'): { controllerName: string }[];
+    getProperty(sPath: '/controllersList'): ControllerList;
     getProperty(sPath: '/controllerExists'): boolean;
     getProperty(sPath: '/newControllerName'): string;
     getProperty(sPath: '/viewId'): string;
@@ -93,7 +100,7 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
             return;
         }
 
-        const fileExists = controllerList.some((f) => f.controllerName === `${controllerName}.js`);
+        const fileExists = controllerList.some((f) => f.controllerName === controllerName);
 
         if (fileExists) {
             updateDialogState(

package/dist/client/adp/utils.js

@@ -136,10 +136,10 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/Element", "sap/base/Log", "sap
    * @param control UI5 control.
    * @returns The controller name and view ID.
    */
-
   function getControllerInfoForControl(control) {
     const view = FlexUtils.getViewForControl(control);
-    const controllerName = view.getController().getMetadata().getName();
+    const moduleName = view?.getControllerModuleName?.();
+    const controllerName = moduleName ? `module:${moduleName}` : view.getController()?.getMetadata().getName();
     const viewId = view.getId();
     return {
       controllerName,

package/dist/client/adp/utils.ts

@@ -141,10 +141,10 @@ interface ControllerInfo {
  * @param control UI5 control.
  * @returns The controller name and view ID.
  */
-
 export function getControllerInfoForControl(control: ManagedObject): ControllerInfo {
     const view = FlexUtils.getViewForControl(control);
-    const controllerName = view.getController().getMetadata().getName();
+    const moduleName = view?.getControllerModuleName?.();
+    const controllerName = moduleName ? `module:${moduleName}` : view.getController()?.getMetadata().getName();
     const viewId = view.getId();
     return { controllerName, viewId };
 }

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.19.35",
+  "version": "0.19.36",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -25,7 +25,7 @@
     "ejs": "3.1.10",
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
-    "@sap-ux/adp-tooling": "0.13.39",
+    "@sap-ux/adp-tooling": "0.13.40",
     "@sap-ux/btp-utils": "1.0.3",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.6.4",
     "@sap-ux/feature-toggle": "0.2.3",
@@ -49,11 +49,11 @@
     "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.13.19",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.13.20",
     "@sap-ux/axios-extension": "1.20.1",
+    "@sap-ux/i18n": "0.2.3",
     "@sap-ux/store": "1.0.0",
-    "@sap-ux/ui5-info": "0.10.1",
-    "@sap-ux/i18n": "0.2.3"
+    "@sap-ux/ui5-info": "0.10.1"
   },
   "peerDependencies": {
     "express": "4"