@sap-ux/odata-service-inquirer 2.14.11 → 2.14.13

package/dist/prompts/connectionValidator.js

@@ -671,11 +671,12 @@ class ConnectionValidator {
             if (url.origin === 'null') {
                 return (0, i18n_1.t)('errors.invalidUrl', { input: serviceUrl });
             }
-            // Dont allow non origin URLs in for re-entrance tickets as the error handling would become complex to analyize.
+            // Dont allow non origin URLs in for re-entrance tickets and system URL's as the error handling would become complex to analyize.
             // The connection may succeed but later we will get auth errors since axios-extension does not validate this.
-            // The new system name would also include the additional paths which would not make sense either.
-            if (this.systemAuthType === 'reentranceTicket' && !(url.pathname.length === 0 || url.pathname === '/')) {
-                return (0, i18n_1.t)('prompts.validationMessages.reentranceTicketSystemHostOnly');
+            // The new system name would also include the additional paths which would not make sense and would cause the issue when storing the system.
+            if ((this.systemAuthType === 'reentranceTicket' || isSystem) &&
+                !(url.pathname.length === 0 || url.pathname === '/')) {
+                return (0, i18n_1.t)('prompts.validationMessages.systemUrlOriginOnlyWarning');
             }
         }
         catch (error) {

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

@@ -15,8 +15,6 @@ const logger_helper_1 = __importDefault(require("../../../logger-helper"));
 const prompt_helpers_1 = require("../../../prompt-helpers");
 const service_helper_1 = require("../service-selection/service-helper");
 const value_help_download_1 = require("../external-services/value-help-download");
-const isEqual_1 = __importDefault(require("lodash/isEqual"));
-const sortBy_1 = __importDefault(require("lodash/sortBy"));
 const cliServicePromptName = 'cliServiceSelection';
 /**
  * Get the service selection prompt for an Abap system connection (on-prem or on-btp). The service selection prompt is used to select a service from the system catalog.
@@ -59,7 +57,7 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
             if (serviceChoices.length === 0 ||
                 previousSystemUrl !== connectValidator.validatedUrl ||
                 previousClient !== connectValidator.validatedClient ||
-                !(0, isEqual_1.default)((0, sortBy_1.default)(previousServiceFilter), (0, sortBy_1.default)(promptOptions?.serviceFilter))) {
+                !(0, utils_1.areArraysEquivalent)(previousServiceFilter, promptOptions?.serviceFilter)) {
                 // if we have a catalog, use it to list services
                 if (connectValidator.catalogs[odata_service_writer_1.OdataVersion.v2] || connectValidator.catalogs[odata_service_writer_1.OdataVersion.v4]) {
                     serviceChoices = await createServiceChoicesFromCatalog(connectValidator.catalogs, requiredOdataVersion, promptOptions?.serviceFilter);

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

@@ -60,7 +60,7 @@
             "warningCertificateValidationDisabled": "Certificate validation has been disabled by the user.",
             "annotationsNotFound": "Annotations not found for the specified service.",
             "backendSystemExistsWarning": "A saved system connection entry: \"{{- backendName}}\" already exists with the same URL and client. Please reuse the existing entry or remove it, using the systems panel, before adding a new connection.",
-            "reentranceTicketSystemHostOnly": "ABAP cloud system urls must only contain the hostname, for example, 'https://123.abc.com'"
+            "systemUrlOriginOnlyWarning": "System URLs must only contain the hostname and may also include the port, for example, 'https://abc.com:123/'."
         },
         "warnings": {
             "nonUIServiceTypeWarningMessage": "Services of service type: {{serviceType}} or without a service type are not intended to be used for generating SAP Fiori UI applications.",

package/dist/utils/index.d.ts

@@ -73,5 +73,12 @@ export declare function removeCircularFromServiceProvider(serviceProvider: Servi
  * @returns the backend system if found or undefined
  */
 export declare function isBackendSystemKeyExisting(backendSystems: BackendSystem[], url: string, client?: string): BackendSystem | undefined;
+/**
+ * Compare 2 string arrays without considering ordering.
+ *
+ * @param array1
+ * @param array2
+ */
+export declare function areArraysEquivalent(array1: Array<string> | undefined, array2: Array<string> | undefined): boolean;
 export { PromptState };
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.js

@@ -12,6 +12,7 @@ exports.convertODataVersionType = convertODataVersionType;
 exports.getDefaultChoiceIndex = getDefaultChoiceIndex;
 exports.removeCircularFromServiceProvider = removeCircularFromServiceProvider;
 exports.isBackendSystemKeyExisting = isBackendSystemKeyExisting;
+exports.areArraysEquivalent = areArraysEquivalent;
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
@@ -160,4 +161,21 @@ function isBackendSystemKeyExisting(backendSystems, url, client) {
     const newBackendSystemId = new store_1.BackendSystemKey({ url, client }).getId();
     return backendSystems.find((backendSystem) => store_1.BackendSystemKey.from(backendSystem).getId() === newBackendSystemId);
 }
+/**
+ * Compare 2 string arrays without considering ordering.
+ *
+ * @param array1
+ * @param array2
+ */
+function areArraysEquivalent(array1, array2) {
+    // Both undefined, same length or same object ref
+    if ((!array1 && !array2) || (array1?.length === 0 && array2?.length === 0) || array1 === array2) {
+        return true;
+    }
+    // If either undefined must be different due to earlier condition
+    if (!array1 || !array2) {
+        return false;
+    }
+    return [...array1].sort().toString() === [...array2].sort().toString();
+}
 //# sourceMappingURL=index.js.map

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.11",
+  "version": "2.14.13",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -28,13 +28,12 @@
     "fast-xml-parser": "4.4.1",
     "i18next": "25.3.0",
     "inquirer-autocomplete-prompt": "2.0.1",
-    "lodash": "4.17.21",
     "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.54",
     "@sap-ux/guided-answers-helper": "0.4.2",
     "@sap-ux/telemetry": "0.6.56",
-    "@sap-ux/fiori-generator-shared": "0.13.54",
-    "@sap-ux/btp-utils": "1.1.6",
     "@sap-ux/inquirer-common": "0.10.14",
     "@sap-ux/logger": "0.8.0",
     "@sap-ux/nodejs-utils": "0.2.11",
@@ -47,11 +46,10 @@
     "@sap-devx/yeoman-ui-types": "1.14.4",
     "@types/inquirer-autocomplete-prompt": "2.0.2",
     "@types/inquirer": "8.2.6",
-    "@types/lodash": "4.14.202",
     "jest-extended": "6.0.0",
+    "@sap-ux/fiori-generator-shared": "0.13.54",
     "@sap-ux/fiori-elements-writer": "2.8.42",
     "@sap-ux/fiori-freestyle-writer": "2.5.29",
-    "@sap-ux/fiori-generator-shared": "0.13.54",
     "@sap-ux/feature-toggle": "0.3.5",
     "@sap-ux/odata-service-writer": "0.29.8",
     "@sap-ux/cap-config-writer": "0.12.45"