@sap-ux/odata-service-inquirer 2.9.4 → 2.9.7

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

@@ -64,6 +64,9 @@ function getAbapOnPremSystemQuestions(systemNamePromptOptions, connectionValidat
                     if (prevAnswers?.[systemUrlPromptName]) {
                         const existingBackend = (0, utils_1.isBackendSystemKeyExisting)(utils_1.PromptState.backendSystemsCache, prevAnswers[systemUrlPromptName], client);
                         if (existingBackend) {
+                            // Prevents further prompts by setting the client to invalid
+                            // This is a temp workaround until multiple systems with the same url/client key is supported
+                            sapClientRef.isValid = false;
                             return (0, i18n_1.t)('prompts.validationMessages.backendSystemExistsWarning', {
                                 backendName: existingBackend.name
                             });

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

@@ -31,7 +31,7 @@ function getCredentialsPrompts(connectionValidator, promptNamespace, sapClient)
         {
             when: async () => {
                 authRequired = await connectionValidator.isAuthRequired();
-                return connectionValidator.systemAuthType === 'basic' && authRequired;
+                return (connectionValidator.systemAuthType === 'basic' && authRequired && (!sapClient || sapClient.isValid));
             },
             type: 'input',
             name: usernamePromptName,
@@ -43,7 +43,7 @@ function getCredentialsPrompts(connectionValidator, promptNamespace, sapClient)
             validate: (user) => user?.length > 0
         },
         {
-            when: () => !!(connectionValidator.systemAuthType === 'basic' && authRequired),
+            when: () => !!(connectionValidator.systemAuthType === 'basic' && authRequired && (!sapClient || sapClient.isValid)),
             type: 'password',
             guiOptions: {
                 mandatory: true,
@@ -58,7 +58,7 @@ function getCredentialsPrompts(connectionValidator, promptNamespace, sapClient)
                 if (!(connectionValidator.validatedUrl &&
                     answers?.[usernamePromptName] &&
                     password &&
-                    (sapClient?.isValid || !sapClient))) {
+                    (!sapClient || sapClient.isValid))) {
                     return false;
                 }
                 // We may have a previously selected system

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

@@ -58,18 +58,14 @@ export declare function getNavigationEntityChoices(metadata: ConvertedMetadata,
  */
 export declare function filterDraftEnabledEntities(entitySets: EntitySet[]): EntitySet[] | undefined;
 /**
- * Get the default table type based on the template type and previous answers.
+ * Get the default table type based on the template type and entity capabilities.
  *
- * @param templateType the template type of the application to be generated from the prompt answers
+ * @param templateType the template type of the application to be generated
  * @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
+ * @returns the optimal table type for the given entity
  */
-export declare function getDefaultTableType(templateType: TemplateType, metadata: ConvertedMetadata, odataVersion: OdataVersion, isCapService: boolean, mainEntitySetName?: string, currentTableType?: TableType): {
-    tableType: TableType;
-    setAnalyticalTableDefault: boolean;
-};
+export declare function getDefaultTableType(templateType: TemplateType, metadata: ConvertedMetadata, odataVersion: OdataVersion, isCapService: boolean, mainEntitySetName?: string): TableType;
 //# sourceMappingURL=entity-helper.d.ts.map

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

@@ -184,8 +184,8 @@ function filterDraftEnabledEntities(entitySets) {
 /**
  * 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.
+ * 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).
@@ -199,9 +199,14 @@ function shouldUseAnalyticalTable(entitySet, isCapService) {
     if (!hasAnalytical) {
         return false;
     }
-    // If entity has both analytical and hierarchical data, always use AnalyticalTable
+    // If entity has both analytical and hierarchical data, check requirements based on service type
     if (hasHierarchy) {
-        return true;
+        // 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) {
@@ -211,63 +216,37 @@ function shouldUseAnalyticalTable(entitySet, isCapService) {
     return (0, inquirer_common_1.hasAggregateTransformationsForEntitySet)(entitySet, inquirer_common_1.transformationsRequiredForAnalyticalTable);
 }
 /**
- * Get the default table type based on the template type and previous answers.
+ * Get the default table type based on the template type and entity capabilities.
  *
- * @param templateType the template type of the application to be generated from the prompt answers
+ * @param templateType the template type of the application to be generated
  * @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
+ * @returns the optimal table type for the given entity
  */
-function getDefaultTableType(templateType, metadata, odataVersion, isCapService, mainEntitySetName, currentTableType) {
-    let tableType;
-    let setAnalyticalTableDefault = false;
+function getDefaultTableType(templateType, metadata, odataVersion, isCapService, mainEntitySetName) {
     // 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;
+    // Handle ALP template with OData v2 - always use AnalyticalTable
+    if (templateType === 'alp' && odataVersion === odata_service_writer_1.OdataVersion.v2) {
+        return 'AnalyticalTable';
+    }
+    // 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';
         }
-        else {
-            // Default to ResponsiveTable for other cases
-            tableType = 'ResponsiveTable';
+        // Check for hierarchical data requirements
+        if ((templateType === 'lrop' || templateType === 'worklist') && hasHierarchy) {
+            return 'TreeTable';
         }
     }
-    else if (templateType === 'alp') {
-        // For ALP, use AnalyticalTable as default even if entity set is not found
-        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';
-    }
-    return {
-        tableType,
-        setAnalyticalTableDefault
-    };
+    // Default fallback to ResponsiveTable
+    return 'ResponsiveTable';
 }
 //# sourceMappingURL=entity-helper.js.map

package/dist/prompts/edmx/questions.js

@@ -200,7 +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;
+        let selectedEntity;
         tableLayoutQuestions.push({
             when: (prevAnswers) => !!prevAnswers.mainEntity,
             type: 'list',
@@ -213,12 +215,22 @@ function getTableLayoutQuestions(templateType, odataVersion, isCapService, metad
             },
             choices: tableTypeChoices,
             default: (prevAnswers) => {
-                const tableTypeDefault = (0, entity_helper_1.getDefaultTableType)(templateType, metadata, odataVersion, isCapService, prevAnswers?.mainEntity?.entitySetName, prevAnswers?.tableType);
-                setAnalyticalTableDefault = tableTypeDefault.setAnalyticalTableDefault;
-                return tableTypeDefault.tableType;
+                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);
+                    // 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;
+                return prevAnswers.tableType;
             },
-            additionalMessages: (tableType) => {
-                if (tableType === 'AnalyticalTable' && setAnalyticalTableDefault) {
+            additionalMessages: () => {
+                if (setAnalyticalTableDefault) {
                     return {
                         message: (0, i18n_1.t)('prompts.tableType.analyticalTableDefault'),
                         severity: yeoman_ui_types_1.Severity.information

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.4",
+  "version": "2.9.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,15 +30,15 @@
     "inquirer-autocomplete-prompt": "2.0.1",
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.23.0",
-    "@sap-ux/fiori-generator-shared": "0.13.26",
     "@sap-ux/btp-utils": "1.1.4",
+    "@sap-ux/fiori-generator-shared": "0.13.27",
     "@sap-ux/guided-answers-helper": "0.4.0",
-    "@sap-ux/telemetry": "0.6.31",
-    "@sap-ux/inquirer-common": "0.8.3",
+    "@sap-ux/telemetry": "0.6.32",
+    "@sap-ux/inquirer-common": "0.8.5",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/nodejs-utils": "0.2.7",
-    "@sap-ux/project-access": "1.32.5",
-    "@sap-ux/project-input-validator": "0.6.27",
+    "@sap-ux/project-access": "1.32.6",
+    "@sap-ux/project-input-validator": "0.6.28",
     "@sap-ux/store": "1.2.1"
   },
   "devDependencies": {
@@ -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.26",
-    "@sap-ux/fiori-elements-writer": "2.7.27",
-    "@sap-ux/fiori-freestyle-writer": "2.4.54",
+    "@sap-ux/fiori-generator-shared": "0.13.27",
+    "@sap-ux/fiori-elements-writer": "2.7.28",
+    "@sap-ux/fiori-freestyle-writer": "2.4.55",
     "@sap-ux/feature-toggle": "0.3.2",
-    "@sap-ux/odata-service-writer": "0.27.26",
-    "@sap-ux/cap-config-writer": "0.12.17"
+    "@sap-ux/odata-service-writer": "0.27.27",
+    "@sap-ux/cap-config-writer": "0.12.18"
   },
   "engines": {
     "node": ">=20.x"