@sap-ux/odata-service-inquirer 2.14.0 → 2.14.2

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

@@ -2,10 +2,10 @@ import { type IMessageSeverity } from '@sap-devx/yeoman-ui-types';
 import { type CatalogService, ServiceType, V2CatalogService } from '@sap-ux/axios-extension';
 import type { Destination } from '@sap-ux/btp-utils';
 import { OdataVersion } from '@sap-ux/odata-service-writer';
+import type { ConvertedMetadata } from '@sap-ux/vocabularies-types';
 import type { ListChoiceOptions } from 'inquirer';
 import type { ConnectionValidator } from '../../../connectionValidator';
 import type { ServiceAnswer } from './types';
-import type { ConvertedMetadata } from '@sap-ux/vocabularies-types';
 export declare const telemEventBASServiceSuccess = "SERVICE_INQUIRER_BAS_SUCCESS";
 /**
  * Get the service choices from the specified catalogs.
@@ -75,7 +75,7 @@ type ShowCollabDraftWarnOptions = {
  *  and the edmx metadata must be provided
  * @returns the service selection prompt additional message
  */
-export declare function getSelectedServiceMessage(serviceChoices: ListChoiceOptions<ServiceAnswer>[], selectedService: ServiceAnswer, connectValidator: ConnectionValidator, { requiredOdataVersion, hasAnnotations, showCollabDraftWarnOptions }: {
+export declare function getSelectedServiceMessage(serviceChoices: ListChoiceOptions<ServiceAnswer>[], selectedService: ServiceAnswer | undefined, connectValidator: ConnectionValidator, { requiredOdataVersion, hasAnnotations, showCollabDraftWarnOptions }: {
     requiredOdataVersion?: OdataVersion;
     hasAnnotations?: boolean;
     showCollabDraftWarnOptions?: ShowCollabDraftWarnOptions;

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

@@ -69,9 +69,9 @@ const createServiceChoices = (serviceInfos) => {
  * @param numOfRequests the number of catalog service requests made
  */
 function logServiceCatalogErrorsForHelp(requestErrors, numOfRequests) {
-    const catalogRequesErrors = Object.values(requestErrors);
-    catalogRequesErrors.forEach((error) => {
-        prompt_helpers_1.errorHandler.logErrorMsgs(error); // Log and process the error -> error type
+    const catalogRequesErrors = Object.entries(requestErrors);
+    catalogRequesErrors.forEach(([odataVersion, error]) => {
+        prompt_helpers_1.errorHandler.logErrorMsgs(error, (0, i18n_1.t)('warnings.missingServices', { odataVersion })); // Error state is set for later processing
     });
     // If all requests failed, log a generic message, this will be stored in the error handler
     if (numOfRequests === catalogRequesErrors.length) {
@@ -122,7 +122,8 @@ async function getServiceChoices(catalogs, serviceFilter) {
     // Flatten the array of arrays
     let flatServices = listServicesRequests?.flat() ?? [];
     logger_helper_1.default.logger.debug(`Number of services available: ${flatServices.length}`);
-    if (flatServices.length === 0) {
+    // If no services or any catalog errors log the message to the error handler for later processing
+    if (flatServices.length === 0 || Object.keys(requestErrors).length > 0) {
         logServiceCatalogErrorsForHelp(requestErrors, catalogs.length);
     }
     if (serviceFilter) {
@@ -342,5 +343,12 @@ async function getSelectedServiceMessage(serviceChoices, selectedService, connec
             };
         }
     }
+    // If any catalog request errors, show an info message. We know this is a catalog error since there is no service selected.
+    if (prompt_helpers_1.errorHandler.getErrorMsg()) {
+        return {
+            message: `${prompt_helpers_1.errorHandler.getErrorMsg()} ${(0, i18n_1.t)('texts.seeLogForDetails')}`,
+            severity: yeoman_ui_types_1.Severity.information
+        };
+    }
 }
 //# sourceMappingURL=service-helper.js.map

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

@@ -261,7 +261,8 @@
         "certificateErrors": "A certificate error occurred when connecting to the host: {{-url}}. Certificate error: {{error}}.",
         "allowingUnauthorizedCertsNode": "Setting the `NODE_TLS_REJECT_UNAUTHORIZED` environment variable to `0` makes TLS connections and HTTPS requests insecure by disabling certificate verification. It is important to understand the security risks when using this setting.",
         "certErrorIgnoredByNodeSetting": "An SSL certificate error is being ignored by the 'NODE_TLS_REJECT_UNAUTHORIZED=0' Node.js setting. This makes TLS connections and HTTPS requests insecure by disabling certificate verification. For details of the certification error, see the logs.",
-        "noExternalServiceMetdataFetched": "No external service metadata were fetched. $t(texts.seeLogForDetails)."
+        "noExternalServiceMetdataFetched": "No external service metadata were fetched. $t(texts.seeLogForDetails).",
+        "missingServices": "OData V{{odataVersion}} services are not available."
     },
     "texts": {
         "suggestedSystemNameClient": ", client {{client}}",

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.14.0",
+  "version": "2.14.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -31,14 +31,14 @@
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.25.6",
     "@sap-ux/btp-utils": "1.1.6",
-    "@sap-ux/fiori-generator-shared": "0.13.50",
+    "@sap-ux/fiori-generator-shared": "0.13.51",
     "@sap-ux/guided-answers-helper": "0.4.2",
-    "@sap-ux/telemetry": "0.6.52",
-    "@sap-ux/inquirer-common": "0.10.9",
+    "@sap-ux/telemetry": "0.6.53",
+    "@sap-ux/inquirer-common": "0.10.10",
     "@sap-ux/logger": "0.8.0",
     "@sap-ux/nodejs-utils": "0.2.11",
-    "@sap-ux/project-access": "1.33.2",
-    "@sap-ux/project-input-validator": "0.6.42",
+    "@sap-ux/project-access": "1.34.0",
+    "@sap-ux/project-input-validator": "0.6.43",
     "@sap-ux/store": "1.4.2"
   },
   "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.50",
-    "@sap-ux/fiori-elements-writer": "2.8.34",
-    "@sap-ux/fiori-freestyle-writer": "2.5.25",
+    "@sap-ux/fiori-generator-shared": "0.13.51",
+    "@sap-ux/fiori-elements-writer": "2.8.36",
+    "@sap-ux/fiori-freestyle-writer": "2.5.26",
     "@sap-ux/feature-toggle": "0.3.5",
-    "@sap-ux/odata-service-writer": "0.29.5",
-    "@sap-ux/cap-config-writer": "0.12.41"
+    "@sap-ux/odata-service-writer": "0.29.6",
+    "@sap-ux/cap-config-writer": "0.12.42"
   },
   "engines": {
     "node": ">=20.x"