fix(ui-service-gen): hide draftEnabled for abap cds views

packages/ui-service-inquirer/src/prompts/configuration/questions.ts

@@ -8,17 +8,24 @@ import {
 import { type Logger } from '@sap-ux/logger';
 import type { ConfirmQuestion, ExpandQuestion } from 'inquirer';
 import { t } from '../../i18n';
-import type { ServiceConfigQuestion, UiServiceAnswers } from '../../types';
-import { createAbapTarget, getServiceNameChoices, getValidationErrorLink } from '../prompt-helper';
+import { type ServiceConfigOptions, type ServiceConfigQuestion, type UiServiceAnswers } from '../../types';
+import {
+    createAbapTarget,
+    defaultOrShowAppGenLaunchQuestion,
+    defaultOrShowDraftQuestion,
+    getServiceNameChoices,
+    getValidationErrorLink
+} from '../prompt-helper';
 import { PromptState } from '../prompt-state';
 
 /**
  * Get the configuration questions.
  *
  * @param logger - logger instance to use for logging
+ * @param options - configuration options for prompts
  * @returns the configuration questions
  */
-export function getConfigQuestions(logger: Logger): ServiceConfigQuestion[] {
+export function getConfigQuestions(logger: Logger, options?: ServiceConfigOptions): ServiceConfigQuestion[] {
     PromptState.resetServiceConfig();
     let draftEnabled = true;
     const abapTarget = createAbapTarget(
@@ -67,7 +74,9 @@ export function getConfigQuestions(logger: Logger): ServiceConfigQuestion[] {
                             PromptState.serviceConfig.content =
                                 (await PromptState.systemSelection.objectGenerator?.getContent(packageValue)) ?? '';
                             const content = JSON.parse(PromptState.serviceConfig?.content);
-                            content.businessObject.projectionBehavior.withDraft = true;
+                            if (defaultOrShowDraftQuestion(options?.useDraftEnabled)) {
+                                content.businessObject.projectionBehavior.withDraft = true;
+                            }
                             PromptState.serviceConfig.content = JSON.stringify(content);
                             PromptState.serviceConfig.serviceName =
                                 content.businessService.serviceBinding.serviceBindingName;
@@ -102,6 +111,7 @@ export function getConfigQuestions(logger: Logger): ServiceConfigQuestion[] {
             }
         } as ExpandQuestion<UiServiceAnswers>,
         {
+            when: (): boolean => defaultOrShowDraftQuestion(options?.useDraftEnabled),
             name: 'draftEnabled',
             type: 'confirm',
             message: t('prompts.draftEnabled'),
@@ -132,6 +142,7 @@ export function getConfigQuestions(logger: Logger): ServiceConfigQuestion[] {
             }
         } as ConfirmQuestion<UiServiceAnswers>,
         {
+            when: (): boolean => defaultOrShowAppGenLaunchQuestion(options?.useLaunchGen),
             name: 'launchAppGen',
             type: 'confirm',
             message: t('prompts.launchAppGen'),

packages/ui-service-inquirer/src/prompts/prompt-helper.ts

@@ -85,3 +85,23 @@ export async function getValidationErrorLink(): Promise<ValidationLink> {
         t('error.validatingContent')
     );
 }
+
+/**
+ * Determines if the draft enabled prompt is shown.
+ *
+ * @param useDraftEnabled - the use draft enabled
+ * @returns the boolean
+ */
+export function defaultOrShowDraftQuestion(useDraftEnabled?: boolean): boolean {
+    return useDraftEnabled ?? true;
+}
+
+/**
+ * Determines if the app gen launch prompt is shown.
+ *
+ * @param useLaunchGen - the use launch gen
+ * @returns the boolean
+ */
+export function defaultOrShowAppGenLaunchQuestion(useLaunchGen?: boolean): boolean {
+    return useLaunchGen ?? true;
+}

packages/ui-service-inquirer/src/prompts/prompts.ts

@@ -1,7 +1,13 @@
 import type { Logger } from '@sap-ux/logger';
 import type { Question } from 'inquirer';
 import LoggerHelper from '../logger-helper';
-import type { ServiceConfig, ServiceConfigQuestion, SystemSelectionAnswers, UiServiceAnswers } from '../types';
+import type {
+    ServiceConfig,
+    ServiceConfigOptions,
+    ServiceConfigQuestion,
+    SystemSelectionAnswers,
+    UiServiceAnswers
+} from '../types';
 import { getConfigQuestions } from './configuration/questions';
 import { PromptState } from './prompt-state';
 import { getSystemQuestions } from './system-selection/questions';
@@ -35,11 +41,13 @@ export async function getSystemSelectionPrompts(
  * Get the configuration prompts.
  *
  * @param systemSelectionAnswers - the system selection answers to use if system selection prompting was skipped
+ * @param options - configuration options for prompts
  * @param logger - optional logger instance to use for logging
  * @returns the configuration prompts
  */
 export function getConfigPrompts(
     systemSelectionAnswers: SystemSelectionAnswers,
+    options?: ServiceConfigOptions,
     logger?: Logger
 ): { prompts: ServiceConfigQuestion[]; answers: Partial<ServiceConfig> } {
     if (logger) {
@@ -49,7 +57,7 @@ export function getConfigPrompts(
         Object.assign(PromptState.systemSelection, systemSelectionAnswers);
     }
     return {
-        prompts: getConfigQuestions(LoggerHelper.logger),
+        prompts: getConfigQuestions(LoggerHelper.logger, options),
         answers: PromptState.serviceConfig
     };
 }

packages/ui-service-inquirer/src/types.ts

@@ -53,3 +53,8 @@ export enum ObjectType {
     BUSINESS_OBJECT = 'BusinessObject',
     CDS_VIEW = 'CDSView'
 }
+
+export interface ServiceConfigOptions {
+    useDraftEnabled?: boolean;
+    useLaunchGen?: boolean;
+}

packages/ui-service-inquirer/test/__snapshots__/prompts.test.ts.snap

@@ -117,6 +117,7 @@ exports[`getSystemQuestions getServiceConfigQuestions 1`] = `
     "name": "draftEnabled",
     "type": "confirm",
     "validate": [Function],
+    "when": [Function],
   },
   {
     "additionalMessages": [Function],
@@ -127,6 +128,7 @@ exports[`getSystemQuestions getServiceConfigQuestions 1`] = `
     "message": "prompts.launchAppGen",
     "name": "launchAppGen",
     "type": "confirm",
+    "when": [Function],
   },
 ]
 `;

packages/ui-service-sub-generator/src/app/index.ts

@@ -6,7 +6,7 @@ import type { YeomanEnvironment } from '@sap-ux/fiori-generator-shared';
 import { sendTelemetry, TelemetryHelper } from '@sap-ux/fiori-generator-shared';
 import { type Logger } from '@sap-ux/logger';
 import type { ServiceConfig, SystemSelectionAnswers, UiServiceAnswers } from '@sap-ux/ui-service-inquirer';
-import { getConfigPrompts, getSystemSelectionPrompts } from '@sap-ux/ui-service-inquirer';
+import { getConfigPrompts, getSystemSelectionPrompts, ObjectType } from '@sap-ux/ui-service-inquirer';
 import Generator from 'yeoman-generator';
 import { boUri, cdsUri, initI18n, prompts, SERVICE_GENERATION_SUCCESS, t, UI_SERVICE_CACHE } from '../utils';
 import UiServiceGenLogger from '../utils/logger';
@@ -153,6 +153,11 @@ export default class extends Generator {
         // prompt service configuration
         const configPrompts = await getConfigPrompts(
             this.systemSelectionAnswers,
+            {
+                useDraftEnabled: !(
+                    this.answers.objectType === ObjectType.CDS_VIEW || this.options.data?.type === BAS_OBJECT.CDS
+                )
+            },
             UiServiceGenLogger.logger as unknown as Logger
         );