@sap-ux/odata-service-inquirer 0.6.7 → 0.6.9

package/dist/index.d.ts

@@ -4,6 +4,7 @@ import { OdataVersion } from '@sap-ux/odata-service-writer';
 import { type ToolsSuiteTelemetryClient } from '@sap-ux/telemetry';
 import { ERROR_TYPE, ErrorHandler } from '@sap-ux/inquirer-common';
 import { SystemSelectionAnswerType } from './prompts/datasources/sap-system/system-selection';
+import type { NewSystemChoice, CfAbapEnvServiceChoice } from './prompts/datasources/sap-system/system-selection/prompt-helpers';
 import { DatasourceType, promptNames, type CapRuntime, type CapService, type OdataServiceAnswers, type OdataServicePromptOptions, type OdataServiceQuestion, type SapSystemType } from './types';
 /**
  * Get the inquirer prompts for odata service.
@@ -31,5 +32,5 @@ declare function getPrompts(promptOptions?: OdataServicePromptOptions, logger?:
  * @returns the prompt answers
  */
 declare function prompt(adapter: InquirerAdapter, promptOptions?: OdataServicePromptOptions, logger?: Logger, enableGuidedAnswers?: boolean, telemetryClient?: ToolsSuiteTelemetryClient, isYUI?: boolean): Promise<OdataServiceAnswers>;
-export { DatasourceType, ERROR_TYPE, ErrorHandler, getPrompts, OdataVersion, prompt, promptNames, SystemSelectionAnswerType, type CapRuntime, type CapService, type InquirerAdapter, type OdataServiceAnswers, type OdataServicePromptOptions, type SapSystemType };
+export { DatasourceType, ERROR_TYPE, ErrorHandler, getPrompts, OdataVersion, prompt, promptNames, SystemSelectionAnswerType, type CapRuntime, type CapService, type InquirerAdapter, type OdataServiceAnswers, type OdataServicePromptOptions, type SapSystemType, NewSystemChoice, CfAbapEnvServiceChoice };
 //# sourceMappingURL=index.d.ts.map

package/dist/prompts/datasources/cap-project/cap-helpers.js

@@ -12,6 +12,7 @@ const path_1 = require("path");
 const i18n_1 = require("../../../i18n");
 const logger_helper_1 = __importDefault(require("../../logger-helper"));
 const prompt_helpers_1 = require("../../prompt-helpers");
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
 exports.enterCapPathChoiceValue = 'enterCapPath';
 /**
  * Search for CAP projects in the specified paths.
@@ -136,8 +137,9 @@ async function getCapServiceChoices(capProjectPaths) {
             capCdsVersionInfo = cdsVersionInfo;
         }
         catch (error) {
-            prompt_helpers_1.errorHandler.logErrorMsgs(error);
-            logger_helper_1.default.logger.error((0, i18n_1.t)('errors.capModelAndServicesLoadError', { error: error?.message }));
+            const capLoadErrorMsg = (0, i18n_1.t)('errors.capModelAndServicesLoadError', { error: error?.message });
+            prompt_helpers_1.errorHandler.logErrorMsgs(inquirer_common_1.ERROR_TYPE.UNKNOWN, capLoadErrorMsg);
+            logger_helper_1.default.logger.error(capLoadErrorMsg);
             return [];
         }
         // We need the relative service definitions file paths (.cds) for the generated annotation file

package/dist/prompts/datasources/sap-system/system-selection/prompt-helpers.d.ts

@@ -4,7 +4,11 @@ import type { BackendSystem } from '@sap-ux/store';
 import type { ListChoiceOptions } from 'inquirer';
 import { type DestinationFilters } from '../../../../types';
 import type { ConnectionValidator, ValidationResult } from '../../../connectionValidator';
-import { type SystemSelectionAnswers } from './questions';
+import { type SystemSelectionAnswerType } from './questions';
+export declare const NewSystemChoice = "!@\u00A3*&937newSystem*X~qy^";
+export type NewSystemChoice = typeof NewSystemChoice;
+export declare const CfAbapEnvServiceChoice = "cfAbapEnvService";
+export type CfAbapEnvServiceChoice = typeof CfAbapEnvServiceChoice;
 /**
  * Connects to the specified backend system and validates the connection.
  * Note this will return true in the case of basic auth validation failure to defer validation to the credentials prompt.
@@ -40,5 +44,13 @@ export declare function getBackendSystemDisplayName(system: BackendSystem): stri
  * @param includeCloudFoundryAbapEnvChoice whether to include the Cloud Foundry ABAP environment choice in the list
  * @returns a list of choices for the system selection prompt
  */
