@sap-ux/odata-service-inquirer 0.5.35 → 0.5.37

package/dist/prompts/connectionValidator.d.ts

@@ -75,6 +75,12 @@ export declare class ConnectionValidator {
      * @returns the validated url
      */
     get validatedUrl(): string | undefined;
+    /**
+     * Get the validated client code. This is the client code that has been successfully validated by a request.
+     *
+     * @returns the validated client code
+     */
+    get validatedClient(): string | undefined;
     /**
      * Get the service info used to connect to the system.
      *

package/dist/prompts/connectionValidator.js

@@ -95,6 +95,14 @@ class ConnectionValidator {
     get validatedUrl() {
         return this._validatedUrl;
     }
+    /**
+     * Get the validated client code. This is the client code that has been successfully validated by a request.
+     *
+     * @returns the validated client code
+     */
+    get validatedClient() {
+        return this._validatedClient;
+    }
     /**
      * Get the service info used to connect to the system.
      *
@@ -252,7 +260,6 @@ class ConnectionValidator {
         this._connectedUserName = undefined;
         this._refreshToken = undefined;
         this._connectedSystemName = undefined;
-        this.resetValidity();
     }
     /**
      * Create the connection for a system url, the specified axios config or the specified service info.

package/dist/prompts/datasources/sap-system/new-system/questions.js

@@ -132,7 +132,7 @@ function getUserSystemNameQuestion(connectValidator, promptNamespace) {
         default: async () => {
             const systemName = connectValidator.connectedSystemName;
             if (systemName && !userModifiedSystemName) {
-                defaultSystemName = await (0, prompt_helpers_1.suggestSystemName)(systemName, connectValidator.axiosConfig?.params?.sapClient);
+                defaultSystemName = await (0, prompt_helpers_1.suggestSystemName)(systemName, connectValidator.validatedClient);
                 return defaultSystemName;
             }
             return defaultSystemName;
@@ -158,7 +158,7 @@ function getUserSystemNameQuestion(connectValidator, promptNamespace) {
                         authenticationType: systemAuthTypeToAuthenticationType(connectValidator.systemAuthType),
                         name: systemName,
                         url: connectValidator.validatedUrl,
-                        client: connectValidator.axiosConfig?.params?.[types_1.SAP_CLIENT_KEY],
+                        client: connectValidator.validatedClient,
                         username: connectValidator.axiosConfig?.auth?.username,
                         password: connectValidator.axiosConfig?.auth?.password,
                         serviceKeys: connectValidator.serviceInfo,
@@ -199,8 +199,9 @@ exports.getSelectedServiceLabel = getSelectedServiceLabel;
  */
 function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptions) {
     let serviceChoices = [];
-    // Prevent re-requesting services repeatedly by only requesting them once and when the system is changed
+    // Prevent re-requesting services repeatedly by only requesting them once and when the system or client is changed
     let previousSystemUrl;
+    let previousClient;
     let previousService;
     const requiredOdataVersion = promptOptions?.serviceSelection?.requiredOdataVersion;
     const newSystemServiceQuestion = {
@@ -215,7 +216,9 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
         },
         source: (prevAnswers, input) => (0, inquirer_common_1.searchChoices)(input, serviceChoices),
         choices: async () => {
-            if (serviceChoices.length === 0 || previousSystemUrl !== connectValidator.validatedUrl) {
+            if (serviceChoices.length === 0 ||
+                previousSystemUrl !== connectValidator.validatedUrl ||
+                previousClient !== connectValidator.validatedClient) {
                 let catalogs = [];
                 if (requiredOdataVersion && connectValidator.catalogs[requiredOdataVersion]) {
                     catalogs.push(connectValidator.catalogs[requiredOdataVersion]);
@@ -224,6 +227,7 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
                     catalogs = Object.values(connectValidator.catalogs).filter((cat) => cat !== undefined);
                 }
                 previousSystemUrl = connectValidator.validatedUrl;
+                previousClient = connectValidator.validatedClient;
                 serviceChoices = await (0, service_helper_1.getServiceChoices)(catalogs);
             }
             return serviceChoices;

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": "0.5.35",
+  "version": "0.5.37",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,10 +29,10 @@
     "@sap-ux/axios-extension": "1.16.5",
     "@sap-ux/btp-utils": "0.15.2",
     "@sap-ux/guided-answers-helper": "0.0.2",
-    "@sap-ux/telemetry": "0.5.26",
+    "@sap-ux/telemetry": "0.5.27",
     "@sap-ux/inquirer-common": "0.4.6",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/project-access": "1.27.0",
+    "@sap-ux/project-access": "1.27.1",
     "@sap-ux/project-input-validator": "0.3.3",
     "@sap-ux/store": "0.9.1"
   },
@@ -43,7 +43,7 @@
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
     "lodash": "4.17.21",
-    "@sap-ux/odata-service-writer": "0.22.4",
+    "@sap-ux/odata-service-writer": "0.22.5",
     "@sap-ux/feature-toggle": "0.2.0"
   },
   "engines": {