@sap-ux/odata-service-inquirer 2.9.14 → 2.11.0

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

@@ -1,9 +1,10 @@
-import type { InputQuestion, PasswordQuestion } from '@sap-ux/inquirer-common';
+import type { InputQuestion, PasswordQuestion, ConfirmQuestion } from '@sap-ux/inquirer-common';
 import type { Answers } from 'inquirer';
 import type { ConnectionValidator } from '../../../connectionValidator';
 export declare enum BasicCredentialsPromptNames {
     systemUsername = "systemUsername",
-    systemPassword = "systemPassword"
+    systemPassword = "systemPassword",
+    storeSystemCredentials = "storeSystemCredentials"
 }
 /**
  * Re-usable credentials prompts for connection to systems using basic auth.
@@ -18,5 +19,5 @@ export declare enum BasicCredentialsPromptNames {
 export declare function getCredentialsPrompts<T extends Answers>(connectionValidator: ConnectionValidator, promptNamespace?: string, sapClient?: {
     sapClient: string | undefined;
     isValid: boolean;
-}): (InputQuestion<T> | PasswordQuestion<T>)[];
+}): (InputQuestion<T> | PasswordQuestion<T> | ConfirmQuestion<T>)[];
 //# sourceMappingURL=questions.d.ts.map

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

@@ -11,6 +11,7 @@ var BasicCredentialsPromptNames;
 (function (BasicCredentialsPromptNames) {
     BasicCredentialsPromptNames["systemUsername"] = "systemUsername";
     BasicCredentialsPromptNames["systemPassword"] = "systemPassword";
+    BasicCredentialsPromptNames["storeSystemCredentials"] = "storeSystemCredentials";
 })(BasicCredentialsPromptNames || (exports.BasicCredentialsPromptNames = BasicCredentialsPromptNames = {}));
 /**
  * Re-usable credentials prompts for connection to systems using basic auth.
@@ -25,9 +26,10 @@ var BasicCredentialsPromptNames;
 function getCredentialsPrompts(connectionValidator, promptNamespace, sapClient) {
     const usernamePromptName = `${promptNamespace ? promptNamespace + ':' : ''}${BasicCredentialsPromptNames.systemUsername}`;
     const passwordPromptName = `${promptNamespace ? promptNamespace + ':' : ''}${BasicCredentialsPromptNames.systemPassword}`;
+    const storeCredentialsPromptName = `${promptNamespace ? promptNamespace + ':' : ''}${BasicCredentialsPromptNames.storeSystemCredentials}`;
     // Optimization to prevent re-checking of auth
     let authRequired;
-    return [
+    const credentialsPrompts = [
         {
             when: async () => {
                 authRequired = await connectionValidator.isAuthRequired();
@@ -83,7 +85,7 @@ function getCredentialsPrompts(connectionValidator, promptNamespace, sapClient)
                     updatePromptStateWithConnectedSystem(connectionValidator.serviceProvider, selectedSystem, {
                         username: answers?.[usernamePromptName],
                         password: password
-                    });
+                    }); // Store credentials temporarily - will be conditionally kept/removed in store credentials prompt
                     return true;
                 }
                 return valResult;
@@ -100,9 +102,42 @@ function getCredentialsPrompts(connectionValidator, promptNamespace, sapClient)
                         severity: yeoman_ui_types_1.Severity.warning
                     };
                 }
+                // Lower priority than the cert error warning - we can only show one at a time, hence this should always be last
+                if (utils_1.PromptState.odataService.connectedSystem?.backendSystem) {
+                    return {
+                        message: (0, i18n_1.t)('texts.passwordStoreWarning'),
+                        severity: yeoman_ui_types_1.Severity.warning
+                    };
+                }
             }
         }
     ];
+    const confirmCredentialStoragePrompt = {
+        when: (answers) => !!(connectionValidator.systemAuthType === 'basic' &&
+            authRequired &&
+            connectionValidator.validity.authenticated &&
+            answers[passwordPromptName]),
+        type: 'confirm',
+        name: storeCredentialsPromptName,
+        message: (0, i18n_1.t)('prompts.storeSystemCredentials.message'),
+        default: false,
+        guiOptions: {
+            breadcrumb: (0, i18n_1.t)('prompts.storeSystemCredentials.breadcrumb')
+        },
+        validate: async (storeCredentials) => {
+            if (utils_1.PromptState.odataService.connectedSystem?.backendSystem) {
+                const backendSystem = utils_1.PromptState.odataService.connectedSystem.backendSystem;
+                utils_1.PromptState.odataService.connectedSystem.backendSystem = Object.assign(backendSystem, {
+                    newOrUpdated: storeCredentials
+                });
+            }
+            return true;
+        }
+    };
+    if (!(0, btp_utils_1.isAppStudio)()) {
+        credentialsPrompts.push(confirmCredentialStoragePrompt);
+    }
+    return credentialsPrompts;
 }
 /**
  * Updates the prompt state with the connected system.
@@ -120,13 +155,12 @@ function updatePromptStateWithConnectedSystem(serviceProvider, selectedSystem, {
     // Update the existing backend system with the new credentials that may be used to update in the store.
     if (selectedSystem?.type === 'backendSystem') {
         const backendSystem = selectedSystem.system;
-        // Have the credentials changed..
+        // Have the credentials changed..?
         if (backendSystem.username !== username || backendSystem.password !== password) {
             utils_1.PromptState.odataService.connectedSystem.backendSystem = Object.assign(backendSystem, {
                 username: username,
-                password,
-                userDisplayName: username,
-                newOrUpdated: true
+                password: password,
+                userDisplayName: username
             });
         }
         // If the connection is successful and a destination was selected, assign the connected destination to the prompt state.

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

@@ -7,6 +7,8 @@ import type { Answers } from 'inquirer';
 import type { ConnectedSystem } from '../../../../types';
 import type { ConnectionValidator } from '../../../connectionValidator';
 import { type NewSystemAnswers } from '../new-system/types';
+import type { SystemSelectionAnswers } from '../system-selection/questions';
+import type { AbapOnPremAnswers } from '../abap-on-prem/questions';
 /**
  * Get the system url prompt. The system url prompt is used to connect to a new system using the user input system url.
  *
@@ -27,5 +29,5 @@ export declare function getSystemUrlQuestion<T extends Answers>(connectValidator
  *     This prevents conflicts with other prompts of the same types where the same prompt is used by multiple other prompts but cannot share the name.
  * @returns the new system name prompt
  */