-export declare function createSystemChoices(destinationFilters?: Partial<DestinationFilters>, includeCloudFoundryAbapEnvChoice?: boolean): Promise<ListChoiceOptions<SystemSelectionAnswers>[]>;
+export declare function createSystemChoices(destinationFilters?: Partial<DestinationFilters>, includeCloudFoundryAbapEnvChoice?: boolean): Promise<ListChoiceOptions<SystemSelectionAnswerType>[]>;
+/**
+ * Find the default selection index based on the default choice value.
+ *
+ * @param systemChoices the list of system choices
+ * @param defaultChoice the default choice value
+ * @returns the index of the default choice in the system choices list
+ */
+export declare function findDefaultSystemSelectionIndex(systemChoices: ListChoiceOptions<SystemSelectionAnswerType>[], defaultChoice: string | undefined): number;
 //# sourceMappingURL=prompt-helpers.d.ts.map

package/dist/prompts/datasources/sap-system/system-selection/prompt-helpers.js

@@ -3,17 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CfAbapEnvServiceChoice = exports.NewSystemChoice = void 0;
 exports.connectWithBackendSystem = connectWithBackendSystem;
 exports.connectWithDestination = connectWithDestination;
 exports.getBackendSystemDisplayName = getBackendSystemDisplayName;
 exports.createSystemChoices = createSystemChoices;
+exports.findDefaultSystemSelectionIndex = findDefaultSystemSelectionIndex;
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const store_1 = require("@sap-ux/store");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const i18n_1 = require("../../../../i18n");
 const utils_1 = require("../../../../utils");
 const logger_helper_1 = __importDefault(require("../../../logger-helper"));
-const questions_1 = require("./questions");
+// New system choice value is a hard to guess string to avoid conflicts with existing system names or user named systems
+// since it will be used as a new system value in the system selection prompt.
+exports.NewSystemChoice = '!@£*&937newSystem*X~qy^';
+exports.CfAbapEnvServiceChoice = 'cfAbapEnvService';
 /**
  * Connects to the specified backend system and validates the connection.
  * Note this will return true in the case of basic auth validation failure to defer validation to the credentials prompt.
@@ -101,7 +106,7 @@ function getBackendSystemDisplayName(system) {
     if (system.authenticationType === 'reentranceTicket') {
         systemTypeName = ` (${(0, i18n_1.t)('texts.systemTypeS4HC')})`;
     }
-    if (system.authenticationType === 'oauth2') {
+    if (system.serviceKeys) {
         systemTypeName = ` (${(0, i18n_1.t)('texts.systemTypeBTP')})`;
     }
     return `${system.name}${systemTypeName}${userDisplayName}`;
@@ -161,7 +166,10 @@ async function createSystemChoices(destinationFilters, includeCloudFoundryAbapEn
         if (includeCloudFoundryAbapEnvChoice) {
             newSystemChoice = {
                 name: (0, i18n_1.t)('prompts.newSystemType.choiceCFAbapEnvServiceOnBtp'),
-                value: { type: 'cfAbapEnvService', system: 'cfAbapEnvService' }
+                value: {
+                    type: exports.CfAbapEnvServiceChoice,
+                    system: exports.CfAbapEnvServiceChoice
+                }
             };
         }
     }
@@ -178,7 +186,7 @@ async function createSystemChoices(destinationFilters, includeCloudFoundryAbapEn
         });
         newSystemChoice = {
             name: (0, i18n_1.t)('prompts.systemSelection.newSystemChoiceLabel'),
-            value: { system: questions_1.newSystemChoiceValue, type: 'newSystemChoice' }
+            value: { type: 'newSystemChoice', system: exports.NewSystemChoice }
         };
     }
     systemChoices.sort(({ name: nameA }, { name: nameB }) => nameA.localeCompare(nameB, undefined, { numeric: true, caseFirst: 'lower' }));
@@ -187,4 +195,32 @@ async function createSystemChoices(destinationFilters, includeCloudFoundryAbapEn
     }
     return systemChoices;
 }
+/**
+ * Find the default selection index based on the default choice value.
+ *
+ * @param systemChoices the list of system choices
+ * @param defaultChoice the default choice value
+ * @returns the index of the default choice in the system choices list
+ */
+function findDefaultSystemSelectionIndex(systemChoices, defaultChoice) {
+    if (!defaultChoice) {
+        return -1;
+    }
+    const defaultChoiceIndex = systemChoices.findIndex((choice) => {
+        const { type: systemType, system } = choice.value;
+        if (systemType === 'destination') {
+            return system.Name === defaultChoice;
+        }
+        if (systemType === 'backendSystem') {
+            return system.name === defaultChoice;
+        }
+        if (systemType === 'newSystemChoice') {
+            return defaultChoice === exports.NewSystemChoice;
+        }
+        if (systemType === 'cfAbapEnvService') {
+            return defaultChoice === exports.CfAbapEnvServiceChoice;
+        }
+    });
+    return defaultChoiceIndex;
+}
 //# sourceMappingURL=prompt-helpers.js.map

