@sap-ux/odata-service-inquirer 2.15.0 → 2.16.0

package/dist/prompts/edmx/questions.js

@@ -82,20 +82,34 @@ function getEntitySelectionQuestions(metadata, templateType, isCapService = fals
         name: types_1.EntityPromptNames.mainEntity,
         message: (0, i18n_1.t)('prompts.mainEntitySelection.message'),
         guiOptions: {
-            breadcrumb: true
+            breadcrumb: true,
+            mandatory: true
         },
         choices: entityChoices.choices,
         source: (prevAnswers, input) => (0, inquirer_common_1.searchChoices)(input, entityChoices.choices),
         default: entityChoices.defaultMainEntityIndex ?? entityChoices.draftRootIndex ?? 0,
-        validate: () => validateEntityChoices(entityChoices.choices, templateType, odataVersion, isCapService),
-        additionalMessages: (answers) => {
+        // Workaround for YUI bug: Despite mandatory=true, YUI allows users to clear/delete list selections.
+        validate: (value) => {
+            // First check if there are valid entity choices (handles edge case of no entities in service)
+            const entityChoicesValidation = validateEntityChoices(entityChoices.choices, templateType, odataVersion, isCapService);
+            if (entityChoicesValidation !== true) {
+                return entityChoicesValidation;
+            }
+            // Then check if a value is selected (user hasn't deleted/cleared the field)
+            if (!value) {
+                return (0, i18n_1.t)('prompts.mainEntitySelection.requiredError');
+            }
+            return true;
+        },
+        additionalMessages: (mainEntityValue) => {
             if (promptOptions?.defaultMainEntityName && entityChoices.defaultMainEntityIndex === undefined) {
                 return {
                     message: (0, i18n_1.t)('prompts.mainEntitySelection.defaultEntityNameNotFoundWarning'),
                     severity: yeoman_ui_types_1.Severity.warning
                 };
             }
-            if (answers.mainEntity?.mainEntityParameterName) {
+            // Only check mainEntityValue properties if it exists (handle null/undefined from user deleting the field)
+            if (mainEntityValue?.mainEntityParameterName) {
                 // display a warning if the main entity has a mainEntityParameterName
                 return {
                     message: (0, i18n_1.t)('prompts.mainEntitySelection.mainEntityParameterFoundInfo'),
@@ -211,8 +225,16 @@ function getTableLayoutQuestions(templateType, odataVersion, isCapService, metad
             guiOptions: {
                 hint: (0, i18n_1.t)('prompts.tableType.hint'),
                 breadcrumb: true,
+                mandatory: true,
                 applyDefaultWhenDirty: true // set table type on entity selection change
             },
+            // Workaround for YUI bug: Despite mandatory=true, YUI allows clearing mandatory list selections
+            validate: (value) => {
+                if (!value) {
+                    return (0, i18n_1.t)('prompts.tableType.requiredError');
+                }
+                return true;
+            },
             choices: tableTypeChoices,
             default: (prevAnswers) => {
                 const currentEntity = prevAnswers?.mainEntity;

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

@@ -140,7 +140,8 @@
             "noDraftEnabledEntitiesError": "The CAP service you have chosen does not have any entities that are draft enabled. To generate an OData V4 SAP Fiori application using this floorplan for a CAP project, the entity selected must be draft enabled.",
             "mainEntityParameterFoundInfo": "The selected entity '{{entityName}}' requires a parameter which is set by the application filters. Navigation entities are not supported.",
             "noEntitiesError": "$t(errors.noRelevantEntities)",
-            "noEntitiesAlpV4Error": "The OData V4 service you have provided is not suitable for use in an analytical list page application. The service must contain aggregate-based entities for this template."
+            "noEntitiesAlpV4Error": "The OData V4 service you have provided is not suitable for use in an analytical list page application. The service must contain aggregate-based entities for this template.",
+            "requiredError": "Please select a main entity to continue."
         },
         "navigationEntitySelection": {
             "message": "Navigation Entity",
@@ -159,6 +160,7 @@
         "tableType": {
             "message": "Table Type",
             "hint": "Defines the table type for the list report page.",
+            "requiredError": "Please select a table type to continue.",
             "choiceNone": "$t(texts.choiceNameNone)",
             "choiceGrid": "Grid",
             "choiceAnalytical": "Analytical",

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.15.0",
+  "version": "2.16.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -51,8 +51,8 @@
     "@sap-ux/fiori-elements-writer": "2.8.48",
     "@sap-ux/fiori-freestyle-writer": "2.5.34",
     "@sap-ux/feature-toggle": "0.3.5",
-    "@sap-ux/cap-config-writer": "0.12.49",
-    "@sap-ux/odata-service-writer": "0.29.9"
+    "@sap-ux/odata-service-writer": "0.29.9",
+    "@sap-ux/cap-config-writer": "0.12.49"
   },
   "engines": {
     "node": ">=20.x"