@sap-ux/fiori-app-sub-generator 0.3.0 → 0.4.1

package/generators/fiori-app-generator/fioriAppGenerator.js

@@ -194,8 +194,9 @@ class FioriAppGenerator extends yeoman_generator_1.default {
                 (0, subgenHelpers_1.addDeployGen)({
                     service: this.state.service,
                     projectName: this.state.project.name,
+                    promptSettings: generatorOptions.promptSettings,
                     targetFolder: this.state.project.targetFolder,
-                    applicationType: 'FF' // Telemetry data
+                    applicationType: this.state.floorplan === types_1.FloorplanFF.FF_SIMPLE ? 'FF' : 'FE' // Telemetry data
                 }, this.composeWith.bind(this), FioriAppGenerator.logger, this.appWizard);
             }
             if (this.state.project?.addFlpConfig) {

package/generators/fiori-app-generator/prompting.js

@@ -282,8 +282,9 @@ function createOdataServicePromptOptions(options) {
         },
         [odata_service_inquirer_1.promptNames.serviceSelection]: {
             useAutoComplete: (0, fiori_generator_shared_1.getHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli,
-            requiredOdataVersion: options.requiredOdataVersion,
-            showCollaborativeDraftWarning: options.showCollabDraftWarning && isYUI
+            requiredOdataVersion: options.requiredOdataVersion ?? options.promptOptions?.serviceSelection?.requiredOdataVersion,
+            showCollaborativeDraftWarning: options.showCollabDraftWarning && isYUI,
+            serviceFilter: options.promptOptions?.serviceSelection?.serviceFilter
         },
         [odata_service_inquirer_1.promptNames.systemSelection]: {
             destinationFilters: {

package/generators/fiori-app-generator/subgenHelpers.d.ts

@@ -1,22 +1,24 @@
 import type { AppWizard } from '@sap-devx/yeoman-ui-types';
 import type { ILogWrapper } from '@sap-ux/fiori-generator-shared';
 import type Generator from 'yeoman-generator';
-import { type Service } from '../types';
+import { type FioriAppGeneratorPromptSettings, type Service } from '../types';
 /**
  * Add the '@sap/fiori:fiori-deployment' generator as a subgenerator.
  *
- * @param root0
- * @param root0.service
- * @param root0.projectName
- * @param root0.targetFolder
- * @param root0.applicationType
- * @param composeWith
- * @param logger
- * @param appWizard
+ * @param deployGenOpts
+ * @param deployGenOpts.service - service object
+ * @param deployGenOpts.projectName - project name
+ * @param deployGenOpts.promptSettings - prompt settings for the deployment generator
+ * @param deployGenOpts.targetFolder - target folder for the deployment configuration
+ * @param deployGenOpts.applicationType - application type, used for telemetry (FF | FE)
+ * @param composeWith - the composeWith function from the Yeoman generator
+ * @param logger - logger instance
+ * @param appWizard - instance of the AppWizard
  */
-export declare function addDeployGen({ service, projectName, targetFolder, applicationType }: {
+export declare function addDeployGen({ service, projectName, promptSettings, targetFolder, applicationType }: {
     service: Partial<Service>;
     projectName: string;
+    promptSettings?: FioriAppGeneratorPromptSettings;
     targetFolder: string;
     applicationType: string;
 }, composeWith: Generator['composeWith'], logger: ILogWrapper, appWizard?: AppWizard): void;

package/generators/fiori-app-generator/subgenHelpers.js

@@ -8,16 +8,17 @@ const utils_1 = require("../utils");
 /**
  * Add the '@sap/fiori:fiori-deployment' generator as a subgenerator.
  *
- * @param root0
- * @param root0.service
- * @param root0.projectName
- * @param root0.targetFolder
- * @param root0.applicationType
- * @param composeWith
- * @param logger
- * @param appWizard
+ * @param deployGenOpts
+ * @param deployGenOpts.service - service object
+ * @param deployGenOpts.projectName - project name
+ * @param deployGenOpts.promptSettings - prompt settings for the deployment generator
+ * @param deployGenOpts.targetFolder - target folder for the deployment configuration
+ * @param deployGenOpts.applicationType - application type, used for telemetry (FF | FE)
+ * @param composeWith - the composeWith function from the Yeoman generator
+ * @param logger - logger instance
+ * @param appWizard - instance of the AppWizard
  */
-function addDeployGen({ service, projectName, targetFolder, applicationType }, composeWith, logger, appWizard) {
+function addDeployGen({ service, projectName, promptSettings, targetFolder, applicationType }, composeWith, logger, appWizard) {
     composeWith('@sap/fiori:deploy-config', {
         launchDeployConfigAsSubGenerator: true,
         appGenServiceHost: service.host,
@@ -30,7 +31,8 @@ function addDeployGen({ service, projectName, targetFolder, applicationType }, c
         projectPath: targetFolder,
         appWizard: appWizard,
         telemetryData: { appType: applicationType },
-        logWrapper: logger
+        logWrapper: logger,
+        subGenPromptOptions: promptSettings?.['@sap-ux/deploy-config-sub-generator']
     });
 }
 /**

package/generators/types/common.d.ts

@@ -1,5 +1,7 @@
 import type { DatasourceType, OdataServicePromptOptions, OdataVersion, promptNames } from '@sap-ux/odata-service-inquirer';
 import type { UI5ApplicationPromptOptions } from '@sap-ux/ui5-application-inquirer';
+import type { AbapDeployConfigPromptOptions } from '@sap-ux/abap-deploy-config-inquirer';
+import type { CfDeployConfigPromptOptions } from '@sap-ux/cf-deploy-config-inquirer';
 /**
  * package.json script entries (commands and tasks)
  */
@@ -14,7 +16,9 @@ export type WorkspaceFolder = {
     folderName: string;
     path: string;
 };
-export type FioriAppGeneratorPromptSettings = UI5ApplicationPromptOptions & Pick<OdataServicePromptOptions, promptNames.systemSelection>;
+export type FioriAppGeneratorPromptSettings = UI5ApplicationPromptOptions & Pick<OdataServicePromptOptions, promptNames.systemSelection | promptNames.serviceSelection> & {
+    '@sap-ux/deploy-config-sub-generator'?: AbapDeployConfigPromptOptions | CfDeployConfigPromptOptions;
+};
 /**
  * Custom environment type until yeoman-environment provides one
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-app-sub-generator",
   "description": "A yeoman (sub) generator that can generate Fiori applications. Not for standalone use.",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -35,17 +35,17 @@
     "@sap-ux/cap-config-writer": "0.10.2",
     "@sap-ux/feature-toggle": "0.3.0",
     "@sap-ux/fiori-elements-writer": "2.4.7",
-    "@sap-ux/fiori-freestyle-writer": "2.4.4",
     "@sap-ux/fiori-generator-shared": "0.12.2",
     "@sap-ux/fiori-tools-settings": "0.2.0",
+    "@sap-ux/fiori-freestyle-writer": "2.4.4",
     "@sap-ux/launch-config": "0.10.1",
     "@sap-ux/odata-service-inquirer": "2.4.7",
     "@sap-ux/odata-service-writer": "0.27.3",
     "@sap-ux/project-access": "1.30.1",
     "@sap-ux/store": "1.1.0",
-    "@sap-ux/telemetry": "0.6.2",
     "@sap-ux/ui5-application-inquirer": "0.14.3",
-    "@sap-ux/ui5-info": "0.11.0"
+    "@sap-ux/ui5-info": "0.11.0",
+    "@sap-ux/telemetry": "0.6.2"
   },
   "devDependencies": {
     "@sap-devx/yeoman-ui-types": "1.16.9",
@@ -62,6 +62,8 @@
     "mock-spawn": "0.2.6",
     "rimraf": "5.0.5",
     "yeoman-test": "6.3.0",
+    "@sap-ux/cf-deploy-config-inquirer": "0.3.3",
+    "@sap-ux/abap-deploy-config-inquirer": "1.4.5",
     "@sap-ux/flp-config-sub-generator": "0.2.9",
     "@sap-ux/inquirer-common": "0.7.3",
     "@sap-ux/jest-file-matchers": "0.2.2",