@sap-ux/fiori-app-sub-generator 0.12.2 → 0.13.0

package/generators/fiori-app-generator/transforms.js

@@ -136,6 +136,38 @@ function getUI5Uri() {
     const envSetUI5CdnUrl = process.env.UI5_CDN_URL?.replace(/\/{1,2083}$/, '');
     return envSetUI5CdnUrl ?? types_1.UI5_VERSION_PROPS.OFFICIAL_URL;
 }
+/**
+ * Return the preview settings for the app configuration based on the service configuration.
+ *
+ * @param service - the service config from the state
+ * @returns - preview settings
+ */
+function getPreviewSettings(service) {
+    let previewSettings = {};
+    if (service.destinationAuthType === btp_utils_1.Authentication.SAML_ASSERTION ||
+        service.connectedSystem?.destination?.Authentication === btp_utils_1.Authentication.SAML_ASSERTION ||
+        store_1.AuthenticationType.ReentranceTicket === service.connectedSystem?.backendSystem?.authenticationType ||
+        // Apps generated with stored service keys (legacy) will use re-entrance tickets for connectivity
+        // New stored systems will only use re-entrance
+        service.connectedSystem?.backendSystem?.serviceKeys ||
+        // If 'cloud' this will enable preview on VSCode (using re-entrance) for app portability
+        ((0, fiori_generator_shared_1.getHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.bas &&
+            service.connectedSystem?.destination &&
+            (0, btp_utils_1.isAbapEnvironmentOnBtp)(service.connectedSystem?.destination))) {
+        previewSettings = { authenticationType: store_1.AuthenticationType.ReentranceTicket };
+    }
+    else if (service.apiHubConfig) {
+        previewSettings = { apiHub: true };
+    }
+    if (service.connectedSystem?.backendSystem?.connectionType === 'odata_service') {
+        const url = service.connectedSystem.backendSystem.url;
+        previewSettings = {
+            ...previewSettings,
+            connectPath: url ? new URL(url).pathname : undefined
+        };
+    }
+    return previewSettings;
+}
 /**
  * Transform Fiori Tools State to the type required by the open source ux-tools module.
  * Process inputs to set correct defaults.
@@ -193,21 +225,10 @@ async function transformState({ project, service, floorplan, entityRelatedConfig
                 disableCapRootPkgJsonUpdates
             };
         }
-        if (service.destinationAuthType === btp_utils_1.Authentication.SAML_ASSERTION ||
-            service.connectedSystem?.destination?.Authentication === btp_utils_1.Authentication.SAML_ASSERTION ||
-            store_1.AuthenticationType.ReentranceTicket === service.connectedSystem?.backendSystem?.authenticationType ||
-            // Apps generated with stored service keys (legacy) will use re-entrance tickets for connectivity
-            // New stored systems will only use re-entrance
-            service.connectedSystem?.backendSystem?.serviceKeys ||
-            // If 'cloud' this will enable preview on VSCode (using re-entrance) for app portability
-            ((0, fiori_generator_shared_1.getHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.bas &&
-                service.connectedSystem?.destination &&
-                (0, btp_utils_1.isAbapEnvironmentOnBtp)(service.connectedSystem?.destination))) {
-            appConfig.service.previewSettings = { authenticationType: store_1.AuthenticationType.ReentranceTicket };
-        }
-        else if (service.apiHubConfig) {
-            appConfig.service.previewSettings = { apiHub: true };
-        }
+        appConfig.service.previewSettings = {
+            ...appConfig.service.previewSettings,
+            ...getPreviewSettings(service)
+        };
     }
     return appConfig;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-app-sub-generator",
   "description": "A yeoman (sub) generator that can generate Fiori applications. Not for standalone use.",
-  "version": "0.12.2",
+  "version": "0.13.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,22 +29,22 @@
     "mem-fs-editor": "9.4.0",
     "uuid": "11.1.0",
     "yeoman-generator": "5.10.0",
-    "@sap-ux/annotation-generator": "0.4.41",
+    "@sap-ux/annotation-generator": "0.4.42",
     "@sap-ux/axios-extension": "1.25.24",
     "@sap-ux/btp-utils": "1.1.10",
-    "@sap-ux/cap-config-writer": "0.12.79",
+    "@sap-ux/cap-config-writer": "0.12.80",
     "@sap-ux/feature-toggle": "0.3.7",
-    "@sap-ux/fiori-elements-writer": "2.8.105",
-    "@sap-ux/fiori-freestyle-writer": "2.5.76",
-    "@sap-ux/fiori-generator-shared": "0.13.87",
+    "@sap-ux/fiori-elements-writer": "2.8.107",
+    "@sap-ux/fiori-freestyle-writer": "2.5.78",
+    "@sap-ux/fiori-generator-shared": "0.13.88",
     "@sap-ux/fiori-tools-settings": "0.2.3",
-    "@sap-ux/launch-config": "0.10.76",
-    "@sap-ux/odata-service-inquirer": "2.19.14",
-    "@sap-ux/odata-service-writer": "0.30.1",
-    "@sap-ux/project-access": "1.35.13",
+    "@sap-ux/launch-config": "0.10.77",
+    "@sap-ux/odata-service-inquirer": "2.20.0",
+    "@sap-ux/odata-service-writer": "0.31.0",
+    "@sap-ux/project-access": "1.35.14",
     "@sap-ux/store": "1.5.10",
-    "@sap-ux/telemetry": "0.6.87",
-    "@sap-ux/ui5-application-inquirer": "0.17.1",
+    "@sap-ux/telemetry": "0.6.88",
+    "@sap-ux/ui5-application-inquirer": "0.17.2",
     "@sap-ux/ui5-info": "0.13.15"
   },
   "devDependencies": {
@@ -62,9 +62,9 @@
     "mock-spawn": "0.2.6",
     "rimraf": "6.1.3",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.115",
-    "@sap-ux/flp-config-sub-generator": "0.3.164",
-    "@sap-ux/inquirer-common": "0.11.25",
+    "@sap-ux/deploy-config-sub-generator": "0.5.117",
+    "@sap-ux/flp-config-sub-generator": "0.3.165",
+    "@sap-ux/inquirer-common": "0.11.26",
     "@sap-ux/jest-file-matchers": "0.2.11",
     "@sap-ux/logger": "0.8.2"
   },