@sap-ux/fiori-app-sub-generator 0.7.32 → 0.7.34

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

@@ -181,15 +181,15 @@ async function transformState({ project, service, floorplan, entityRelatedConfig
         }
         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) {
-            appConfig.service.previewSettings = { authenticationType: store_1.AuthenticationType.ReentranceTicket };
-        }
-        else if (service.connectedSystem?.backendSystem?.serviceKeys ||
-            // If 'cloud' write `scp` property to yamls to enable preview on VSCode (using oAuth)
+            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 = { scp: true };
+            appConfig.service.previewSettings = { authenticationType: store_1.AuthenticationType.ReentranceTicket };
         }
         else if (service.apiHubConfig) {
             appConfig.service.previewSettings = { apiHub: true };

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

@@ -26,7 +26,7 @@ async function writeAppGenInfoFiles({ project, service, floorplan, entityRelated
     const templateLabel = (0, utils_1.t)(`floorplans.label.${floorplan}`, {
         odataVersion: service.version
     });
-    const datasourceLabel = (0, utils_1.getReadMeDataSourceLabel)(service.source, (0, utils_1.isBTPHosted)(service.connectedSystem), service.apiHubConfig?.apiHubType);
+    const datasourceLabel = (0, utils_1.getReadMeDataSourceLabel)(service.source, (0, utils_1.isAbapCloud)(service.connectedSystem), service.apiHubConfig?.apiHubType);
     // Assign any custom overriding properties that may be provided via headless, adaptors
     const appGenInfoCustom = Object.assign({
         generatorName,

package/generators/translations/fioriAppSubGenerator.i18n.json

@@ -30,9 +30,8 @@
             "filterEntityType": "Filter Entity Type",
             "navigationEntity": "Navigation Entity",
             "sapSystemType": {
-                "abapOnBtp": "ABAP Environment on SAP Business Technology Platform",
-                "s4hc": "SAP S/4HANA Cloud Environment",
-                "onPrem": "ABAP On-Premise"
+                "onPrem": "ABAP On-Premise",
+                "abapCloud": "ABAP Cloud"
             },
             "datasourceType": {
                 "sapSystem": "SAP System",

package/generators/types/constants.d.ts

@@ -2,9 +2,8 @@ import type { FioriStep } from './yeomanUiStepConfig';
 export declare const LEGACY_CAP_TYPE_NODE = "capNode";
 export declare const LEGACY_CAP_TYPE_JAVA = "capJava";
 export declare const enum SapSystemSourceType {
-    SCP = "abapOnBtp",
-    ON_PREM = "onPrem",
-    S4HC = "s4hc"
+    ABAP_CLOUD = "abapCloud",
+    ON_PREM = "onPrem"
 }
 export declare const PLATFORMS: {
     VSCODE: {

package/generators/utils/common.d.ts

@@ -76,22 +76,21 @@ export declare function getCdsUi5PluginInfo(capProjectPath: string, fs: Editor,
  */
 export declare function getCdsAnnotations(capService: CapService, projectName: string): Promise<CdsAnnotationsInfo | undefined>;
 /**
- * Determine if the specified connected system is hosted on BTP.
- * If a backend system uses service keys, or a destination is an ABAP environment on BTP, then it is considered to be hosted on BTP.
+ * Determine if the specified connected system is ABAP cloud.
  *
  * @param connectedSystem - The connected system object.
- * @returns {boolean} `true` if the connected system is hosted on BTP, otherwise `false`.
+ * @returns {boolean} `true` if the connected system is ABAP cloud, otherwise `false`.
  */
-export declare function isBTPHosted(connectedSystem?: ConnectedSystem): boolean;
+export declare function isAbapCloud(connectedSystem?: ConnectedSystem): boolean;
 /**
  * Retrieves the data source label.
  *
  * @param {DatasourceType} source - The data source type (`DatasourceType.sapSystem` or `DatasourceType.businessHub`).
- * @param scp
+ * @param abapCloud - Indicates if the SAP system is an ABAP Cloud system (BTP or S4HC).
  * @param {ApiHubType} apiHubType - The API hub type for business hubs.
  * @returns {string} The formatted data source label.
  */
-export declare function getReadMeDataSourceLabel(source: DatasourceType, scp?: boolean, apiHubType?: ApiHubType): string;
+export declare function getReadMeDataSourceLabel(source: DatasourceType, abapCloud?: boolean, apiHubType?: ApiHubType): string;
 /**
  * Generates the launch text for the application based on the CAP service information and project details.
  *

package/generators/utils/common.js

@@ -8,7 +8,7 @@ exports.getMinSupportedUI5Version = getMinSupportedUI5Version;
 exports.generateToolsId = generateToolsId;
 exports.getCdsUi5PluginInfo = getCdsUi5PluginInfo;
 exports.getCdsAnnotations = getCdsAnnotations;
-exports.isBTPHosted = isBTPHosted;
+exports.isAbapCloud = isAbapCloud;
 exports.getReadMeDataSourceLabel = getReadMeDataSourceLabel;
 exports.getLaunchText = getLaunchText;
 exports.generateLaunchConfig = generateLaunchConfig;
@@ -30,6 +30,7 @@ const types_1 = require("../types");
 const constants_1 = require("../types/constants");
 const external_1 = require("../types/external");
 const i18n_1 = require("./i18n");
+const store_1 = require("@sap-ux/store");
 /**
  * Parse the specified edmx string for validitiy and return the ODataVersion of the specified edmx string.
  *
@@ -148,29 +149,30 @@ async function getCdsAnnotations(capService, projectName) {
     }
 }
 /**
- * Determine if the specified connected system is hosted on BTP.
- * If a backend system uses service keys, or a destination is an ABAP environment on BTP, then it is considered to be hosted on BTP.
+ * Determine if the specified connected system is ABAP cloud.
  *
  * @param connectedSystem - The connected system object.
- * @returns {boolean} `true` if the connected system is hosted on BTP, otherwise `false`.
+ * @returns {boolean} `true` if the connected system is ABAP cloud, otherwise `false`.
  */
-function isBTPHosted(connectedSystem) {
-    return (!!connectedSystem?.backendSystem?.serviceKeys ||
-        (connectedSystem?.destination ? (0, btp_utils_1.isAbapEnvironmentOnBtp)(connectedSystem.destination) : false));
+function isAbapCloud(connectedSystem) {
+    if (connectedSystem?.backendSystem) {
+        return (0, store_1.getBackendSystemType)(connectedSystem.backendSystem) === 'AbapCloud';
+    }
+    return connectedSystem?.destination ? (0, btp_utils_1.isAbapEnvironmentOnBtp)(connectedSystem.destination) : false;
 }
 /**
  * Retrieves the data source label.
  *
  * @param {DatasourceType} source - The data source type (`DatasourceType.sapSystem` or `DatasourceType.businessHub`).
- * @param scp
+ * @param abapCloud - Indicates if the SAP system is an ABAP Cloud system (BTP or S4HC).
  * @param {ApiHubType} apiHubType - The API hub type for business hubs.
  * @returns {string} The formatted data source label.
  */
-function getReadMeDataSourceLabel(source, scp = false, apiHubType) {
+function getReadMeDataSourceLabel(source, abapCloud = false, apiHubType) {
     let dataSourceLabel;
     if (source === odata_service_inquirer_1.DatasourceType.sapSystem) {
         const labelDatasourceType = (0, i18n_1.t)(`readme.label.datasourceType.${odata_service_inquirer_1.DatasourceType.sapSystem}`);
-        const labelSystemType = (0, i18n_1.t)(`readme.label.sapSystemType.${scp ? "abapOnBtp" /* SapSystemSourceType.SCP */ : "onPrem" /* SapSystemSourceType.ON_PREM */}`);
+        const labelSystemType = (0, i18n_1.t)(`readme.label.sapSystemType.${abapCloud ? "abapCloud" /* SapSystemSourceType.ABAP_CLOUD */ : "onPrem" /* SapSystemSourceType.ON_PREM */}`);
         dataSourceLabel = `${labelDatasourceType} (${labelSystemType})`;
     }
     else if (source === odata_service_inquirer_1.DatasourceType.businessHub && apiHubType === "API_HUB_ENTERPRISE" /* ApiHubType.apiHubEnterprise */) {

package/generators/utils/telemetry.js

@@ -11,14 +11,15 @@ const common_1 = require("./common");
  * @returns
  */
 function getTelemetrySapSystemType(connectedSystem) {
-    if ((0, common_1.isBTPHosted)(connectedSystem)) {
-        return 'SCP';
+    if ((0, common_1.isAbapCloud)(connectedSystem)) {
+        return 'SCP'; // Legacy term, leaving as is to support telem conmtinuity
     }
     if ((connectedSystem?.destination && (0, btp_utils_1.isOnPremiseDestination)(connectedSystem.destination)) ||
         (connectedSystem?.backendSystem && !connectedSystem.backendSystem.serviceKeys)) {
         return 'ABAP';
     }
-    // The only remaining case is CF on VSCode
+    // This wont ever be the case now as all reentrance ticket based connections are to Abap Cloud regardless of how the system was discovered
+    // This can probably be removed
     if (connectedSystem?.serviceProvider) {
         return 'CF';
     }

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.7.32",
+  "version": "0.7.34",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,22 +29,22 @@
     "mem-fs-editor": "9.4.0",
     "uuid": "11.0.5",
     "yeoman-generator": "5.10.0",
-    "@sap-ux/annotation-generator": "0.3.67",
-    "@sap-ux/axios-extension": "1.22.10",
+    "@sap-ux/annotation-generator": "0.3.68",
+    "@sap-ux/axios-extension": "1.23.0",
     "@sap-ux/btp-utils": "1.1.4",
-    "@sap-ux/cap-config-writer": "0.12.13",
-    "@sap-ux/feature-toggle": "0.3.1",
-    "@sap-ux/fiori-elements-writer": "2.7.19",
-    "@sap-ux/fiori-freestyle-writer": "2.4.50",
-    "@sap-ux/fiori-generator-shared": "0.13.22",
+    "@sap-ux/cap-config-writer": "0.12.14",
+    "@sap-ux/feature-toggle": "0.3.2",
+    "@sap-ux/fiori-elements-writer": "2.7.21",
+    "@sap-ux/fiori-freestyle-writer": "2.4.51",
+    "@sap-ux/fiori-generator-shared": "0.13.23",
     "@sap-ux/fiori-tools-settings": "0.2.1",
     "@sap-ux/launch-config": "0.10.29",
-    "@sap-ux/odata-service-inquirer": "2.8.12",
+    "@sap-ux/odata-service-inquirer": "2.8.13",
     "@sap-ux/odata-service-writer": "0.27.25",
     "@sap-ux/project-access": "1.32.4",
-    "@sap-ux/store": "1.1.5",
-    "@sap-ux/telemetry": "0.6.28",
-    "@sap-ux/ui5-application-inquirer": "0.15.18",
+    "@sap-ux/store": "1.2.0",
+    "@sap-ux/telemetry": "0.6.29",
+    "@sap-ux/ui5-application-inquirer": "0.15.19",
     "@sap-ux/ui5-info": "0.13.0"
   },
   "devDependencies": {
@@ -62,9 +62,9 @@
     "mock-spawn": "0.2.6",
     "rimraf": "5.0.5",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.4.23",
-    "@sap-ux/flp-config-sub-generator": "0.3.36",
-    "@sap-ux/inquirer-common": "0.7.50",
+    "@sap-ux/deploy-config-sub-generator": "0.4.24",
+    "@sap-ux/flp-config-sub-generator": "0.3.38",
+    "@sap-ux/inquirer-common": "0.7.51",
     "@sap-ux/jest-file-matchers": "0.2.5",
     "@sap-ux/logger": "0.7.0"
   },