@sap-ux/odata-service-inquirer 2.5.22 → 2.5.23

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

@@ -22,7 +22,7 @@ const prompt_helpers_1 = require("../../../prompt-helpers");
 const validators_1 = require("../../../validators");
 const service_helpers_1 = require("../../service-helpers/service-helpers");
 // Service ids continaining these paths should not be offered as UI compatible services
-const nonUIServicePaths = ['/IWBEP/COMMON/'];
+const nonUIServicePaths = ['/IWBEP/COMMON'];
 // Telemetry event name for successful service validation on BAS, note: legacy event names should not be changed
 exports.telemEventBASServiceSuccess = 'SERVICE_INQUIRER_BAS_SUCCESS';
 /**
@@ -41,7 +41,7 @@ const createServiceChoices = (serviceInfos) => {
     }
     serviceInfos
         // Exclude non-UI compatible services
-        ?.filter((service) => !nonUIServicePaths.some((path) => service.path.includes(path)))
+        ?.filter((service) => !nonUIServicePaths.some((path) => service.id.includes(path)))
         .forEach((service) => {
         let serviceName = service.name;
         const servicePath = service.path;
@@ -60,6 +60,7 @@ const createServiceChoices = (serviceInfos) => {
             }
         });
     });
+    logger_helper_1.default.logger.debug(`Number of unique service choices: ${choices.length}`);
     return choices.sort((a, b) => (a.name ? a.name.localeCompare(b.name ?? '') : 0));
 };
 /**
@@ -87,9 +88,22 @@ function logServiceCatalogErrorsForHelp(requestErrors, numOfRequests) {
  */
 async function getServiceChoices(catalogs, serviceFilter) {
     const requestErrors = {};
-    const listServicesRequests = catalogs.map(async (catalog) => {
+    // Performance tracking for the requests
+    const requestTimes = {}; // [v2, v4] request times in ms
+    const listServicesRequests = [];
+    for (const catalog of catalogs) {
+        const catalogVer = catalog instanceof axios_extension_1.V2CatalogService ? axios_extension_1.ODataVersion.v2 : axios_extension_1.ODataVersion.v4;
         try {
-            return await catalog.listServices();
+            const startTime = Date.now();
+            const res = await catalog.listServices();
+            const endTime = Date.now();
+            const duration = endTime - startTime === 0 ? '<1 ms' : `${endTime - startTime}ms`;
+            requestTimes[`v${catalogVer}`] = {
+                serviceCount: res.length,
+                duration
+            };
+            logger_helper_1.default.logger.debug(`Number of service${catalogVer === axios_extension_1.ODataVersion.v4 ? ' groups' : 's'}: ${res.length} returned in: ${duration}}`);
+            listServicesRequests.push(res);
         }
         catch (error) {
             logger_helper_1.default.logger.error((0, i18n_1.t)('errors.serviceCatalogRequest', {
@@ -99,13 +113,15 @@ async function getServiceChoices(catalogs, serviceFilter) {
             }));
             // Save any errors for processing later as we may show more useful message to the user
             Object.assign(requestErrors, {
-                [catalog instanceof axios_extension_1.V2CatalogService ? axios_extension_1.ODataVersion.v2 : axios_extension_1.ODataVersion.v4]: error
+                [catalogVer]: error
             });
-            return [];
+            listServicesRequests.push([]);
         }
-    });
-    const serviceInfos = await Promise.all(listServicesRequests);
-    let flatServices = serviceInfos?.flat() ?? [];
+    }
+    // Log the request times for debugging purposes
+    logger_helper_1.default.logger.debug(`Service catalog request times: ${JSON.stringify(requestTimes, undefined, '    ')}`);
+    // 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) {
         logServiceCatalogErrorsForHelp(requestErrors, catalogs.length);

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.5.22",
+  "version": "2.5.23",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -28,7 +28,7 @@
     "i18next": "25.3.0",
     "inquirer-autocomplete-prompt": "2.0.1",
     "os-name": "4.0.1",
-    "@sap-ux/axios-extension": "1.22.3",
+    "@sap-ux/axios-extension": "1.22.4",
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/fiori-generator-shared": "0.13.3",
     "@sap-ux/guided-answers-helper": "0.3.1",
@@ -43,13 +43,13 @@
   "devDependencies": {
     "@sap-ux/vocabularies-types": "0.13.0",
     "@sap-devx/yeoman-ui-types": "1.14.4",
-    "@types/inquirer-autocomplete-prompt": "2.0.1",
+    "@types/inquirer-autocomplete-prompt": "2.0.2",
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
-    "jest-extended": "3.2.4",
+    "jest-extended": "6.0.0",
     "@sap-ux/fiori-generator-shared": "0.13.3",
-    "@sap-ux/fiori-elements-writer": "2.5.14",
-    "@sap-ux/fiori-freestyle-writer": "2.4.25",
+    "@sap-ux/fiori-elements-writer": "2.5.15",
+    "@sap-ux/fiori-freestyle-writer": "2.4.26",
     "@sap-ux/feature-toggle": "0.3.0",
     "@sap-ux/odata-service-writer": "0.27.12",
     "@sap-ux/cap-config-writer": "0.10.21"
@@ -63,7 +63,7 @@
     "watch": "tsc --watch",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "test": "jest --ci --forceExit --detectOpenHandles --colors --passWithNoTests",
+    "test": "jest --ci --forceExit --detectOpenHandles --colors",
     "test-u": "jest --ci --forceExit --detectOpenHandles --colors -u",
     "link": "pnpm link --global",
     "unlink": "pnpm unlink --global"