@sap-ux/odata-service-inquirer 2.9.13 → 2.10.0

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

@@ -160,7 +160,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",

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.13",
+  "version": "2.10.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -31,15 +31,15 @@
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.24.1",
     "@sap-ux/btp-utils": "1.1.4",
-    "@sap-ux/fiori-generator-shared": "0.13.30",
+    "@sap-ux/fiori-generator-shared": "0.13.31",
     "@sap-ux/guided-answers-helper": "0.4.0",
-    "@sap-ux/telemetry": "0.6.35",
-    "@sap-ux/inquirer-common": "0.8.9",
+    "@sap-ux/telemetry": "0.6.36",
+    "@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",
     "@sap-ux/project-input-validator": "0.6.29",
-    "@sap-ux/store": "1.3.1"
+    "@sap-ux/store": "1.3.2"
   },
   "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.30",
-    "@sap-ux/fiori-elements-writer": "2.7.33",
-    "@sap-ux/fiori-freestyle-writer": "2.4.58",
+    "@sap-ux/fiori-generator-shared": "0.13.31",
+    "@sap-ux/fiori-elements-writer": "2.7.34",
+    "@sap-ux/fiori-freestyle-writer": "2.4.59",
     "@sap-ux/feature-toggle": "0.3.3",
     "@sap-ux/odata-service-writer": "0.27.28",
-    "@sap-ux/cap-config-writer": "0.12.21"
+    "@sap-ux/cap-config-writer": "0.12.22"
   },
   "engines": {
     "node": ">=20.x"