@sap-ux/generator-adp 0.2.2 → 0.2.3

package/generators/app/index.d.ts

@@ -51,6 +51,10 @@ export default class extends Generator {
      * Instance of AbapServiceProvider.
      */
     private abapProvider;
+    /**
+     * Application manifest.
+     */
+    private manifest;
     /**
      * Publicly available UI5 versions.
      */

package/generators/app/index.js

@@ -7,9 +7,9 @@ const path_1 = require("path");
 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 feature_toggle_1 = require("@sap-ux/feature-toggle");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const logger_1 = require("@sap-ux/logger");
+const feature_toggle_1 = require("@sap-ux/feature-toggle");
 const layer_1 = require("./layer");
 const i18n_1 = require("../utils/i18n");
 const telemetryEvents_1 = require("../telemetryEvents");
@@ -72,6 +72,10 @@ class default_1 extends yeoman_generator_1.default {
      * Instance of AbapServiceProvider.
      */
     abapProvider;
+    /**
+     * Application manifest.
+     */
+    manifest;
     /**
      * Publicly available UI5 versions.
      */
@@ -162,6 +166,7 @@ class default_1 extends yeoman_generator_1.default {
             }
             const provider = this.jsonInput ? this.abapProvider : this.prompter.provider;
             const publicVersions = this.jsonInput ? this.publicVersions : this.prompter.ui5.publicVersions;
+            const manifest = this.jsonInput ? this.manifest : this.prompter.manifest;
             const packageJson = (0, deps_1.getPackageInfo)();
             const config = await (0, adp_tooling_1.getConfig)({
                 provider,
@@ -169,6 +174,7 @@ class default_1 extends yeoman_generator_1.default {
                 attributeAnswers: this.attributeAnswers,
                 systemVersion: this.prompter?.ui5?.systemVersion,
                 publicVersions,
+                manifest,
                 layer: this.layer,
                 packageJson,
                 logger: this.toolsLogger
@@ -279,6 +285,8 @@ class default_1 extends yeoman_generator_1.default {
         if (!application) {
             throw new Error((0, i18n_1.t)('error.applicationNotFound', { appName: baseApplicationName }));
         }
+        const sourceManifest = new adp_tooling_1.SourceManifest(this.abapProvider, application.id);
+        this.manifest = await sourceManifest.getManifest();
         this.configAnswers = {
             system,
             username,

package/generators/app/questions/configuration.d.ts

@@ -47,6 +47,10 @@ export declare class ConfigPrompter {
      * Flag indicating whether the selected application is supported.
      */
     private isApplicationSupported;
+    /**
+     * Error message to be shown in the confirm extension project prompt.
+     */
+    private appValidationErrorMessage;
     /**
      * Indicates whether views are loaded synchronously.
      */

package/generators/app/questions/configuration.js

@@ -55,6 +55,10 @@ class ConfigPrompter {
      * Flag indicating whether the selected application is supported.
      */
     isApplicationSupported;
+    /**
+     * Error message to be shown in the confirm extension project prompt.
+     */
+    appValidationErrorMessage;
     /**
      * Indicates whether views are loaded synchronously.
      */
@@ -363,7 +367,7 @@ class ConfigPrompter {
         return {
             type: 'confirm',
             name: types_1.configPromptNames.shouldCreateExtProject,
-            message: () => (0, message_1.getExtProjectMessage)(this.isApplicationSupported, this.containsSyncViews),
+            message: () => (0, message_1.getExtProjectMessage)(this.isApplicationSupported, this.containsSyncViews, this.appValidationErrorMessage),
             default: false,
             guiOptions: {
                 applyDefaultWhenDirty: true
@@ -388,9 +392,11 @@ class ConfigPrompter {
         if (!(0, btp_utils_1.isAppStudio)()) {
             return validationResult;
         }
-        if (validationResult === (0, i18n_1.t)('error.appDoesNotSupportManifest') ||
-            validationResult === (0, i18n_1.t)('error.appDoesNotSupportAdaptation')) {
+        const isKnownUnsupported = validationResult === (0, i18n_1.t)('error.appDoesNotSupportManifest') ||
+            validationResult === (0, i18n_1.t)('error.appDoesNotSupportFlexibility');
+        if (isKnownUnsupported) {
             this.logger.error(validationResult);
+            this.appValidationErrorMessage = validationResult;
             this.isApplicationSupported = false;
             return true;
         }
@@ -573,7 +579,7 @@ class ConfigPrompter {
         }
         const ui5 = this.appManifest?.['sap.ui5'];
         if (ui5?.flexEnabled === false) {
-            throw new Error((0, i18n_1.t)('error.appDoesNotSupportAdaptation'));
+            throw new Error((0, i18n_1.t)('error.appDoesNotSupportFlexibility'));
         }
     }
     /**

package/generators/app/questions/helper/message.d.ts

@@ -3,7 +3,8 @@
  *
  * @param {boolean} isApplicationSupported - Whether the selected application is supported.
  * @param {boolean} hasSyncViews - Whether synchronized views exist for the app.
+ * @param {string} [errorMessage] - Optional validation error message (only used in BAS).
  * @returns {string} A message for confirm extension project prompt.
  */
-export declare const getExtProjectMessage: (isApplicationSupported: boolean, hasSyncViews: boolean) => string;
+export declare const getExtProjectMessage: (isApplicationSupported: boolean, hasSyncViews: boolean, errorMessage?: string) => string;
 //# sourceMappingURL=message.d.ts.map

package/generators/app/questions/helper/message.js

@@ -1,15 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExtProjectMessage = void 0;
+const btp_utils_1 = require("@sap-ux/btp-utils");
 const i18n_1 = require("../../../utils/i18n");
 /**
  * Creates a message for extension project prompt based on the provided parameters.
  *
  * @param {boolean} isApplicationSupported - Whether the selected application is supported.
  * @param {boolean} hasSyncViews - Whether synchronized views exist for the app.
+ * @param {string} [errorMessage] - Optional validation error message (only used in BAS).
  * @returns {string} A message for confirm extension project prompt.
  */
-const getExtProjectMessage = (isApplicationSupported, hasSyncViews) => {
+const getExtProjectMessage = (isApplicationSupported, hasSyncViews, errorMessage) => {
+    if ((0, btp_utils_1.isAppStudio)() && errorMessage) {
+        return `${errorMessage} ${(0, i18n_1.t)('prompts.extProjectSuggestion')}`;
+    }
     return isApplicationSupported && hasSyncViews
         ? (0, i18n_1.t)('prompts.createExtProjectWithSyncViewsLabel')
         : (0, i18n_1.t)('prompts.createExtProjectLabel');

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

@@ -19,6 +19,7 @@
         "achLabel": "Application Component Hierarchy",
         "achHint": "The purpose of ACH components is to enable the support organization to indicate which BCP/ticket component might be responsible for a particular issue.",
         "createExtProjectLabel": "The selected application is not supported by the SAPUI5 Adaptation Project. For more information, see SAPUI5 Adaptation Project documentation. Do you want to create an extension project instead?",
+        "extProjectSuggestion": "Do you want to create an extension project instead?",
         "createExtProjectWithSyncViewsLabel": "Do you want to create an extension project instead? An extension project gives you the ability to create controller extensions for synchronous and asynchronous views.",
         "createExtProjectContinueLabel": "Please select whether you want to continue.",
         "projectTypeLabel": "Project Type",
@@ -51,8 +52,8 @@
         "notDeployableSystemError": "The system that you have selected is not an ABAP On-Premise system which supports DTA_FOLDER deployment. Adaptation projects are only supported on those systems. Please choose an ABAP On-Premise system which supports DTA_FOLDER deployment.",
         "notFlexEnabledError": "The system that you have selected is not an ABAP On-Premise system which supports flexibility. Adaptation projects are only supported on those systems. Please choose an ABAP On-Premise system which supports flexibility. If you continue, you will only be able to create an extension project.",
         "manifestCouldNotBeValidated": "The manifest.json file of the selected application could not be validated. Please select a different application.",
-        "appDoesNotSupportAdaptation": "The selected application does not support flexibility. The SAPUI5 Adaptation Project is only available for applications that support flexibility. Please select a different application.",
-        "appDoesNotSupportManifest": "The selected application is not supported by the adaptation project. Please select a different application. For more information, see SAPUI5 Adaptation Project documentation.",
+        "appDoesNotSupportFlexibility": "The selected application does not support flexibility as it has (`flexEnabled=false`). SAPUI5 Adaptation Project only supports applications that support flexibility. Please select a different application.",
+        "appDoesNotSupportManifest": "The selected application is not supported by SAPUI5 Adaptation Project as it does not have a manifest.json file. Please select a different application.",
         "extensibilityGenNotFound": "Extensibility Project generator plugin was not found in your dev space, and is required for this action. To proceed, please install the <SAPUI5 Layout Editor & Extensibility> extension.",
         "creatingExtensionProjectError": "Creating the extension project failed. To see the error, view the logs.",
         "appParameterMissing": "Could not create an extension project because the application parameters are missing. Please select a different application.",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sap-ux/generator-adp",
   "displayName": "SAPUI5 Adaptation Project",
   "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.2.2",
+  "version": "0.2.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,7 +29,7 @@
     "i18next": "23.5.1",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.13.44",
+    "@sap-ux/adp-tooling": "0.13.45",
     "@sap-ux/axios-extension": "1.20.3",
     "@sap-ux/btp-utils": "1.0.3",
     "@sap-ux/feature-toggle": "0.2.4",