@sap-ux/odata-service-writer 0.26.11 → 0.26.13

package/dist/data/defaults.js

@@ -5,6 +5,7 @@ const path_1 = require("path");
 const types_1 = require("../types");
 const constants_1 = require("./constants");
 const project_access_1 = require("@sap-ux/project-access");
+const ui5_config_1 = require("@sap-ux/ui5-config");
 /**
  * Sets the default path for a given service.
  * If the service path is not defined, it sets the path to '/'.
@@ -107,6 +108,38 @@ function setDefaultAnnotationsName(service) {
         setDefaultAnnotationName(annotation, service.name);
     }
 }
+/**
+ * Sets default preview settings of a given service.
+ *
+ * @param {string} basePath - the root path of an existing UI5 application
+ * @param {OdataService} service - The service object whose preview settings needs to be set or modified.
+ * @param {Editor} fs - the memfs editor instance
+ */
+async function setDefaultPreviewSettings(basePath, service, fs) {
+    service.previewSettings = service.previewSettings ?? {};
+    service.previewSettings.path =
+        service.previewSettings.path ?? `/${service.path?.split('/').filter((s) => s !== '')[0] ?? ''}`;
+    service.previewSettings.url = service.previewSettings.url ?? service.url ?? 'http://localhost';
+    if (service.client && !service.previewSettings.client) {
+        service.previewSettings.client = service.client;
+    }
+    if (service.destination && !service.previewSettings.destination) {
+        service.previewSettings.destination = service.destination.name;
+        if (service.destination.instance) {
+            service.previewSettings.destinationInstance = service.destination.instance;
+        }
+    }
+    const ui5Yamlpath = (0, path_1.join)(basePath, project_access_1.FileName.Ui5Yaml);
+    if (fs.exists(ui5Yamlpath)) {
+        const yamlContents = fs.read(ui5Yamlpath);
+        const ui5Config = await ui5_config_1.UI5Config.newInstance(yamlContents);
+        const backends = ui5Config.getBackendConfigsFromFioriToolsProxydMiddleware();
+        // There should be only one /sap entry
+        if (backends.find((existingBackend) => existingBackend.path === '/sap')) {
+            service.previewSettings.path = service.path;
+        }
+    }
+}
 /**
  * Enhances the provided OData service object with path, name and model information.
  * Directly modifies the passed object reference.
@@ -130,18 +163,6 @@ async function enhanceData(basePath, service, fs) {
         setDefaultAnnotationsName(service);
     }
     // enhance preview settings with service configuration
-    service.previewSettings = service.previewSettings ?? {};
-    service.previewSettings.path =
-        service.previewSettings.path ?? `/${service.path?.split('/').filter((s) => s !== '')[0] ?? ''}`;
-    service.previewSettings.url = service.previewSettings.url ?? service.url ?? 'http://localhost';
-    if (service.client && !service.previewSettings.client) {
-        service.previewSettings.client = service.client;
-    }
-    if (service.destination && !service.previewSettings.destination) {
-        service.previewSettings.destination = service.destination.name;
-        if (service.destination.instance) {
-            service.previewSettings.destinationInstance = service.destination.instance;
-        }
-    }
+    await setDefaultPreviewSettings(basePath, service, fs);
 }
 //# sourceMappingURL=defaults.js.map

package/dist/delete.js

@@ -35,7 +35,7 @@ function getEDMXAnnotationPaths(edmxAnnotations) {
  */
 async function deleteServiceData(basePath, paths, service, fs) {
     (0, manifest_1.deleteServiceFromManifest)(basePath, service, fs);
-    if (service.url && service.path && service.name) {
+    if (service.path && service.name) {
         let ui5Config;
         let ui5LocalConfig;
         let ui5MockConfig;
@@ -43,14 +43,14 @@ async function deleteServiceData(basePath, paths, service, fs) {
         if (paths.ui5Yaml) {
             ui5Config = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5Yaml));
             // Delete service backend from fiori-tools-proxy middleware config
-            ui5Config.removeBackendFromFioriToolsProxydMiddleware(service.url);
+            ui5Config.removeBackendFromFioriToolsProxydMiddleware(service.path);
             fs.write(paths.ui5Yaml, ui5Config.toString());
         }
         const serviceAnnotationPaths = getEDMXAnnotationPaths(service.annotations);
         if (paths.ui5LocalYaml) {
             ui5LocalConfig = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5LocalYaml));
             // Delete service backend from fiori-tools-proxy middleware config
-            ui5LocalConfig.removeBackendFromFioriToolsProxydMiddleware(service.url);
+            ui5LocalConfig.removeBackendFromFioriToolsProxydMiddleware(service.path);
             // Delete service from mockserver middleware config
             ui5LocalConfig.removeServiceFromMockServerMiddleware(service.path, serviceAnnotationPaths);
             fs.write(paths.ui5LocalYaml, ui5LocalConfig.toString());
@@ -58,7 +58,7 @@ async function deleteServiceData(basePath, paths, service, fs) {
         if (paths.ui5MockYaml) {
             ui5MockConfig = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5MockYaml));
             // Delete service backend from fiori-tools-proxy middleware config
-            ui5MockConfig.removeBackendFromFioriToolsProxydMiddleware(service.url);
+            ui5MockConfig.removeBackendFromFioriToolsProxydMiddleware(service.path);
             // Delete service from mockserver config
             ui5MockConfig.removeServiceFromMockServerMiddleware(service.path, serviceAnnotationPaths);
             fs.write(paths.ui5MockYaml, ui5MockConfig.toString());

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%3Aodata-service-writer"
   },
-  "version": "0.26.11",
+  "version": "0.26.13",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -27,9 +27,9 @@
     "mem-fs-editor": "9.4.0",
     "prettify-xml": "1.2.0",
     "semver": "7.5.4",
-    "@sap-ux/mockserver-config-writer": "0.8.9",
-    "@sap-ux/project-access": "1.29.16",
-    "@sap-ux/ui5-config": "0.26.4"
+    "@sap-ux/mockserver-config-writer": "0.8.11",
+    "@sap-ux/project-access": "1.29.18",
+    "@sap-ux/ui5-config": "0.26.5"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",