-export declare function getUserSystemNameQuestion(connectValidator: ConnectionValidator, promptNamespace?: string): InputQuestion<Partial<NewSystemAnswers>>;
+export declare function getUserSystemNameQuestion(connectValidator: ConnectionValidator, promptNamespace?: string): InputQuestion<Partial<NewSystemAnswers & AbapOnPremAnswers & SystemSelectionAnswers>>;
 //# sourceMappingURL=shared-prompts.d.ts.map

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

@@ -10,6 +10,7 @@ const types_2 = require("../new-system/types");
 const prompt_helpers_1 = require("../prompt-helpers");
 const validators_1 = require("../validators");
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
+const questions_1 = require("../credentials/questions");
 /**
  * Convert the system connection scheme (Service Key, Rentrance Ticket, etc) to the store specific authentication type.
  * Note the absence of CF Discovery, in this case the service key file (UAA) is also used for the Abap connectivity.
@@ -129,7 +130,7 @@ function getUserSystemNameQuestion(connectValidator, promptNamespace) {
             }
             return defaultSystemName;
         },
-        validate: async (systemName) => {
+        validate: async (systemName, previousAnswers) => {
             if (!systemName) {
                 return false;
             }
@@ -143,6 +144,7 @@ function getUserSystemNameQuestion(connectValidator, promptNamespace) {
                 defaultSystemName = systemName;
                 isValid = await (0, validators_1.validateSystemName)(systemName);
             }
+            const shouldStoreCreds = !!previousAnswers?.[`${promptNamespacePart}${questions_1.BasicCredentialsPromptNames.storeSystemCredentials}`];
             if (isValid === true) {
                 // Update or create the BackendSystem with the new system details for persistent storage
                 if (connectValidator.validatedUrl && utils_1.PromptState.odataService.connectedSystem) {
@@ -151,8 +153,8 @@ function getUserSystemNameQuestion(connectValidator, promptNamespace) {
                         name: systemName,
                         url: connectValidator.validatedUrl,
                         client: connectValidator.validatedClient,
-                        username: connectValidator.axiosConfig?.auth?.username,
-                        password: connectValidator.axiosConfig?.auth?.password,
+                        username: shouldStoreCreds ? connectValidator.axiosConfig?.auth?.username : undefined,
+                        password: shouldStoreCreds ? connectValidator.axiosConfig?.auth?.password : undefined,
                         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)({

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

@@ -125,7 +125,6 @@ async function getSystemConnectionQuestions(connectionValidator, promptOptions,
                 return (validateSystemSelection(selectedSystemAnswer, connectionValidator, requiredOdataVersion, cachedConnectedSystem) ?? false);
             },
             additionalMessages: async (selectedSystem) => {
-                // Backend systems credentials may need to be updated
                 if (selectedSystem.type === 'backendSystem' &&
                     connectionValidator.systemAuthType === 'basic' &&
                     (await connectionValidator.isAuthRequired())) {

package/dist/prompts/datasources/service-helpers/service-helpers.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.showCollabDraftWarning = showCollabDraftWarning;
-const annotation_converter_1 = require("@sap-ux/annotation-converter");
-const edmx_parser_1 = require("@sap-ux/edmx-parser");
 const entity_helper_1 = require("../../edmx/entity-helper");
 const logger_helper_1 = __importDefault(require("../../logger-helper"));
 const i18n_1 = require("../../../i18n");
+const annotation_converter_1 = require("@sap-ux/annotation-converter");
+const edmx_parser_1 = require("@sap-ux/edmx-parser");
 /**
  * If any of the draft root annotated entity sets have the share action property, then collaborative draft is enabled.
  *

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

@@ -181,40 +181,6 @@ 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 with complete transformations,
- * 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, check requirements based on service type
-    if (hasHierarchy) {
-        // For CAP services, any analytical annotations are sufficient even with hierarchy
-        if (isCapService) {
-            return true;
-        }
-        // For non-CAP services, require complete analytical transformations
-        return (0, inquirer_common_1.hasAggregateTransformationsForEntitySet)(entitySet, inquirer_common_1.transformationsRequiredForAnalyticalTable);
-    }
-    // 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 entity capabilities.
  *
@@ -235,13 +201,18 @@ function getDefaultTableType(templateType, metadata, odataVersion, isCapService,
     // Handle OData v4 specific logic
     if (odataVersion === odata_service_writer_1.OdataVersion.v4 && entitySet) {
         const canUseAnalytical = templateType === 'lrop' || templateType === 'worklist' || templateType === 'alp';
-        const hasAnalyticalCapabilities = shouldUseAnalyticalTable(entitySet, isCapService);
         const hasHierarchy = (0, inquirer_common_1.hasRecursiveHierarchyForEntitySet)(entitySet);
-        // Check for analytical data requirements
-        if (canUseAnalytical && hasAnalyticalCapabilities) {
-            return 'AnalyticalTable';
+        const hasAnalyticalData = (0, inquirer_common_1.hasAggregateTransformations)(entitySet);
+        // Check for analytical capabilities first (highest priority)
+        if (canUseAnalytical && hasAnalyticalData) {
+            // For CAP services, any analytical data is sufficient
+            // For non-CAP services, require complete transformations
+            const hasAnalyticalCapabilities = (0, inquirer_common_1.shouldUseAnalyticalTable)(entitySet, !isCapService);
+            if (hasAnalyticalCapabilities) {
+                return 'AnalyticalTable';
+            }
         }
-        // Check for hierarchical data requirements
+        // Check for hierarchical data only (no analytical data or analytical requirements not met)
         if ((templateType === 'lrop' || templateType === 'worklist') && hasHierarchy) {
             return 'TreeTable';
         }

package/dist/prompts/edmx/questions.js

@@ -200,9 +200,9 @@ function getTableLayoutQuestions(templateType, odataVersion, isCapService, metad
     }
     const tableLayoutQuestions = [];
     if (templateType === 'lrop' || templateType === 'worklist' || templateType === 'alp') {
-        // Variables to manage analytical table defaults across prompts
-        let setAnalyticalTableDefault = false;
+        // Variables to track selected entity and default table type
         let selectedEntity;
+        let defaultTableType;
         tableLayoutQuestions.push({
             when: (prevAnswers) => !!prevAnswers.mainEntity,
             type: 'list',
@@ -218,24 +218,30 @@ function getTableLayoutQuestions(templateType, odataVersion, isCapService, metad
                 const currentEntity = prevAnswers?.mainEntity;
                 // Only re-evaluate if entity has changed or no previous selection exists
                 if (currentEntity?.entitySetName !== selectedEntity?.entitySetName || !prevAnswers?.tableType) {
-                    const defaultTableType = (0, entity_helper_1.getDefaultTableType)(templateType, metadata, odataVersion, isCapService, currentEntity?.entitySetName);
+                    defaultTableType = (0, entity_helper_1.getDefaultTableType)(templateType, metadata, odataVersion, isCapService, currentEntity?.entitySetName);
                     // Update tracking variables
                     selectedEntity = currentEntity;
-                    setAnalyticalTableDefault = defaultTableType === 'AnalyticalTable';
                     return defaultTableType;
                 }
                 // Entity hasn't changed and user has a selection - preserve their choice
-                // Reset the analytical table default flag since this is user's choice, not system default
-                setAnalyticalTableDefault = false;
+                // Reset the default table type since this is user's choice, not system default
+                defaultTableType = undefined;
                 return prevAnswers.tableType;
             },
             additionalMessages: () => {
-                if (setAnalyticalTableDefault) {
+                if (defaultTableType === 'AnalyticalTable') {
                     return {
                         message: (0, i18n_1.t)('prompts.tableType.analyticalTableDefault'),
                         severity: yeoman_ui_types_1.Severity.information
                     };
                 }
+                else if (defaultTableType === 'TreeTable') {
+                    return {
+                        message: (0, i18n_1.t)('prompts.tableType.treeTableDefault'),
+                        severity: yeoman_ui_types_1.Severity.information
+                    };
+                }
+                return undefined;
             }
         });
         tableLayoutQuestions.push({

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

@@ -84,6 +84,10 @@
         "systemPassword": {
             "message": "Password"
         },
+        "storeSystemCredentials": {
+            "message": "Do you want to store the system credentials?",
+            "breadcrumb": "Store Credentials"
+        },
         "systemService": {
             "message": "Service",
             "breadcrumb": "Service",
@@ -160,7 +164,8 @@
             "choiceAnalytical": "Analytical",
             "choiceResponsive": "Responsive",
             "choiceTree": "Tree",
-            "analyticalTableDefault": "The 'Analytical' table type is chosen by default because the selected entity supports it."
+            "analyticalTableDefault": "The 'Analytical' table type is chosen by default because the selected entity supports it.",
+            "treeTableDefault": "The 'Tree' table type is chosen by default because the selected entity supports it."
         },
         "hierarchyQualifier": {
             "message": "Hierarchy Qualifier",
@@ -256,6 +261,7 @@
         "forUserName": "(for user [{{username}}])",
         "httpStatus": "HTTP Status {{httpStatus}}",
         "checkDestinationAuthConfig": "Please check the SAP BTP destination authentication configuration.",
-        "choiceNameNone": "None"
+        "choiceNameNone": "None",
+        "passwordStoreWarning": "Passwords are stored in your operating system's credential manager and are protected by its security policies."
     }
 }

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.9.14",
+  "version": "2.11.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -34,7 +34,7 @@
     "@sap-ux/fiori-generator-shared": "0.13.31",
     "@sap-ux/guided-answers-helper": "0.4.0",
     "@sap-ux/telemetry": "0.6.36",
-    "@sap-ux/inquirer-common": "0.8.10",
+    "@sap-ux/inquirer-common": "0.9.0",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/nodejs-utils": "0.2.7",
     "@sap-ux/project-access": "1.32.7",