@sap-ux/generator-adp 0.3.78 → 0.4.0

package/generators/app/index.d.ts

@@ -68,10 +68,6 @@ export default class extends Generator {
      * Indicates if the current layer is based on a customer base.
      */
     private isCustomerBase;
-    /**
-     * Base application inbounds, if the base application is an FLP app.
-     */
-    private baseAppInbounds?;
     /**
      * Creates an instance of the generator.
      *

package/generators/app/index.js

@@ -3,29 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 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 logger_1 = require("@sap-ux/logger");
 const feature_toggle_1 = require("@sap-ux/feature-toggle");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
-const layer_1 = require("./layer");
-const i18n_1 = require("../utils/i18n");
+const logger_1 = require("@sap-ux/logger");
 const telemetryEvents_1 = require("../telemetryEvents");
-const opts_1 = require("../utils/opts");
-const logger_2 = __importDefault(require("../utils/logger"));
-const attributes_1 = require("./questions/attributes");
-const configuration_1 = require("./questions/configuration");
-const validators_1 = require("./questions/helper/validators");
+const appWizardCache_1 = require("../utils/appWizardCache");
 const deps_1 = require("../utils/deps");
+const i18n_1 = require("../utils/i18n");
+const logger_2 = __importDefault(require("../utils/logger"));
+const opts_1 = require("../utils/opts");
 const parse_json_input_1 = require("../utils/parse-json-input");
-const subgenHelpers_1 = require("../utils/subgenHelpers");
-const appWizardCache_1 = require("../utils/appWizardCache");
-const default_values_1 = require("./questions/helper/default-values");
 const steps_1 = require("../utils/steps");
-const workspace_1 = require("../utils/workspace");
+const subgenHelpers_1 = require("../utils/subgenHelpers");
 const templates_1 = require("../utils/templates");
+const workspace_1 = require("../utils/workspace");
+const layer_1 = require("./layer");
+const attributes_1 = require("./questions/attributes");
+const configuration_1 = require("./questions/configuration");
+const default_values_1 = require("./questions/helper/default-values");
+const validators_1 = require("./questions/helper/validators");
 const generatorTitle = 'Adaptation Project';
 /**
  * Generator for creating an Adaptation Project.
@@ -95,10 +95,6 @@ class default_1 extends yeoman_generator_1.default {
      * Indicates if the current layer is based on a customer base.
      */
     isCustomerBase;
-    /**
-     * Base application inbounds, if the base application is an FLP app.
-     */
-    baseAppInbounds;
     /**
      * Creates an instance of the generator.
      *
@@ -171,14 +167,11 @@ class default_1 extends yeoman_generator_1.default {
             prompts: this.prompts
         };
         const defaultFolder = (0, fiori_generator_shared_1.getDefaultTargetFolder)(this.options.vscode) ?? process.cwd();
-        if (this.prompter.isCloud) {
-            this.baseAppInbounds = await (0, adp_tooling_1.getBaseAppInbounds)(this.configAnswers.application.id, this.prompter.provider);
-        }
         const options = {
             targetFolder: { default: defaultFolder, hide: this.shouldCreateExtProject },
             ui5ValidationCli: { hide: !this.isCli },
             enableTypeScript: { hide: this.shouldCreateExtProject },
-            addFlpConfig: { hasBaseAppInbounds: !!this.baseAppInbounds, hide: this.shouldCreateExtProject },
+            addFlpConfig: { hasBaseAppInbounds: !!this.prompter.baseAppInbounds, hide: this.shouldCreateExtProject },
             addDeployConfig: { hide: this.shouldCreateExtProject || !this.isCustomerBase }
         };
         const attributesQuestions = (0, attributes_1.getPrompts)(this.destinationPath(), promptConfig, options);
@@ -199,7 +192,7 @@ class default_1 extends yeoman_generator_1.default {
             (0, subgenHelpers_1.addFlpGen)({
                 vscode: this.vscode,
                 projectRootPath: this._getProjectPath(),
-                inbounds: this.baseAppInbounds,
+                inbounds: this.prompter.baseAppInbounds,
                 layer: this.layer
             }, this.composeWith.bind(this), this.logger, this.appWizard);
         }
@@ -374,7 +367,7 @@ class default_1 extends yeoman_generator_1.default {
             (0, steps_1.updateWizardSteps)(this.prompts, (0, steps_1.getDeployPage)(), (0, i18n_1.t)('yuiNavSteps.projectAttributesName'), this.attributeAnswers.addDeployConfig);
         }
         if (!flpPagesExist) {
-            (0, steps_1.updateFlpWizardSteps)(!!this.baseAppInbounds, this.prompts, this.attributeAnswers.projectName, !!this.attributeAnswers.addFlpConfig);
+            (0, steps_1.updateFlpWizardSteps)(!!this.prompter.baseAppInbounds, this.prompts, this.attributeAnswers.projectName, !!this.attributeAnswers.addFlpConfig);
         }
     }
 }

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

@@ -1,8 +1,8 @@
+import type { SystemLookup, UI5Version } from '@sap-ux/adp-tooling';
 import { FlexLayer } from '@sap-ux/adp-tooling';
-import type { ToolsLogger } from '@sap-ux/logger';
-import type { Manifest } from '@sap-ux/project-access';
 import { type AbapServiceProvider } from '@sap-ux/axios-extension';
-import type { SystemLookup, UI5Version } from '@sap-ux/adp-tooling';
+import type { ToolsLogger } from '@sap-ux/logger';
+import type { Manifest, ManifestNamespace } from '@sap-ux/project-access';
 import type { ConfigPromptOptions, ConfigQuestion } from '../types';
 /**
  * A stateful prompter class that creates configuration questions.
@@ -79,6 +79,10 @@ export declare class ConfigPrompter {
      * System UI5 version.
      */
     private systemVersion;
+    /**
+     * Base application inbounds, if the base application is an FLP app.
+     */
+    private baseApplicationInbounds?;
     /**
      * Returns the needed ui5 properties from calling the CDN.
      *
@@ -119,6 +123,12 @@ export declare class ConfigPrompter {
      * @returns {boolean} True if the application is supported.
      */
     get isAppSupported(): boolean;
+    /**
+     * Base application inbounds, if the base application is an FLP app.
+     *
+     * @returns {ManifestNamespace.Inbound|undefined} Returns the base application inbounds.
+     */
+    get baseAppInbounds(): ManifestNamespace.Inbound | undefined;
     /**
      * Creates an instance of ConfigPrompter.
      *

package/generators/app/questions/configuration.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigPrompter = void 0;
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
-const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const btp_utils_1 = require("@sap-ux/btp-utils");
+const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const i18n_1 = require("../../utils/i18n");
 const types_1 = require("../types");
-const message_1 = require("./helper/message");
-const choices_1 = require("./helper/choices");
-const validators_1 = require("./helper/validators");
 const additional_messages_1 = require("./helper/additional-messages");
+const choices_1 = require("./helper/choices");
 const conditions_1 = require("./helper/conditions");
+const message_1 = require("./helper/message");
+const validators_1 = require("./helper/validators");
 /**
  * A stateful prompter class that creates configuration questions.
  * It exposes a single public method {@link getPrompts} to retrieve the configuration questions.
@@ -87,6 +87,10 @@ class ConfigPrompter {
      * System UI5 version.
      */
     systemVersion;
+    /**
+     * Base application inbounds, if the base application is an FLP app.
+     */
+    baseApplicationInbounds;
     /**
      * Returns the needed ui5 properties from calling the CDN.
      *
@@ -139,6 +143,14 @@ class ConfigPrompter {
     get isAppSupported() {
         return this.isApplicationSupported;
     }
+    /**
+     * Base application inbounds, if the base application is an FLP app.
+     *
+     * @returns {ManifestNamespace.Inbound|undefined} Returns the base application inbounds.
+     */
+    get baseAppInbounds() {
+        return this.baseApplicationInbounds;
+    }
     /**
      * Creates an instance of ConfigPrompter.
      *
@@ -394,18 +406,27 @@ class ConfigPrompter {
             return (0, i18n_1.t)('error.selectCannotBeEmptyError', { value: 'Application' });
         }
         const validationResult = await this.validateAppData(app);
-        if (!(0, btp_utils_1.isAppStudio)()) {
-            return validationResult;
-        }
         const isKnownUnsupported = validationResult === (0, i18n_1.t)('error.appDoesNotSupportManifest') ||
             validationResult === (0, i18n_1.t)('error.appDoesNotSupportFlexibility');
-        if (isKnownUnsupported) {
+        if ((0, btp_utils_1.isAppStudio)() && isKnownUnsupported) {
             this.logger.error(validationResult);
             this.appValidationErrorMessage = validationResult;
             this.isApplicationSupported = false;
+            // Continue to the next prompt for extension project.
             return true;
         }
-        return validationResult;
+        if (typeof validationResult === 'string') {
+            return validationResult;
+        }
+        if (this.isCloud) {
+            try {
+                this.baseApplicationInbounds = await (0, adp_tooling_1.getBaseAppInbounds)(app.id, this.provider);
+            }
+            catch (error) {
+                return (0, i18n_1.t)('error.fetchBaseInboundsFailed', { error: error.message });
+            }
+        }
+        return true;
     }
     /**
      * Validates the password by setting up the provider and, if necessary,

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

@@ -77,6 +77,7 @@
         "systemNotFound": "System could not be found or is not supported: {{system}}. Please check the system exists.",
         "applicationNotFound": "The application could not be found or is not supported: {{appName}}. Please check the application exists.",
         "backendCommunicationError": "An error occurred when communicating with the back end. Please try again later.",
-        "pleaseProvideAllRequiredData": "Please provide the required data and try again."
+        "pleaseProvideAllRequiredData": "Please provide the required data and try again.",
+        "fetchBaseInboundsFailed": "Fetching base application inbounds failed: {{error}}."
     }
 }

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.3.78",
+  "version": "0.4.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,14 +30,14 @@
     "i18next": "25.3.0",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.15.27",
     "@sap-ux/axios-extension": "1.22.7",
-    "@sap-ux/btp-utils": "1.1.1",
-    "@sap-ux/feature-toggle": "0.3.1",
     "@sap-ux/inquirer-common": "0.7.41",
-    "@sap-ux/logger": "0.7.0",
+    "@sap-ux/adp-tooling": "0.15.27",
+    "@sap-ux/feature-toggle": "0.3.1",
+    "@sap-ux/btp-utils": "1.1.1",
     "@sap-ux/project-access": "1.30.14",
     "@sap-ux/store": "1.1.4",
+    "@sap-ux/logger": "0.7.0",
     "@sap-ux/system-access": "0.6.16",
     "@sap-ux/project-input-validator": "0.6.19",
     "@sap-ux/fiori-generator-shared": "0.13.14",