@sap-ux/odata-service-inquirer 2.8.13 → 2.9.1

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/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.13",
+  "version": "2.9.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -31,10 +31,10 @@
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.23.0",
     "@sap-ux/btp-utils": "1.1.4",
-    "@sap-ux/fiori-generator-shared": "0.13.23",
+    "@sap-ux/fiori-generator-shared": "0.13.24",
     "@sap-ux/guided-answers-helper": "0.4.0",
     "@sap-ux/telemetry": "0.6.29",
-    "@sap-ux/inquirer-common": "0.7.51",
+    "@sap-ux/inquirer-common": "0.8.1",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/nodejs-utils": "0.2.7",
     "@sap-ux/project-access": "1.32.4",
@@ -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.23",
-    "@sap-ux/fiori-elements-writer": "2.7.20",
-    "@sap-ux/fiori-freestyle-writer": "2.4.51",
+    "@sap-ux/fiori-generator-shared": "0.13.24",
+    "@sap-ux/fiori-elements-writer": "2.7.25",
+    "@sap-ux/fiori-freestyle-writer": "2.4.52",
     "@sap-ux/feature-toggle": "0.3.2",
     "@sap-ux/odata-service-writer": "0.27.25",
-    "@sap-ux/cap-config-writer": "0.12.14"
+    "@sap-ux/cap-config-writer": "0.12.15"
   },
   "engines": {
     "node": ">=20.x"