@sap-ux/odata-service-inquirer 1.1.0 → 1.2.0

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

@@ -81,7 +81,15 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
             }
             return serviceChoices;
         },
-        additionalMessages: (selectedService) => (0, service_helper_1.getSelectedServiceMessage)(serviceChoices, selectedService, connectValidator, requiredOdataVersion),
+        additionalMessages: (selectedService) => {
+            // Additional messages is executed after validation, so we can assume the PromptState has been updated
+            let hasBackendAnnotations = false;
+            if (selectedService && utils_1.PromptState.odataService.servicePath === selectedService.servicePath) {
+                hasBackendAnnotations =
+                    !!utils_1.PromptState.odataService.annotations && utils_1.PromptState.odataService.annotations.length > 0;
+            }
+            return (0, service_helper_1.getSelectedServiceMessage)(serviceChoices, selectedService, connectValidator, requiredOdataVersion, hasBackendAnnotations);
+        },
         default: () => (0, utils_1.getDefaultChoiceIndex)(serviceChoices),
         // Warning: only executes in YUI and cli when automcomplete is used
         validate: async (service) => {

package/dist/prompts/datasources/sap-system/service-selection/service-helper.d.ts

@@ -65,7 +65,8 @@ export declare function getSelectedServiceLabel(username: string | undefined): s
  * @param selectedService the selected service
  * @param connectValidator the connection validator
  * @param requiredOdataVersion the required OData version for the service
+ * @param hasAnnotations used to determine whether to show a warning message that annotations could not be retrieved
  * @returns the service selection prompt additional message
  */
-export declare function getSelectedServiceMessage(serviceChoices: ListChoiceOptions<ServiceAnswer>[], selectedService: ServiceAnswer, connectValidator: ConnectionValidator, requiredOdataVersion?: OdataVersion): Promise<IMessageSeverity | undefined>;
+export declare function getSelectedServiceMessage(serviceChoices: ListChoiceOptions<ServiceAnswer>[], selectedService: ServiceAnswer, connectValidator: ConnectionValidator, requiredOdataVersion?: OdataVersion, hasAnnotations?: boolean): Promise<IMessageSeverity | undefined>;
 //# sourceMappingURL=service-helper.d.ts.map

package/dist/prompts/datasources/sap-system/service-selection/service-helper.js

@@ -247,9 +247,10 @@ function getSelectedServiceLabel(username) {
  * @param selectedService the selected service
  * @param connectValidator the connection validator
  * @param requiredOdataVersion the required OData version for the service
+ * @param hasAnnotations used to determine whether to show a warning message that annotations could not be retrieved
  * @returns the service selection prompt additional message
  */
-async function getSelectedServiceMessage(serviceChoices, selectedService, connectValidator, requiredOdataVersion) {
+async function getSelectedServiceMessage(serviceChoices, selectedService, connectValidator, requiredOdataVersion, hasAnnotations = true) {
     if (serviceChoices?.length === 0) {
         if (requiredOdataVersion) {
             return {
@@ -269,6 +270,13 @@ async function getSelectedServiceMessage(serviceChoices, selectedService, connec
     if (selectedService) {
         let serviceType = selectedService.serviceType;
         if (selectedService.serviceODataVersion === axios_extension_1.ODataVersion.v2) {
+            // Warn if odata service is version is '2' and no annotations are present
+            if (!hasAnnotations) {
+                return {
+                    message: (0, i18n_1.t)('prompts.warnings.noAnnotations'),
+                    severity: yeoman_ui_types_1.Severity.warning
+                };
+            }
             serviceType = await getServiceType(selectedService.servicePath, selectedService.serviceType, connectValidator.catalogs[axios_extension_1.ODataVersion.v2]);
         }
         if (serviceType && serviceType !== axios_extension_1.ServiceType.UI) {

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

@@ -130,13 +130,15 @@ function getNavigationEntityChoices(metadata, odataVersion, mainEntityName) {
 }
 /**
  * Returns only entity sets that have the `Aggregation.ApplySupported` annotation term with the `Transformations` property.
+ * This can be found within the entity set annotations or the entity type annotations.
  *
  * @param entitySets the entity sets to filter
  * @returns the filtered entity sets
  */
 function filterAggregateTransformations(entitySets) {
     return entitySets.filter((entitySet) => {
-        return !!entitySet.annotations?.Aggregation?.ApplySupported?.Transformations;
+        return (!!entitySet.annotations?.Aggregation?.ApplySupported?.Transformations ||
+            !!entitySet.entityType?.annotations?.Aggregation?.ApplySupported?.Transformations);
     });
 }
 /**

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

@@ -63,7 +63,8 @@
         "warnings": {
             "nonUIServiceTypeWarningMessage": "Please note that {{serviceType}} services, or not classified services, are not intended to be used for the generation of SAP Fiori UI applications",
             "noServicesAvailable": "No services available for the selected system, see logs for further details.",
-            "noServicesAvailableForOdataVersion": "There are no V{{odataVersion}} OData services available from the selected system and the template you have chosen supports V{{odataVersion}} OData services only"
+            "noServicesAvailableForOdataVersion": "There are no V{{odataVersion}} OData services available from the selected system and the template you have chosen supports V{{odataVersion}} OData services only",
+            "noAnnotations": "No backend annotations associated with this service were retrieved and may result in an invalid application being created"
         },
         "systemUrl": {
             "message": "System URL",

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": "1.1.0",
+  "version": "1.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -34,9 +34,9 @@
     "@sap-ux/guided-answers-helper": "0.2.0",
     "@sap-ux/inquirer-common": "0.6.4",
     "@sap-ux/telemetry": "0.5.51",
+    "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-input-validator": "0.3.4",
     "@sap-ux/project-access": "1.29.0",
-    "@sap-ux/logger": "0.6.0",
     "@sap-ux/store": "1.0.0"
   },
   "devDependencies": {
@@ -46,10 +46,10 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
-    "@sap-ux/fiori-generator-shared": "0.7.19",
     "@sap-ux/fiori-elements-writer": "2.0.0",
     "@sap-ux/fiori-freestyle-writer": "2.0.0",
     "@sap-ux/feature-toggle": "0.2.3",
+    "@sap-ux/fiori-generator-shared": "0.7.19",
     "@sap-ux/odata-service-writer": "0.25.3"
   },
   "engines": {