@sap-ux/odata-service-inquirer 2.8.12 → 2.9.0

package/dist/prompts/connectionValidator.d.ts

@@ -206,7 +206,6 @@ export declare class ConnectionValidator {
      * @param connectConfig.serviceInfo the service info
      * @param connectConfig.odataVersion the odata version to restrict the catalog requests if only a specific version is required
      * @param connectConfig.destination the destination to connect with
-     * @param connectConfig.refreshToken
      * @throws an error if the connection attempt fails, callers should handle the error
      */
     private createSystemConnection;
@@ -229,7 +228,7 @@ export declare class ConnectionValidator {
      */
     private refreshTokenChangedCb;
     /**
-     * Get the service provider for the Abap on Cloud environment.
+     * Get the service provider for the Abap Cloud environment.
      *
      * @param url the system url
      * @param serviceInfo the service info
@@ -244,10 +243,9 @@ export declare class ConnectionValidator {
      *
      * @param serviceInfo the service info containing the UAA details
      * @param odataVersion the odata version to restrict the catalog requests if only a specific version is required
-     * @param refreshToken the refresh token for the Abap on Cloud environment, will be used to avoid re-authentication while the token is valid
      * @returns true if the system is reachable and authenticated, if required, false if not, or an error message string
      */
-    validateServiceInfo(serviceInfo: ServiceInfo, odataVersion?: ODataVersion, refreshToken?: string): Promise<ValidationResult>;
+    validateServiceInfo(serviceInfo: ServiceInfo, odataVersion?: ODataVersion): Promise<ValidationResult>;
     /**
      * Validate the specified destination connectivity, determining if authentication is required or if the destination is misconfigured.
      *

package/dist/prompts/connectionValidator.js

@@ -261,6 +261,9 @@ class ConnectionValidator {
             const axiosConfig = this.createAxiosConfig(url, ignoreCertError, username, password);
             if (isSystem) {
                 await this.createSystemConnection({ axiosConfig, url, odataVersion });
+                const systemInfo = await this.serviceProvider.getSystemInfo();
+                this._connectedUserName = systemInfo?.userName;
+                this._connectedSystemName = systemInfo?.systemID;
             }
             else {
                 // Full service URL
@@ -298,7 +301,8 @@ class ConnectionValidator {
             ignoreCertErrors: ignoreCertError,
             cookies: '',
             baseURL: url.origin,
-            url: url.pathname
+            url: url.pathname,
+            logger: logger_helper_1.default.logger
         };
         if (username && password) {
             axiosConfig = Object.assign(axiosConfig, {
@@ -386,14 +390,13 @@ class ConnectionValidator {
      * @param connectConfig.serviceInfo the service info
      * @param connectConfig.odataVersion the odata version to restrict the catalog requests if only a specific version is required
      * @param connectConfig.destination the destination to connect with
-     * @param connectConfig.refreshToken
      * @throws an error if the connection attempt fails, callers should handle the error
      */
-    async createSystemConnection({ axiosConfig, url, serviceInfo, destination, odataVersion, refreshToken }) {
+    async createSystemConnection({ axiosConfig, url, serviceInfo, destination, odataVersion }) {
         this.resetConnectionState();
         this.resetValidity();
         if (this.systemAuthType === 'reentranceTicket' || this.systemAuthType === 'serviceKey') {
-            this._serviceProvider = this.getAbapOnCloudServiceProvider(url, serviceInfo, refreshToken);
+            this._serviceProvider = this.getAbapOnCloudServiceProvider(url, serviceInfo);
         }
         else if (destination) {
             // Assumption: the destination configured URL is a valid URL, will be needed later for basic auth error handling
@@ -493,7 +496,7 @@ class ConnectionValidator {
         this._refreshToken = refreshToken;
     }
     /**
-     * Get the service provider for the Abap on Cloud environment.
+     * Get the service provider for the Abap Cloud environment.
      *
      * @param url the system url
      * @param serviceInfo the service info
@@ -504,7 +507,8 @@ class ConnectionValidator {
         if (this.systemAuthType === 'reentranceTicket' && url) {
             return (0, axios_extension_1.createForAbapOnCloud)({
                 environment: axios_extension_1.AbapCloudEnvironment.EmbeddedSteampunk,
-                url: new URL(url.pathname, url.origin).toString()
+                url: new URL(url.pathname, url.origin).toString(),
+                logger: logger_helper_1.default.logger
             });
         }
         if (this.systemAuthType === 'serviceKey' && serviceInfo) {
@@ -512,7 +516,8 @@ class ConnectionValidator {
                 environment: axios_extension_1.AbapCloudEnvironment.Standalone,
                 service: serviceInfo,
                 refreshToken,
-                refreshTokenChangedCb: this.refreshTokenChangedCb.bind(this)
+                refreshTokenChangedCb: this.refreshTokenChangedCb.bind(this),
+                logger: logger_helper_1.default.logger
             });
         }
         throw new Error('Invalid system auth type');
@@ -524,10 +529,9 @@ class ConnectionValidator {
      *
      * @param serviceInfo the service info containing the UAA details
      * @param odataVersion the odata version to restrict the catalog requests if only a specific version is required
-     * @param refreshToken the refresh token for the Abap on Cloud environment, will be used to avoid re-authentication while the token is valid
      * @returns true if the system is reachable and authenticated, if required, false if not, or an error message string
      */
-    async validateServiceInfo(serviceInfo, odataVersion, refreshToken) {
+    async validateServiceInfo(serviceInfo, odataVersion) {
         if (!serviceInfo) {
             return false;
         }
@@ -538,7 +542,7 @@ class ConnectionValidator {
         }
         try {
             this.systemAuthType = 'serviceKey';
-            await this.createSystemConnection({ serviceInfo, odataVersion, refreshToken });
+            await this.createSystemConnection({ serviceInfo, odataVersion });
             // Cache the user info
             this._connectedUserName = await this.serviceProvider.user();
             this._serviceInfo = serviceInfo;
@@ -657,6 +661,9 @@ class ConnectionValidator {
             this.validity.urlFormat = false;
             return false;
         }
+        if (systemAuthType) {
+            this.systemAuthType = systemAuthType;
+        }
         let url;
         try {
             // Check if the url is valid
@@ -664,13 +671,16 @@ class ConnectionValidator {
             if (url.origin === 'null') {
                 return (0, i18n_1.t)('errors.invalidUrl', { input: serviceUrl });
             }
+            // Dont allow non origin URLs in for re-entrance tickets as the error handling would become complex to analyize.
+            // The connection may succeed but later we will get auth errors since axios-extension does not validate this.
+            // The new system name would also include the additional paths which would not make sense either.
+            if (this.systemAuthType === 'reentranceTicket' && !(url.pathname.length === 0 || url.pathname === '/')) {
+                return (0, i18n_1.t)('prompts.validationMessages.reentranceTicketSystemHostOnly');
+            }
         }
         catch (error) {
             return (0, i18n_1.t)('errors.invalidUrl', { input: serviceUrl });
         }
-        if (systemAuthType) {
-            this.systemAuthType = systemAuthType;
-        }
         try {
             if (!forceReValidation && this.isUrlValidated(serviceUrl)) {
                 return this.validity.reachable ?? false;

package/dist/prompts/datasources/sap-system/abap-on-btp/questions.d.ts

@@ -7,14 +7,12 @@ import { type ServiceAnswer } from '../service-selection';
 declare const systemUrlPromptName: "abapOnBtp:newSystemUrl";
 declare const abapOnBtpPromptNames: {
     readonly abapOnBtpAuthType: "abapOnBtpAuthType";
-    readonly serviceKey: "serviceKey";
     readonly cloudFoundryAbapSystem: "cloudFoundryAbapSystem";
 };
-export type AbapOnBTPType = 'cloudFoundry' | 'serviceKey' | 'reentranceTicket';
+export type AbapOnBTPType = 'cloudFoundry' | 'reentranceTicket';
 interface AbapOnBtpAnswers extends Partial<OdataServiceAnswers> {
     [abapOnBtpPromptNames.abapOnBtpAuthType]?: AbapOnBTPType;
     [systemUrlPromptName]?: string;
-    [abapOnBtpPromptNames.serviceKey]?: string;
     [abapOnBtpPromptNames.cloudFoundryAbapSystem]?: ServiceInstanceInfo;
 }
 /**
@@ -22,10 +20,9 @@ interface AbapOnBtpAnswers extends Partial<OdataServiceAnswers> {
  *
  * @param promptOptions The prompt options which control the service selection and system name]
  * @param cachedConnectedSystem if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
- * @param serviceKeyToggle Feature toggle to enable/disable the BTP service key option - enabled by default
  * @returns The list of questions for the ABAP on BTP system
  */
-export declare function getAbapOnBTPSystemQuestions(promptOptions?: OdataServicePromptOptions, cachedConnectedSystem?: ConnectedSystem, serviceKeyToggle?: boolean): Question<AbapOnBtpAnswers & ServiceAnswer>[];
+export declare function getAbapOnBTPSystemQuestions(promptOptions?: OdataServicePromptOptions, cachedConnectedSystem?: ConnectedSystem): Question<AbapOnBtpAnswers & ServiceAnswer>[];
 /**
  * Get the Cloud Foundry Abap system discovery prompt. This prompt will list all available ABAP environments in the connected Cloud Foundry space.
  * If the Cloud Foundry connection fails, a warning message will be displayed.

package/dist/prompts/datasources/sap-system/abap-on-btp/questions.js

@@ -18,26 +18,21 @@ const types_1 = require("../new-system/types");
 const service_selection_1 = require("../service-selection");
 const shared_prompts_1 = require("../shared-prompts/shared-prompts");
 const prompt_helpers_2 = require("../system-selection/prompt-helpers");
-const validators_1 = require("../validators");
-const feature_toggle_1 = require("@sap-ux/feature-toggle");
 const abapOnBtpPromptNamespace = 'abapOnBtp';
 const systemUrlPromptName = `${abapOnBtpPromptNamespace}:${types_1.newSystemPromptNames.newSystemUrl}`;
 const cliCfAbapServicePromptName = 'cliCfAbapService';
 const abapOnBtpPromptNames = {
     'abapOnBtpAuthType': 'abapOnBtpAuthType',
-    'serviceKey': 'serviceKey',
     'cloudFoundryAbapSystem': 'cloudFoundryAbapSystem'
 };
-const SERVICE_KEY_FEATURE_TOGGLE = 'sap.ux.appGenerator.testBetaFeatures.disableBtpServiceKeyAuth';
 /**
  * Get the questions for the ABAP on BTP system within the VSCode platform. The questions will prompt the user for the system type (Cloud Foundry, Service Key, Re-entrance Ticket).
  *
  * @param promptOptions The prompt options which control the service selection and system name]
  * @param cachedConnectedSystem if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
- * @param serviceKeyToggle Feature toggle to enable/disable the BTP service key option - enabled by default
  * @returns The list of questions for the ABAP on BTP system
  */
-function getAbapOnBTPSystemQuestions(promptOptions, cachedConnectedSystem, serviceKeyToggle = (0, feature_toggle_1.isFeatureEnabled)(SERVICE_KEY_FEATURE_TOGGLE)) {
+function getAbapOnBTPSystemQuestions(promptOptions, cachedConnectedSystem) {
     utils_1.PromptState.reset();
     const connectValidator = new connectionValidator_1.ConnectionValidator();
     const questions = [];
@@ -46,15 +41,6 @@ function getAbapOnBTPSystemQuestions(promptOptions, cachedConnectedSystem, servi
         name: abapOnBtpPromptNames.abapOnBtpAuthType,
         choices: [
             { name: (0, i18n_1.t)('prompts.abapOnBTPType.choiceCloudFoundry'), value: 'cloudFoundry' },
-            // Feature toggle the service key option - enabled by default, can be disabled via VS Code settings or ENV
-            ...(!serviceKeyToggle
-                ? [
-                    {
-                        name: (0, i18n_1.t)('prompts.abapOnBTPType.choiceServiceKey'),
-                        value: 'serviceKey'
-                    }
-                ]
-                : []),
             { name: (0, i18n_1.t)('prompts.abapOnBTPType.choiceReentranceTicket'), value: 'reentranceTicket' }
         ],
         message: (0, i18n_1.t)('prompts.abapOnBTPType.message'),
@@ -73,12 +59,7 @@ function getAbapOnBTPSystemQuestions(promptOptions, cachedConnectedSystem, servi
             return true;
         }
         return false;
-    })[0]);
-    // Service Key file prompt - enabled by default
-    if (!serviceKeyToggle) {
-        questions.push((0, inquirer_common_1.withCondition)([getServiceKeyPrompt(connectValidator, cachedConnectedSystem)], (answers) => answers?.abapOnBtpAuthType === 'serviceKey')[0]);
-    }
-    questions.push(...(0, inquirer_common_1.withCondition)([...getCFDiscoverPrompts(connectValidator, undefined, undefined, cachedConnectedSystem)], (answers) => answers?.abapOnBtpAuthType === 'cloudFoundry'));
+    })[0], ...(0, inquirer_common_1.withCondition)([...getCFDiscoverPrompts(connectValidator, undefined, undefined, cachedConnectedSystem)], (answers) => answers?.abapOnBtpAuthType === 'cloudFoundry'));
     // New system store name propmt
     if (promptOptions?.userSystemName?.hide !== true) {
         // New system question will allow user to give the system a user friendly name
@@ -128,7 +109,7 @@ async function validateCFServiceInfo(abapService, connectionValidator, requiredO
         // In case the user has changed the URL, do not use the cached connection.
         if (cachedConnectedSystem &&
             cachedConnectedSystem.backendSystem?.url === uaaCreds.credentials.url &&
-            JSON.stringify(cachedConnectedSystem.backendSystem.serviceKeys.uaa) ===
+            JSON.stringify(cachedConnectedSystem.backendSystem.serviceKeys?.uaa) ===
                 JSON.stringify(uaaCreds.credentials.uaa)) {
             connectionValidator.setConnectedSystem(cachedConnectedSystem);
         }
@@ -220,46 +201,4 @@ function getCFDiscoverPrompts(connectionValidator, promptNamespace, requiredOdat
     }
     return questions;
 }
-/**
- * Get the service key prompt for the ABAP on BTP system. This prompt will allow the user to select a service key file from the file system.
- *
- * @param connectionValidator a connection validator instance
- * @param cachedConnectedSystem if available passing an already connected system connection will prevent re-authentication for re-entrance ticket and service keys connection types
- * @returns The service key prompt
- */
-function getServiceKeyPrompt(connectionValidator, cachedConnectedSystem) {
-    const question = {
-        type: 'input',
-        name: abapOnBtpPromptNames.serviceKey,
-        message: (0, i18n_1.t)('prompts.serviceKey.message'),
-        guiType: 'file-browser',
-        guiOptions: {
-            hint: (0, i18n_1.t)('prompts.serviceKey.hint'),
-            mandatory: true
-        },
-        validate: async (keyPath) => {
-            utils_1.PromptState.resetConnectedSystem();
-            const serviceKeyValResult = (0, validators_1.validateServiceKey)(keyPath);
-            if (typeof serviceKeyValResult === 'string' || typeof serviceKeyValResult === 'boolean') {
-                return serviceKeyValResult;
-            }
-            // Backend systems validation supports using a cached connections from a previous step execution to prevent re-authentication (e.g. re-opening a browser window)
-            // In case the user has changed the URL, do not use the cached connection.
-            if (cachedConnectedSystem &&
-                cachedConnectedSystem.backendSystem?.url === serviceKeyValResult.url &&
-                JSON.stringify(cachedConnectedSystem.backendSystem.serviceKeys.uaa) ===
-                    JSON.stringify(serviceKeyValResult.uaa)) {
-                connectionValidator.setConnectedSystem(cachedConnectedSystem);
-            }
-            const connectValResult = await connectionValidator.validateServiceInfo(serviceKeyValResult);
-            if (connectValResult === true && connectionValidator.serviceProvider) {
-                utils_1.PromptState.odataService.connectedSystem = {
-                    serviceProvider: (0, utils_1.removeCircularFromServiceProvider)(connectionValidator.serviceProvider)
-                };
-            }
-            return connectValResult;
-        }
-    };
-    return question;
-}
 //# sourceMappingURL=questions.js.map

package/dist/prompts/datasources/sap-system/shared-prompts/shared-prompts.d.ts

@@ -13,7 +13,7 @@ import { type NewSystemAnswers } from '../new-system/types';
  * @param connectValidator a connection validator instance used to validate the system url
  * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
  * @param requiredOdataVersion The required OData version for the system connection, only catalogs supporting the specifc odata version will be used.
- * @param cachedConnectedSystem
+ * @param cachedConnectedSystem An existing connection may be passed which will prevent reauthentication
  * @returns the system url prompt
  */
 export declare function getSystemUrlQuestion<T extends Answers>(connectValidator: ConnectionValidator, promptNamespace?: string, requiredOdataVersion?: OdataVersion, cachedConnectedSystem?: ConnectedSystem): InputQuestion<T>;

package/dist/prompts/datasources/sap-system/shared-prompts/shared-prompts.js

@@ -19,8 +19,8 @@ const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
  */
 function systemAuthTypeToAuthenticationType(systemAuthType) {
     switch (systemAuthType) {
-        case 'serviceKey':
-            return store_1.AuthenticationType.OAuth2RefreshToken;
+        case 'serviceKey' /** @deprecated All cloud auth is reentrance ticket based, legacy stored entries are still supported */:
+            return store_1.AuthenticationType.ReentranceTicket;
         case 'reentranceTicket':
             return store_1.AuthenticationType.ReentranceTicket;
         case 'basic':
@@ -35,7 +35,7 @@ function systemAuthTypeToAuthenticationType(systemAuthType) {
  * @param connectValidator a connection validator instance used to validate the system url
  * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
  * @param requiredOdataVersion The required OData version for the system connection, only catalogs supporting the specifc odata version will be used.
- * @param cachedConnectedSystem
+ * @param cachedConnectedSystem An existing connection may be passed which will prevent reauthentication
  * @returns the system url prompt
  */
 function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVersion, cachedConnectedSystem) {
@@ -52,12 +52,21 @@ function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVe
         validate: async (url) => {
             utils_1.PromptState.resetConnectedSystem();
             // Backend systems validation supports using a cached connections from a previous step execution to prevent re-authentication (e.g. re-opening a browser window)
-            // Only in the case or re-entrance tickets will we reuse an existing connection.
+            // Only in the case of re-entrance tickets will we reuse an existing connection.
             if (cachedConnectedSystem &&
                 cachedConnectedSystem.backendSystem?.url === url &&
                 cachedConnectedSystem.backendSystem?.authenticationType === 'reentranceTicket') {
                 connectValidator.setConnectedSystem(cachedConnectedSystem);
             }
+            else {
+                const existingBackend = (0, utils_1.isBackendSystemKeyExisting)(utils_1.PromptState.backendSystemsCache, url);
+                if (existingBackend) {
+                    // Not a cached connection so re-validate as new backend system entry
+                    return (0, i18n_1.t)('prompts.validationMessages.backendSystemExistsWarning', {
+                        backendName: existingBackend.name
+                    });
+                }
+            }
             const valResult = await connectValidator.validateUrl(url, {
                 isSystem: true,
                 odataVersion: (0, utils_1.convertODataVersionType)(requiredOdataVersion)
@@ -143,13 +152,12 @@ function getUserSystemNameQuestion(connectValidator, promptNamespace) {
                         client: connectValidator.validatedClient,
                         username: connectValidator.axiosConfig?.auth?.username,
                         password: connectValidator.axiosConfig?.auth?.password,
-                        serviceKeys: connectValidator.serviceInfo,
+                        serviceKeys: connectValidator.serviceInfo, // This will not be persisted and is only used to determine cached connection equality for CF provided uaa keys
                         userDisplayName: connectValidator.connectedUserName,
                         systemType: (0, store_1.getBackendSystemType)({
                             serviceKeys: connectValidator.serviceInfo,
                             authenticationType: connectValidator.systemAuthType
-                        }),
-                        refreshToken: connectValidator.refreshToken
+                        })
                     });
                     utils_1.PromptState.odataService.connectedSystem.backendSystem = backendSystem;
                     utils_1.PromptState.odataService.connectedSystem.backendSystem.newOrUpdated = true;

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

@@ -35,13 +35,6 @@ export declare function connectWithBackendSystem(backendKey: BackendSystemKey, c
  * @returns the validation result of the destination connection attempt
  */
 export declare function connectWithDestination(destination: Destination, connectionValidator: ConnectionValidator, requiredOdataVersion?: OdataVersion, addServicePath?: string): Promise<ValidationResult>;
-/**
- * Creates and returns a display name for the system, appending the system type and user display name if available.
- *
- * @param system the backend system to create a display name for
- * @returns the display name for the system
- */
-export declare function getBackendSystemDisplayName(system: BackendSystem): string;
 /**
  * Creates a list of choices for the system selection prompt using destinations or stored backend systems, depending on the environment.
  *

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

@@ -6,7 +6,6 @@ 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");
@@ -15,6 +14,7 @@ const store_1 = require("@sap-ux/store");
 const i18n_1 = require("../../../../i18n");
 const utils_1 = require("../../../../utils");
 const logger_helper_1 = __importDefault(require("../../../logger-helper"));
+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.NewSystemChoice = '!@£*&937newSystem*X~qy^';
@@ -49,7 +49,7 @@ async function connectWithBackendSystem(backendKey, connectionValidator, require
             });
         }
         else if (backendSystem.serviceKeys) {
-            connectValResult = await connectionValidator.validateServiceInfo(backendSystem.serviceKeys, (0, utils_1.convertODataVersionType)(requiredOdataVersion), backendSystem.refreshToken);
+            connectValResult = await connectionValidator.validateServiceInfo(backendSystem.serviceKeys, (0, utils_1.convertODataVersionType)(requiredOdataVersion));
         }
         else if (backendSystem.authenticationType === 'basic' || !backendSystem.authenticationType) {
             let errorType;
@@ -108,33 +108,6 @@ async function connectWithDestination(destination, connectionValidator, required
     // Deal with all destination errors here
     return connectValResult;
 }
-/**
- * Creates and returns a display name for the system, appending the system type and user display name if available.
- *
- * @param system the backend system to create a display name for
- * @returns the display name for the system
- */
-function getBackendSystemDisplayName(system) {
-    const userDisplayName = system.userDisplayName ? ` [${system.userDisplayName}]` : '';
-    const systemTypeName = getBackendSystemTypeName(system.systemType);
-    return `${system.name}${systemTypeName}${userDisplayName}`;
-}
-/**
- * Returns the formatted system type name for the given backend system.
- *
- * @param systemType the system type to get the name for
- * @returns system type name formatted as a string, e.g. " (BTP)" or " (S4HC)".
- */
-function getBackendSystemTypeName(systemType) {
-    let systemTypeName = ''; // for on prem we do not show the system type
-    if (systemType === 'S4HC') {
-        systemTypeName = ` (${(0, i18n_1.t)('texts.systemTypeS4HC')})`;
-    }
-    else if (systemType === 'BTP') {
-        systemTypeName = ` (${(0, i18n_1.t)('texts.systemTypeBTP')})`;
-    }
-    return systemTypeName;
-}
 /**
  * Matches the destination against the provided filters. Returns true if the destination matches any filters, false otherwise.
  *
@@ -207,9 +180,11 @@ async function createSystemChoices(destinationFilters, includeCloudFoundryAbapEn
     }
     else {
         const backendSystems = await new store_1.SystemService(logger_helper_1.default.logger).getAll({ includeSensitiveData: false });
+        // Cache the backend systems
+        utils_1.PromptState.backendSystemsCache = backendSystems;
         systemChoices = backendSystems.map((system) => {
             return {
-                name: getBackendSystemDisplayName(system),
+                name: (0, fiori_generator_shared_1.getBackendSystemDisplayName)(system),
                 value: {
                     system,
                     type: 'backendSystem'

package/dist/prompts/edmx/entity-helper.d.ts

@@ -29,7 +29,7 @@ export type EntitySetFilter = 'filterDraftEnabled' | 'filterAggregateTransformat
  * Returns the entity choice options for use in a list inquirer prompt.
  *
  * @param edmx metadata string
- * @param options
+ * @param options Configuration options for entity filtering and selection
  * @param options.entitySetFilter
  *     `filterDraftEnabled` : Only draft enabled entities wil be returned when true, useful for Form Object Page app generation.
  *     `filterAggregateTransformationsOnly` : Only return entity choices that have an aggregate annotation (Aggregation.ApplySupported) with the `Transformations` property set,
@@ -63,11 +63,12 @@ export declare function filterDraftEnabledEntities(entitySets: EntitySet[]): Ent
  * @param templateType the template type of the application to be generated from the prompt answers
  * @param metadata the metadata (edmx) string of the service
  * @param odataVersion the OData version of the service
+ * @param isCapService whether the service is a CAP service or not
  * @param mainEntitySetName the name of the main entity set
  * @param currentTableType the current table type selected by the user
  * @returns the default table type and a boolean indicating if AnalyticalTable should be set as default
  */
-export declare function getDefaultTableType(templateType: TemplateType, metadata: ConvertedMetadata, odataVersion: OdataVersion, mainEntitySetName?: string, currentTableType?: TableType): {
+export declare function getDefaultTableType(templateType: TemplateType, metadata: ConvertedMetadata, odataVersion: OdataVersion, isCapService: boolean, mainEntitySetName?: string, currentTableType?: TableType): {
     tableType: TableType;
     setAnalyticalTableDefault: boolean;
 };

package/dist/prompts/edmx/entity-helper.js

@@ -57,7 +57,7 @@ function getNavigationPropertyForParameterisedEntity(entitySet, entityTypes) {
  * Returns the entity choice options for use in a list inquirer prompt.
  *
  * @param edmx metadata string
- * @param options
+ * @param options Configuration options for entity filtering and selection
  * @param options.entitySetFilter
  *     `filterDraftEnabled` : Only draft enabled entities wil be returned when true, useful for Form Object Page app generation.
  *     `filterAggregateTransformationsOnly` : Only return entity choices that have an aggregate annotation (Aggregation.ApplySupported) with the `Transformations` property set,
@@ -147,7 +147,7 @@ function findEntitySetName(entitySets, entityType) {
  */
 function getNavigationEntityChoices(metadata, odataVersion, mainEntityName) {
     const choices = [];
-    const mainEntitySet = metadata.entitySets.find((entitySet) => entitySet.name === mainEntityName);
+    const mainEntitySet = (0, inquirer_common_1.findEntitySetByName)(metadata, mainEntityName);
     let navProps = [];
     if (odataVersion === odata_service_writer_1.OdataVersion.v4) {
         navProps = mainEntitySet?.entityType.navigationProperties.filter((navProp) => navProp.isCollection) ?? [];
@@ -181,28 +181,80 @@ function filterDraftEnabledEntities(entitySets) {
         return !!entitySetTypeProperties.find((property) => property.name === 'HasDraftEntity');
     });
 }
+/**
+ * Determines if AnalyticalTable should be used based on entity annotations and service type.
+ *
+ * AnalyticalTable is used when entity has hierarchical and analytical data together, for CAP services with analytical data,
+ * or for non-CAP services with complete analytical transformations.
+ *
+ * @param entitySet The entity set to check for annotations.
+ * @param isCapService Whether the service is a CAP service (affects analytical requirements).
+ * @returns True if AnalyticalTable should be used, false otherwise.
+ */
+function shouldUseAnalyticalTable(entitySet, isCapService) {
+    // Evaluate annotations once to avoid multiple iterations
+    const hasAnalytical = (0, inquirer_common_1.hasAggregateTransformations)(entitySet);
+    const hasHierarchy = (0, inquirer_common_1.hasRecursiveHierarchyForEntitySet)(entitySet);
+    // No analytical data means no need for AnalyticalTable
+    if (!hasAnalytical) {
+        return false;
+    }
+    // If entity has both analytical and hierarchical data, always use AnalyticalTable
+    if (hasHierarchy) {
+        return true;
+    }
+    // For CAP services, analytical annotations are sufficient
+    if (isCapService) {
+        return true;
+    }
+    // For non-CAP services, require complete analytical transformations
+    return (0, inquirer_common_1.hasAggregateTransformationsForEntitySet)(entitySet, inquirer_common_1.transformationsRequiredForAnalyticalTable);
+}
 /**
  * Get the default table type based on the template type and previous answers.
  *
  * @param templateType the template type of the application to be generated from the prompt answers
  * @param metadata the metadata (edmx) string of the service
  * @param odataVersion the OData version of the service
+ * @param isCapService whether the service is a CAP service or not
  * @param mainEntitySetName the name of the main entity set
  * @param currentTableType the current table type selected by the user
  * @returns the default table type and a boolean indicating if AnalyticalTable should be set as default
  */
-function getDefaultTableType(templateType, metadata, odataVersion, mainEntitySetName, currentTableType) {
+function getDefaultTableType(templateType, metadata, odataVersion, isCapService, mainEntitySetName, currentTableType) {
     let tableType;
     let setAnalyticalTableDefault = false;
-    if ((templateType === 'lrop' || templateType === 'worklist') &&
-        odataVersion === odata_service_writer_1.OdataVersion.v4 &&
-        (0, inquirer_common_1.hasAggregateTransformationsForEntity)(metadata, mainEntitySetName)) {
-        // For V4, if the selected entity has aggregate transformations, use AnalyticalTable as default
-        tableType = 'AnalyticalTable';
-        setAnalyticalTableDefault = true;
+    // Find the entity set once for all annotation checks
+    const entitySet = mainEntitySetName ? (0, inquirer_common_1.findEntitySetByName)(metadata, mainEntitySetName) : undefined;
+    if (entitySet) {
+        if ((templateType === 'lrop' || templateType === 'worklist') &&
+            odataVersion === odata_service_writer_1.OdataVersion.v4 &&
+            shouldUseAnalyticalTable(entitySet, isCapService)) {
+            // Use AnalyticalTable for entities with analytical data based on optimized annotation evaluation
+            tableType = 'AnalyticalTable';
+            setAnalyticalTableDefault = true;
+        }
+        else if ((templateType === 'lrop' || templateType === 'worklist') &&
+            odataVersion === odata_service_writer_1.OdataVersion.v4 &&
+            (0, inquirer_common_1.hasRecursiveHierarchyForEntitySet)(entitySet)) {
+            // If the main entity type is annotated with Hierarchy.RecursiveHierarchy, use TreeTable as default
+            tableType = 'TreeTable';
+        }
+        else if (templateType === 'alp') {
+            // For ALP, use AnalyticalTable as default
+            tableType = 'AnalyticalTable';
+        }
+        else if (currentTableType) {
+            // If the user has already selected a table type use it
+            tableType = currentTableType;
+        }
+        else {
+            // Default to ResponsiveTable for other cases
+            tableType = 'ResponsiveTable';
+        }
     }
     else if (templateType === 'alp') {
-        // For ALP, use AnalyticalTable as default
+        // For ALP, use AnalyticalTable as default even if entity set is not found
         tableType = 'AnalyticalTable';
     }
     else if (currentTableType) {

package/dist/prompts/edmx/questions.js

@@ -213,7 +213,7 @@ function getTableLayoutQuestions(templateType, odataVersion, isCapService, metad
             },
             choices: tableTypeChoices,
             default: (prevAnswers) => {
-                const tableTypeDefault = (0, entity_helper_1.getDefaultTableType)(templateType, metadata, odataVersion, prevAnswers?.mainEntity?.entitySetName, prevAnswers?.tableType);
+                const tableTypeDefault = (0, entity_helper_1.getDefaultTableType)(templateType, metadata, odataVersion, isCapService, prevAnswers?.mainEntity?.entitySetName, prevAnswers?.tableType);
                 setAnalyticalTableDefault = tableTypeDefault.setAnalyticalTableDefault;
                 return tableTypeDefault.tableType;
             },
@@ -236,7 +236,14 @@ function getTableLayoutQuestions(templateType, odataVersion, isCapService, metad
                 breadcrumb: true,
                 mandatory: true
             },
-            default: '',
+            default: (prevAnswers) => {
+                // Auto-populate qualifier from RecursiveHierarchy annotation if available
+                if (prevAnswers?.mainEntity?.entitySetName) {
+                    const entitySet = (0, inquirer_common_1.findEntitySetByName)(metadata, prevAnswers.mainEntity.entitySetName);
+                    return entitySet ? (0, inquirer_common_1.getRecursiveHierarchyQualifierForEntitySet)(entitySet) : '';
+                }
+                return '';
+            },
             validate: (input) => {
                 if (!input) {
                     return (0, i18n_1.t)('prompts.hierarchyQualifier.qualifierRequiredForV4Warning');

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

@@ -58,7 +58,9 @@
             "metadataFilePathNotValid": "The metadata file does not exist or is not accessible. Please specify a valid file path.",
             "capProjectNotFound": "The folder you have selected does not contain a valid CAP project. Please check and try again.",
             "warningCertificateValidationDisabled": "Certificate validation has been disabled by the user.",
-            "annotationsNotFound": "Annotations not found for the specified service."
+            "annotationsNotFound": "Annotations not found for the specified service.",
+            "backendSystemExistsWarning": "A saved system connection entry: \"{{- backendName}}\" already exists with the same URL and client. Please reuse the existing entry or remove it, using the systems panel, before adding a new connection.",
+            "reentranceTicketSystemHostOnly": "ABAP cloud system urls must only contain the hostname, for example, 'https://123.abc.com'"
         },
         "warnings": {
             "nonUIServiceTypeWarningMessage": "Services of service type: {{serviceType}} or without a service type are not intended to be used for generating SAP Fiori UI applications.",
@@ -252,8 +254,6 @@
         "suggestedSystemNameClient": ", client {{client}}",
         "seeLogForDetails": "For more information, view the logs.",
         "forUserName": "(for user [{{username}}])",
-        "systemTypeBTP": "BTP",
-        "systemTypeS4HC": "S4HC",
         "httpStatus": "HTTP Status {{httpStatus}}",
         "checkDestinationAuthConfig": "Please check the SAP BTP destination authentication configuration.",
         "choiceNameNone": "None"

package/dist/types.d.ts

@@ -172,7 +172,7 @@ export interface EntitySelectionAnswers {
  * Answers related to the Page Building Block prompt.
  */
 export interface PageBuildingBlockAnswers {
-    /** Indicates if the user wants to add a Page Building Block */
+    /** Indicates if a Page Building Block should be addedn*/
     [EntityPromptNames.addPageBuildingBlock]?: boolean;
     /** The title for the Page Building Block, required if addPageBuildingBlock is true */
     [EntityPromptNames.pageBuildingBlockTitle]?: string;

package/dist/utils/index.d.ts

@@ -5,6 +5,7 @@ import { OdataVersion } from '@sap-ux/odata-service-writer';
 import type { ListChoiceOptions } from 'inquirer';
 import { PromptState } from './prompt-state';
 import type { ConvertedMetadata } from '@sap-ux/vocabularies-types';
+import type { BackendSystem } from '@sap-ux/store';
 /**
  * Determine if the current prompting environment is cli or a hosted extension (app studio or vscode).
  *
@@ -63,5 +64,14 @@ export declare function getDefaultChoiceIndex(list: ListChoiceOptions[]): number
  * @returns the service provider with the circular dependencies removed
  */
 export declare function removeCircularFromServiceProvider(serviceProvider: ServiceProvider): ServiceProvider;
+/**
+ * Checks if the specified backend systems contain a match for the specified url and client.
+ *
+ * @param backendSystems backend systems to search for a matching key
+ * @param url the url component of the backend system key
+ * @param client the client component of of the backend system key
+ * @returns the backend system if found or undefined
+ */
+export declare function isBackendSystemKeyExisting(backendSystems: BackendSystem[], url: string, client?: string): BackendSystem | undefined;
 export { PromptState };
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.js

@@ -11,6 +11,7 @@ exports.originToRelative = originToRelative;
 exports.convertODataVersionType = convertODataVersionType;
 exports.getDefaultChoiceIndex = getDefaultChoiceIndex;
 exports.removeCircularFromServiceProvider = removeCircularFromServiceProvider;
+exports.isBackendSystemKeyExisting = isBackendSystemKeyExisting;
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
@@ -23,6 +24,7 @@ Object.defineProperty(exports, "PromptState", { enumerable: true, get: function
 const annotation_converter_1 = require("@sap-ux/annotation-converter");
 const edmx_parser_1 = require("@sap-ux/edmx-parser");
 const circular_reference_remover_1 = require("circular-reference-remover");
+const store_1 = require("@sap-ux/store");
 /**
  * Determine if the current prompting environment is cli or a hosted extension (app studio or vscode).
  *
@@ -146,4 +148,16 @@ function removeCircularFromServiceProvider(serviceProvider) {
     }
     return serviceProvider;
 }
+/**
+ * Checks if the specified backend systems contain a match for the specified url and client.
+ *
+ * @param backendSystems backend systems to search for a matching key
+ * @param url the url component of the backend system key
+ * @param client the client component of of the backend system key
+ * @returns the backend system if found or undefined
+ */
+function isBackendSystemKeyExisting(backendSystems, url, client) {
+    const newBackendSystemId = new store_1.BackendSystemKey({ url, client }).getId();
+    return backendSystems.find((backendSystem) => store_1.BackendSystemKey.from(backendSystem).getId() === newBackendSystemId);
+}
 //# sourceMappingURL=index.js.map

package/dist/utils/prompt-state.d.ts

@@ -1,3 +1,4 @@
+import type { BackendSystem } from '@sap-ux/store';
 import type { OdataServiceAnswers } from '../types';
 /**
  * Much of the values returned by the service inquirer prompting are derived from prompt answers and are not direct answer values.
@@ -8,6 +9,10 @@ import type { OdataServiceAnswers } from '../types';
 export declare class PromptState {
     static odataService: Partial<OdataServiceAnswers>;
     static isYUI: boolean;
+    /**
+     * To prevent re-reads from store load the backend systems once.
+     */
+    static backendSystemsCache: BackendSystem[];
     static reset(): void;
     static resetConnectedSystem(): void;
 }

package/dist/utils/prompt-state.js

@@ -10,6 +10,10 @@ exports.PromptState = void 0;
 class PromptState {
     static odataService = {};
     static isYUI = false;
+    /**
+     * To prevent re-reads from store load the backend systems once.
+     */
+    static backendSystemsCache = [];
     static reset() {
         // Reset all values in the odataService object, do not reset the object reference itself as it may be used by external consumers
         Object.keys(PromptState.odataService).forEach((key) => {

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": "2.8.12",
+  "version": "2.9.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,17 +29,17 @@
     "i18next": "25.3.0",
     "inquirer-autocomplete-prompt": "2.0.1",
     "os-name": "4.0.1",
-    "@sap-ux/axios-extension": "1.22.10",
+    "@sap-ux/axios-extension": "1.23.0",
     "@sap-ux/btp-utils": "1.1.4",
-    "@sap-ux/fiori-generator-shared": "0.13.22",
+    "@sap-ux/fiori-generator-shared": "0.13.23",
     "@sap-ux/guided-answers-helper": "0.4.0",
-    "@sap-ux/telemetry": "0.6.28",
-    "@sap-ux/inquirer-common": "0.7.50",
+    "@sap-ux/telemetry": "0.6.29",
+    "@sap-ux/inquirer-common": "0.8.0",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/nodejs-utils": "0.2.7",
     "@sap-ux/project-access": "1.32.4",
     "@sap-ux/project-input-validator": "0.6.26",
-    "@sap-ux/store": "1.1.5"
+    "@sap-ux/store": "1.2.0"
   },
   "devDependencies": {
     "@sap-ux/vocabularies-types": "0.13.0",
@@ -48,12 +48,12 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "6.0.0",
-    "@sap-ux/fiori-generator-shared": "0.13.22",
-    "@sap-ux/fiori-elements-writer": "2.7.19",
-    "@sap-ux/fiori-freestyle-writer": "2.4.50",
-    "@sap-ux/feature-toggle": "0.3.1",
+    "@sap-ux/fiori-generator-shared": "0.13.23",
+    "@sap-ux/fiori-elements-writer": "2.7.24",
+    "@sap-ux/fiori-freestyle-writer": "2.4.51",
+    "@sap-ux/feature-toggle": "0.3.2",
     "@sap-ux/odata-service-writer": "0.27.25",
-    "@sap-ux/cap-config-writer": "0.12.13"
+    "@sap-ux/cap-config-writer": "0.12.14"
   },
   "engines": {
     "node": ">=20.x"