@sap-ux/odata-service-inquirer 2.14.10 → 2.14.12

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

@@ -32,6 +32,7 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
     let previousSystemUrl;
     let previousClient;
     let previousService;
+    let previousServiceFilter;
     // State shared across validate and additionalMessages functions
     let hasBackendAnnotations;
     // Wrap to allow pass by ref to nested prompts
@@ -55,12 +56,14 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
         choices: async (answers) => {
             if (serviceChoices.length === 0 ||
                 previousSystemUrl !== connectValidator.validatedUrl ||
-                previousClient !== connectValidator.validatedClient) {
+                previousClient !== connectValidator.validatedClient ||
+                !(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);
                     previousSystemUrl = connectValidator.validatedUrl;
                     previousClient = connectValidator.validatedClient;
+                    previousServiceFilter = promptOptions?.serviceFilter ? [...promptOptions.serviceFilter] : undefined;
                     // Telemetry event for successful service listing using a destination
                     if (answers?.[`${types_1.promptNames.systemSelection}`]?.type === 'destination') {
                         (0, service_helper_1.sendDestinationServiceSuccessTelemetryEvent)(answers?.[`${types_1.promptNames.systemSelection}`]?.system);

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.10",
+  "version": "2.14.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -46,7 +46,6 @@
     "@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",