@sap-ux/flp-config-sub-generator 0.1.38 → 0.1.40

package/generators/app/index.d.ts

@@ -1,4 +1,5 @@
 import Generator from 'yeoman-generator';
+import { promptNames } from '@sap-ux/flp-config-inquirer';
 import type { FlpConfigOptions } from './types';
 /**
  * FLP config generator adds an inbound navigation config to an existing manifest.json.
@@ -14,6 +15,7 @@ export default class extends Generator {
     private abort;
     private manifest;
     private manifestPath;
+    private extensionPromptOpts?;
     options: FlpConfigOptions;
     setPromptsCallback: (fn: object) => void;
     /**
@@ -52,5 +54,6 @@ export default class extends Generator {
     private _updateI18n;
     end(): Promise<void>;
 }
+export { promptNames };
 export type { FlpConfigOptions };
 //# sourceMappingURL=index.d.ts.map

package/generators/app/index.js

@@ -3,12 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.promptNames = void 0;
 const path_1 = require("path");
 const yeoman_generator_1 = __importDefault(require("yeoman-generator"));
 const logger_1 = __importDefault(require("../utils/logger"));
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const deploy_config_generator_shared_1 = require("@sap-ux/deploy-config-generator-shared");
 const flp_config_inquirer_1 = require("@sap-ux/flp-config-inquirer");
+Object.defineProperty(exports, "promptNames", { enumerable: true, get: function () { return flp_config_inquirer_1.promptNames; } });
 const app_config_writer_1 = require("@sap-ux/app-config-writer");
 const project_access_1 = require("@sap-ux/project-access");
 const i18n_1 = require("@sap-ux/i18n");
@@ -33,6 +35,7 @@ class default_1 extends yeoman_generator_1.default {
     abort = false;
     manifest;
     manifestPath;
+    extensionPromptOpts;
     options;
     setPromptsCallback;
     /**
@@ -65,6 +68,7 @@ class default_1 extends yeoman_generator_1.default {
         if (this.env.conflicter) {
             this.env.conflicter.force = this.options.force ?? true;
         }
+        this.extensionPromptOpts = await (0, deploy_config_generator_shared_1.getExtensionGenPromptOpts)(this.env.create.bind(this.env), this.rootGeneratorName(), this.vscode);
         await fiori_generator_shared_1.TelemetryHelper.initTelemetrySettings({
             consumerModule: {
                 name: '@sap-ux/flp-config-sub-generator',
@@ -113,12 +117,8 @@ class default_1 extends yeoman_generator_1.default {
             additionalParameters: { hide: true },
             createAnotherInbound: { hide: true }
         }));
-        // Show specific prompt for config update when launched standalone or on CLI. Otherwise, it should be handled by consuming generator in YUI.
-        if (((0, fiori_generator_shared_1.getHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli || !this.options.launchFlpConfigAsSubGenerator) &&
-            this.options.data?.additionalPrompts?.confirmConfigUpdate?.show) {
-            const confirmConfigUpdatePrompts = (0, deploy_config_generator_shared_1.getConfirmConfigUpdatePrompt)(this.options.data.additionalPrompts.confirmConfigUpdate.configType);
-            questions = (0, inquirer_common_1.withCondition)(questions, (answers) => answers.confirmConfigUpdate);
-            questions.unshift(...confirmConfigUpdatePrompts);
+        if (this.extensionPromptOpts && !this.launchFlpConfigAsSubGenerator) {
+            questions = (0, inquirer_common_1.extendWithOptions)(questions, this.extensionPromptOpts);
         }
         this.answers = {};
         const answers = await this.prompt(questions);

package/generators/app/types.d.ts

@@ -47,24 +47,6 @@ export interface FlpConfigOptions extends Generator.GeneratorOptions {
          * Path to the application root where the Fiori launchpad configuration will be added.
          */
         appRootPath?: string;
-        /**
-         * Config for additional prompts
-         */
-        additionalPrompts?: {
-            /**
-             * Prompt to confirm the the update of non-productive configurations as they are centrally managed as part of the CI pipeline.
-             */
-            confirmConfigUpdate?: {
-                /**
-                 * Whether the prompt should be shown.
-                 */
-                show?: boolean;
-                /**
-                 * The type of configuration being updated. This will be added to the start of the prompt message.
-                 */
-                configType?: string;
-            };
-        };
     };
     /**
      * Logger instance

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/flp-config-sub-generator",
   "description": "Generator for creating Fiori Launcpad configuration",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -23,14 +23,14 @@
     "i18next": "23.5.1",
     "inquirer": "8.2.6",
     "yeoman-generator": "5.10.0",
-    "@sap-ux/app-config-writer": "0.5.39",
-    "@sap-ux/deploy-config-generator-shared": "0.0.34",
+    "@sap-ux/app-config-writer": "0.5.40",
+    "@sap-ux/deploy-config-generator-shared": "0.0.36",
     "@sap-ux/feature-toggle": "0.2.3",
-    "@sap-ux/fiori-generator-shared": "0.9.7",
-    "@sap-ux/flp-config-inquirer": "0.2.57",
+    "@sap-ux/fiori-generator-shared": "0.9.8",
+    "@sap-ux/flp-config-inquirer": "0.2.58",
     "@sap-ux/i18n": "0.2.3",
-    "@sap-ux/inquirer-common": "0.6.27",
-    "@sap-ux/project-access": "1.29.14"
+    "@sap-ux/inquirer-common": "0.6.28",
+    "@sap-ux/project-access": "1.29.15"
   },
   "devDependencies": {
     "@jest/types": "29.6.3",