@sap-ux/generator-adp 0.5.15 → 0.6.0

package/generators/app/index.d.ts

@@ -96,14 +96,14 @@ export default class extends Generator {
      * CF services answers.
      */
     private cfServicesAnswers;
-    /**
-     * Indicates if the extension is installed.
-     */
-    private readonly isExtensionInstalled;
     /**
      * Indicates if CF is installed.
      */
     private cfInstalled;
+    /**
+     * Indicates if the CF feature is enabled.
+     */
+    private readonly isCfFeatureEnabled;
     /**
      * Creates an instance of the generator.
      *

package/generators/app/index.js

@@ -9,6 +9,7 @@ const yeoman_generator_1 = __importDefault(require("yeoman-generator"));
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
+const btp_utils_1 = require("@sap-ux/btp-utils");
 const logger_1 = require("@sap-ux/logger");
 const feature_toggle_1 = require("@sap-ux/feature-toggle");
 const telemetryEvents_1 = require("../telemetryEvents");
@@ -29,7 +30,6 @@ const configuration_1 = require("./questions/configuration");
 const default_values_1 = require("./questions/helper/default-values");
 const validators_1 = require("./questions/helper/validators");
 const types_1 = require("./types");
-const btp_utils_1 = require("@sap-ux/btp-utils");
 const target_env_1 = require("./questions/target-env");
 const generatorTitle = 'Adaptation Project';
 /**
@@ -128,14 +128,14 @@ class default_1 extends yeoman_generator_1.default {
      * CF services answers.
      */
     cfServicesAnswers;
-    /**
-     * Indicates if the extension is installed.
-     */
-    isExtensionInstalled;
     /**
      * Indicates if CF is installed.
      */
     cfInstalled;
+    /**
+     * Indicates if the CF feature is enabled.
+     */
+    isCfFeatureEnabled;
     /**
      * Creates an instance of the generator.
      *
@@ -151,11 +151,14 @@ class default_1 extends yeoman_generator_1.default {
         this._setupLogging();
         this.options = opts;
         this.isMtaYamlFound = (0, adp_tooling_1.isMtaProject)(process.cwd());
-        this.isExtensionInstalled = (0, feature_toggle_1.isInternalFeaturesSettingEnabled)()
-            ? (0, fiori_generator_shared_1.isExtensionInstalled)(opts.vscode, 'SAP.adp-ve-bas-ext')
-            : false;
+        this.isCfFeatureEnabled = (0, feature_toggle_1.isFeatureEnabled)('sap.ux.appGenerator.testBetaFeatures.adpCfExperimental');
+        this.logger.debug(`isCfFeatureEnabled: ${this.isCfFeatureEnabled}`);
         const jsonInputString = (0, parse_json_input_1.getFirstArgAsString)(args);
         this.jsonInput = (0, parse_json_input_1.parseJsonInput)(jsonInputString, this.logger);
+        // Force the generator to overwrite existing files without additional prompting
+        if (this.env.conflicter) {
+            this.env.conflicter.force = this.options.force ?? true;
+        }
         if (!this.jsonInput) {
             this.env.lookup({
                 packagePatterns: ['@sap/generator-fiori', '@bas-dev/generator-extensibility-sub']
@@ -182,7 +185,7 @@ class default_1 extends yeoman_generator_1.default {
         this.logger.info(`isCfInstalled: ${this.cfInstalled}`);
         const isInternalUsage = (0, feature_toggle_1.isInternalFeaturesSettingEnabled)();
         if (!this.jsonInput) {
-            const shouldShowTargetEnv = (0, btp_utils_1.isAppStudio)() && this.cfInstalled && this.isExtensionInstalled;
+            const shouldShowTargetEnv = (0, btp_utils_1.isAppStudio)() && this.cfInstalled && this.isCfFeatureEnabled;
             this.prompts.splice(0, 0, (0, steps_1.getWizardPages)(shouldShowTargetEnv));
             this.prompter = this._getOrCreatePrompter();
             this.cfPrompter = new cf_services_1.CFServicesPrompter(isInternalUsage, this.isCfLoggedIn, this.logger);
@@ -366,7 +369,7 @@ class default_1 extends yeoman_generator_1.default {
      * Sets the target environment and updates related state accordingly.
      */
     async _determineTargetEnv() {
-        const hasRequiredExtensions = this.isExtensionInstalled && this.cfInstalled;
+        const hasRequiredExtensions = this.isCfFeatureEnabled && this.cfInstalled;
         if ((0, btp_utils_1.isAppStudio)() && hasRequiredExtensions) {
             await this._promptForTargetEnvironment();
         }

package/generators/app/questions/configuration.js

@@ -567,7 +567,13 @@ class ConfigPrompter {
      * @returns {Promise<void>} A promise that resolves once all version data is loaded and assigned.
      */
     async loadUI5Versions() {
-        const version = await (0, adp_tooling_1.getSystemUI5Version)(this.abapProvider);
+        let version;
+        try {
+            version = await (0, adp_tooling_1.getSystemUI5Version)(this.abapProvider, this.logger);
+        }
+        catch (error) {
+            this.logger.debug(`Could not fetch the system UI5 version: ${error.message}.`);
+        }
         this.systemVersion = (0, adp_tooling_1.checkSystemVersionPattern)(version);
         this.publicVersions = await (0, adp_tooling_1.fetchPublicVersions)(this.logger);
         this.ui5Versions = await (0, adp_tooling_1.getRelevantVersions)(this.systemVersion, this.isCustomerBase, this.publicVersions);

package/generators/app/questions/helper/additional-messages.js

@@ -28,7 +28,7 @@ const getSystemAdditionalMessages = (flexUISystem, isCloudProject) => {
         if (!isUIFlex) {
             return {
                 message: (0, i18n_1.t)('error.notDeployableNotFlexEnabledSystemError'),
-                severity: yeoman_ui_types_1.Severity.error
+                severity: yeoman_ui_types_1.Severity.warning
             };
         }
         else {

package/generators/base/questions/credentials.js

@@ -66,7 +66,7 @@ function getPasswordPrompt(abapTarget, logger) {
                     password: value
                 };
                 const abapProvider = await (0, adp_tooling_1.getConfiguredProvider)(options, logger);
-                await (0, adp_tooling_1.getSystemUI5Version)(abapProvider);
+                await (0, adp_tooling_1.getSystemUI5Version)(abapProvider, logger);
                 return true;
             }
             catch (e) {

package/generators/translations/generator-adp.i18n.json

@@ -105,5 +105,8 @@
         "projectDoesNotExistMta": "Provide the path to the MTA project where you want to have your Adaptation Project created.",
         "noAdaptableBusinessServiceFoundInMta": "No adaptable business service found in the MTA.",
         "fetchBaseInboundsFailed": "Fetching base application inbounds failed: {{error}}."
+    },
+    "validators": {
+        "ui5VersionNotDetectedError": "The SAPUI5 version of the selected system cannot be determined. You are able to create and edit adaptation projects that use the latest SAPUI5 version, but they are not usable on this system until the system's SAPUI5 version is upgraded to version 1.71 or higher."
     }
 }

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "SAPUI5 Adaptation Project",
   "homepage": "https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/ada9567b767941aba8d49fdb4fdedea7.html",
   "description": "Adaptation project allows you to create an app variant for an existing SAP Fiori elements-based or SAPUI5 freestyle application, without changing the original application.",
-  "version": "0.5.15",
+  "version": "0.6.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,18 +30,18 @@
     "i18next": "25.3.0",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.16.13",
-    "@sap-ux/axios-extension": "1.23.1",
+    "@sap-ux/adp-tooling": "0.17.0",
+    "@sap-ux/axios-extension": "1.24.0",
     "@sap-ux/btp-utils": "1.1.4",
     "@sap-ux/feature-toggle": "0.3.3",
-    "@sap-ux/inquirer-common": "0.8.7",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/project-access": "1.32.7",
     "@sap-ux/store": "1.2.1",
-    "@sap-ux/system-access": "0.6.22",
+    "@sap-ux/system-access": "0.6.23",
     "@sap-ux/project-input-validator": "0.6.29",
     "@sap-ux/fiori-generator-shared": "0.13.28",
-    "@sap-ux/odata-service-writer": "0.27.28"
+    "@sap-ux/odata-service-writer": "0.27.28",
+    "@sap-ux/inquirer-common": "0.8.7"
   },
   "devDependencies": {
     "@jest/types": "30.0.1",
@@ -56,7 +56,7 @@
     "fs-extra": "10.0.0",
     "rimraf": "6.0.1",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.4.34"
+    "@sap-ux/deploy-config-sub-generator": "0.4.35"
   },
   "engines": {
     "node": ">=20.x"