package/dist/prompts/datasources/sap-system/system-selection/questions.d.ts

@@ -1,16 +1,15 @@
 import type { Destination } from '@sap-ux/btp-utils';
 import type { BackendSystem } from '@sap-ux/store';
 import type { Question } from 'inquirer';
-import { promptNames, type OdataServicePromptOptions } from '../../../../types';
+import { type OdataServicePromptOptions, promptNames } from '../../../../types';
 import { ConnectionValidator } from '../../../connectionValidator';
 import type { ServiceAnswer } from '../service-selection';
-export declare const newSystemChoiceValue = "!@\u00A3*&937newSystem*X~qy^";
-type NewSystemChoice = typeof newSystemChoiceValue;
+import { type CfAbapEnvServiceChoice, type NewSystemChoice } from './prompt-helpers';
 declare const usernamePromptName: "systemSelection:systemUsername";
 declare const passwordPromptName: "systemSelection:systemPassword";
 export type SystemSelectionAnswerType = {
-    type: 'destination' | 'backendSystem' | 'newSystemChoice' | 'cfAbapEnvService';
-    system: Destination | BackendSystem | NewSystemChoice | 'cfAbapEnvService';
+    type: 'destination' | 'backendSystem' | 'newSystemChoice' | CfAbapEnvServiceChoice;
+    system: Destination | BackendSystem | NewSystemChoice | CfAbapEnvServiceChoice;
 };
 interface SystemSelectionCredentialsAnswers {
     [usernamePromptName]?: string;

package/dist/prompts/datasources/sap-system/system-selection/questions.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newSystemChoiceValue = void 0;
 exports.getSystemSelectionQuestions = getSystemSelectionQuestions;
 exports.getSystemConnectionQuestions = getSystemConnectionQuestions;
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const btp_utils_1 = require("@sap-ux/btp-utils");
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const i18n_1 = require("../../../../i18n");
 const types_1 = require("../../../../types");
@@ -19,10 +19,6 @@ const questions_2 = require("../new-system/questions");
 const questions_3 = require("../service-selection/questions");
 const validators_1 = require("../validators");
 const prompt_helpers_1 = require("./prompt-helpers");
-const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
-// New system choice value is a hard to guess string to avoid conflicts with existing system names or user named systems
-// since it will be used as a new system value in the system selection prompt.
-exports.newSystemChoiceValue = '!@£*&937newSystem*X~qy^';
 const systemSelectionPromptNamespace = 'systemSelection';
 const usernamePromptName = `${systemSelectionPromptNamespace}:${questions_1.BasicCredentialsPromptNames.systemUsername}`;
 const passwordPromptName = `${systemSelectionPromptNamespace}:${questions_1.BasicCredentialsPromptNames.systemPassword}`;
@@ -91,13 +87,16 @@ async function getSystemConnectionQuestions(connectionValidator, promptOptions)
     const requiredOdataVersion = promptOptions?.serviceSelection?.requiredOdataVersion;
     const destinationFilters = promptOptions?.systemSelection?.destinationFilters;
     const systemChoices = await (0, prompt_helpers_1.createSystemChoices)(destinationFilters, promptOptions?.systemSelection?.includeCloudFoundryAbapEnvChoice);
+    const defaultChoiceIndex = (0, prompt_helpers_1.findDefaultSystemSelectionIndex)(systemChoices, promptOptions?.systemSelection?.defaultChoice);
     const questions = [
         {
             type: promptOptions?.systemSelection?.useAutoComplete ? 'autocomplete' : 'list',
             name: types_1.promptNames.systemSelection,
             message: (0, i18n_1.t)('prompts.systemSelection.message'),
+            hint: (0, i18n_1.t)('prompts.systemSelection.hint'),
             source: (prevAnswers, input) => (0, inquirer_common_1.searchChoices)(input, systemChoices),
             choices: systemChoices,
+            default: defaultChoiceIndex,
             validate: async (selectedSystem) => {
                 if (!selectedSystem) {
                     return false;

package/dist/translations/odata-service-inquirer.i18n.json

@@ -4,10 +4,10 @@
             "message": "Data source",
             "projectSpecificDestName": "Project Specific Destination",
             "businessHubName": "SAP Business Accelerator Hub",
-            "sapSystemName": "SAP System",
-            "odataServiceUrlName": "OData Service Url",
+            "sapSystemName": "System",
+            "odataServiceUrlName": "OData Service",
             "capProjectName": "Local CAP Project",
-            "metadataFileName": "Metadata File",
+            "metadataFileName": "Metadata Document",
             "noneName": "None",
             "projectSpecificDestChoiceText": "Connect to a $t(prompts.datasourceType.projectSpecificDestName)",
             "businessHubChoiceText": "Connect to $t(prompts.datasourceType.businessHubName)",
@@ -101,7 +101,8 @@
         },
         "systemSelection": {
             "newSystemChoiceLabel": "New system",
-            "message": "Select a system configuration",
+            "hint": "Select a system configuration",
+            "message": "System",
             "authenticationFailedUpdateCredentials": "Authentication failed. Please try updating the credentials."
         },
         "abapOnBTPType": {
@@ -131,7 +132,7 @@
             "authError": "The selected system is returning an authentication error. System name: {{systemName}}, error: {{- error}}"
         },
         "cannotReadCapServiceMetadata": "An error occurred reading CAP service metadata: {{serviceName}}. $t(texts.seeLogForDetails)",
-        "capModelAndServicesLoadError": "An error occurred loading the CAP model and services. {{- error}}",
+        "capModelAndServicesLoadError": "An error occurred loading the CAP model and services{{- error, addMsgWithColonFormatter}}",
         "capServiceUrlPathNotDefined": "An error occurred reading CAP service metadata: {{serviceName}}. CAP service property `urlPath` is not defined but is required.",
         "unknownError": "An error occurred{{- error, addMsgWithColonFormatter}}",
         "authenticationFailed": "Authentication incorrect. {{error}}",

package/dist/types.d.ts

@@ -231,6 +231,13 @@ export type SystemSelectionPromptOptions = {
      * Note that there is no implementation for this option in this module and handling of the prompt optin and subsequent prompting must be implemented by the consumer.
      */
     includeCloudFoundryAbapEnvChoice?: boolean;
+    /**
+     * Provide a default choice for the system selection prompt, this is used to pre-select a system based on the system name.
+     * Set as string literal types `NewSystemChoice` or `CfAbapEnvServiceChoice` to specify the default choice to create a new system connection config in VSCode
+     * or to select the Cloud Foundry Abap environments service discovery choice in BAS respectively.
+     *
+     */
+    defaultChoice?: string;
 };
 export type MetadataPromptOptions = {
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/odata-service-inquirer",
   "description": "Prompts module that can prompt users for inputs required for odata service writing",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,11 +27,11 @@
     "inquirer-autocomplete-prompt": "2.0.1",
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.17.4",
-    "@sap-ux/btp-utils": "0.17.0",
     "@sap-ux/fiori-generator-shared": "0.7.10",
+    "@sap-ux/btp-utils": "0.17.0",
     "@sap-ux/guided-answers-helper": "0.1.0",
+    "@sap-ux/inquirer-common": "0.5.4",
     "@sap-ux/telemetry": "0.5.44",
-    "@sap-ux/inquirer-common": "0.5.3",
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-access": "1.28.7",
     "@sap-ux/project-input-validator": "0.3.3",