@sap-ux/generator-adp 0.3.34 → 0.3.36

package/generators/app/index.js

@@ -171,23 +171,17 @@ class default_1 extends yeoman_generator_1.default {
             this.baseAppInbounds = await (0, adp_tooling_1.getBaseAppInbounds)(this.configAnswers.application.id, this.prompter.provider);
         }
         const options = {
-            targetFolder: { default: defaultFolder },
+            targetFolder: { default: defaultFolder, hide: this.shouldCreateExtProject },
             ui5ValidationCli: { hide: !this.isCli },
             enableTypeScript: { hide: this.shouldCreateExtProject },
-            addFlpConfig: { hasBaseAppInbounds: !!this.baseAppInbounds }
+            addFlpConfig: { hasBaseAppInbounds: !!this.baseAppInbounds, hide: this.shouldCreateExtProject },
+            addDeployConfig: { hide: this.shouldCreateExtProject || !this.isCustomerBase }
         };
         const attributesQuestions = (0, attributes_1.getPrompts)(this.destinationPath(), promptConfig, options);
         this.attributeAnswers = await this.prompt(attributesQuestions);
         // Steps need to be updated here to be available after back navigation in Yeoman UI.
         this._updateWizardStepsAfterNavigation();
         this.logger.info(`Project Attributes: ${JSON.stringify(this.attributeAnswers, null, 2)}`);
-        if (this.attributeAnswers?.addFlpConfig) {
-            (0, subgenHelpers_1.addFlpGen)({
-                vscode: this.vscode,
-                projectRootPath: this._getProjectPath(),
-                inbounds: this.baseAppInbounds
-            }, this.composeWith.bind(this), this.logger, this.appWizard);
-        }
         if (this.attributeAnswers.addDeployConfig) {
             const client = (await this.systemLookup.getSystemByName(this.configAnswers.system))?.Client;
             (0, subgenHelpers_1.addDeployGen)({
@@ -197,6 +191,13 @@ class default_1 extends yeoman_generator_1.default {
                 client
             }, this.composeWith.bind(this), this.logger, this.appWizard);
         }
+        if (this.attributeAnswers?.addFlpConfig) {
+            (0, subgenHelpers_1.addFlpGen)({
+                vscode: this.vscode,
+                projectRootPath: this._getProjectPath(),
+                inbounds: this.baseAppInbounds
+            }, this.composeWith.bind(this), this.logger, this.appWizard);
+        }
     }
     async writing() {
         try {
@@ -248,6 +249,9 @@ class default_1 extends yeoman_generator_1.default {
         }
     }
     async end() {
+        if (this.shouldCreateExtProject) {
+            return;
+        }
         const telemetryData = fiori_generator_shared_1.TelemetryHelper.createTelemetryData({
             appType: 'generator-adp',
             ...this.options.telemetryData
@@ -362,7 +366,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.baseAppInbounds, this.prompts, this.attributeAnswers.projectName, !!this.attributeAnswers.addFlpConfig);
         }
     }
 }

package/generators/utils/steps.d.ts

@@ -19,9 +19,9 @@ export declare function getFlpPages(showTileSettingsPage: boolean, projectName:
  * @param {boolean} hasBaseAppInbound - Indicates if the base app inbound exists.
  * @param {YeomanUiSteps} prompts - The Yeoman UI Prompts container object.
  * @param {string} projectName - The name of the project.
- * @param {boolean} [shouldAdd] - Whether to add (`true`) or remove (`false`) the steps.
+ * @param {boolean} shouldAdd - Whether to add (`true`) or remove (`false`) the steps.
  */
-export declare function updateFlpWizardSteps(hasBaseAppInbound: boolean, prompts: YeomanUiSteps, projectName: string, shouldAdd?: boolean): void;
+export declare function updateFlpWizardSteps(hasBaseAppInbound: boolean, prompts: YeomanUiSteps, projectName: string, shouldAdd: boolean): void;
 /**
  * Returns the deploy configuration page step.
  *

package/generators/utils/steps.js

@@ -51,9 +51,9 @@ function getFlpPages(showTileSettingsPage, projectName) {
  * @param {boolean} hasBaseAppInbound - Indicates if the base app inbound exists.
  * @param {YeomanUiSteps} prompts - The Yeoman UI Prompts container object.
  * @param {string} projectName - The name of the project.
- * @param {boolean} [shouldAdd] - Whether to add (`true`) or remove (`false`) the steps.
+ * @param {boolean} shouldAdd - Whether to add (`true`) or remove (`false`) the steps.
  */
-function updateFlpWizardSteps(hasBaseAppInbound, prompts, projectName, shouldAdd = true) {
+function updateFlpWizardSteps(hasBaseAppInbound, prompts, projectName, shouldAdd) {
     const pages = getFlpPages(hasBaseAppInbound, projectName);
     if (pages.length === 2) {
         updateWizardSteps(prompts, pages[0], (0, i18n_1.t)('yuiNavSteps.deployConfigName'), shouldAdd);

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@sap-ux/generator-adp",
   "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.34",
+  "version": "0.3.36",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,10 +30,10 @@
     "i18next": "23.5.1",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/btp-utils": "1.1.0",
+    "@sap-ux/adp-tooling": "0.14.35",
     "@sap-ux/axios-extension": "1.22.3",
-    "@sap-ux/adp-tooling": "0.14.34",
     "@sap-ux/feature-toggle": "0.3.0",
+    "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/inquirer-common": "0.7.18",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/project-access": "1.30.4",
@@ -40,7 +41,7 @@
     "@sap-ux/system-access": "0.6.9",
     "@sap-ux/project-input-validator": "0.6.7",
     "@sap-ux/fiori-generator-shared": "0.12.13",
-    "@sap-ux/adp-flp-config-sub-generator": "0.1.34"
+    "@sap-ux/adp-flp-config-sub-generator": "0.1.35"
   },
   "devDependencies": {
     "@jest/types": "29.6.3",