@sap-ux/odata-service-inquirer 2.2.3 → 2.2.5

package/dist/prompts/datasources/sap-system/abap-on-btp/questions.js

@@ -87,6 +87,7 @@ function getAbapOnBTPSystemQuestions(promptOptions) {
  * @returns true if the service info is valid, a validation message if the service info is invalid, or a validation link if the service info is not validated but some help is available
  */
 async function validateCFServiceInfo(abapService, connectionValidator, requiredOdataVersion, isCli = false) {
+    utils_1.PromptState.resetConnectedSystem();
     const cfAbapServiceName = abapService.label;
     const uaaCreds = await (0, cf_tools_1.apiGetInstanceCredentials)(cfAbapServiceName); // should be abapService.serviceName in BAS?
     if (!uaaCreds?.credentials?.uaa) {
@@ -122,6 +123,9 @@ async function validateCFServiceInfo(abapService, connectionValidator, requiredO
     if (connectionValidator.serviceProvider && (0, utils_1.getPromptHostEnvironment)() !== fiori_generator_shared_1.hostEnvironment.bas) {
         // Connected system name is only used for VSCode as a default stored system name
         connectionValidator.connectedSystemName = await (0, btp_utils_1.generateABAPCloudDestinationName)(cfAbapServiceName);
+        utils_1.PromptState.odataService.connectedSystem = {
+            serviceProvider: connectionValidator.serviceProvider
+        };
     }
     return true;
 }
@@ -203,6 +207,7 @@ function getServiceKeyPrompt(connectionValidator) {
             mandatory: true
         },
         validate: async (keyPath) => {
+            utils_1.PromptState.resetConnectedSystem();
             const serviceKeyValResult = (0, validators_1.validateServiceKey)(keyPath);
             if (typeof serviceKeyValResult === 'string' || typeof serviceKeyValResult === 'boolean') {
                 return serviceKeyValResult;

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

@@ -77,6 +77,7 @@ function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVe
             breadcrumb: true
         },
         validate: async (url) => {
+            utils_1.PromptState.resetConnectedSystem();
             const valResult = await connectValidator.validateUrl(url, {
                 isSystem: true,
                 odataVersion: (0, utils_1.convertODataVersionType)(requiredOdataVersion)

package/dist/prompts/datasources/sap-system/system-selection/prompt-helpers.js

@@ -30,6 +30,7 @@ exports.CfAbapEnvServiceChoice = 'cfAbapEnvService';
  */
 async function connectWithBackendSystem(backendSystem, connectionValidator, requiredOdataVersion) {
     // Create a new connection with the selected system
+    utils_1.PromptState.resetConnectedSystem();
     let connectValResult = false;
     if (backendSystem) {
         // Assumption: non-BAS systems are BackendSystems
@@ -80,6 +81,7 @@ async function connectWithBackendSystem(backendSystem, connectionValidator, requ
  * @returns the validation result of the destination connection attempt
  */
 async function connectWithDestination(destination, connectionValidator, requiredOdataVersion, addServicePath) {
+    utils_1.PromptState.resetConnectedSystem();
     const { valResult: connectValResult, errorType } = await connectionValidator.validateDestination(destination, (0, utils_1.convertODataVersionType)(requiredOdataVersion), addServicePath);
     // If authentication failed with an auth error, and the system connection auth type is basic, we will defer validation to the credentials prompt.
     if (errorType === inquirer_common_1.ERROR_TYPE.AUTH && connectionValidator.systemAuthType === 'basic') {

package/dist/utils/prompt-state.d.ts

@@ -9,5 +9,6 @@ export declare class PromptState {
     static odataService: Partial<OdataServiceAnswers>;
     static isYUI: boolean;
     static reset(): void;
+    static resetConnectedSystem(): void;
 }
 //# sourceMappingURL=prompt-state.d.ts.map

package/dist/utils/prompt-state.js

@@ -16,6 +16,9 @@ class PromptState {
             PromptState.odataService[key] = undefined;
         });
     }
+    static resetConnectedSystem() {
+        PromptState.odataService.connectedSystem = undefined;
+    }
 }
 exports.PromptState = PromptState;
 //# sourceMappingURL=prompt-state.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.2.3",
+  "version": "2.2.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,12 +30,12 @@
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.18.5",
     "@sap-ux/btp-utils": "1.0.1",
-    "@sap-ux/fiori-generator-shared": "0.7.28",
+    "@sap-ux/fiori-generator-shared": "0.7.29",
     "@sap-ux/guided-answers-helper": "0.2.1",
-    "@sap-ux/telemetry": "0.5.60",
-    "@sap-ux/inquirer-common": "0.6.15",
+    "@sap-ux/telemetry": "0.5.61",
+    "@sap-ux/inquirer-common": "0.6.16",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/project-access": "1.29.6",
+    "@sap-ux/project-access": "1.29.7",
     "@sap-ux/project-input-validator": "0.3.4",
     "@sap-ux/store": "1.0.0"
   },
@@ -46,12 +46,12 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
-    "@sap-ux/fiori-generator-shared": "0.7.28",
-    "@sap-ux/fiori-elements-writer": "2.1.8",
-    "@sap-ux/fiori-freestyle-writer": "2.0.14",
+    "@sap-ux/fiori-generator-shared": "0.7.29",
+    "@sap-ux/fiori-elements-writer": "2.1.11",
+    "@sap-ux/fiori-freestyle-writer": "2.0.15",
     "@sap-ux/feature-toggle": "0.2.3",
-    "@sap-ux/odata-service-writer": "0.25.9",
-    "@sap-ux/cap-config-writer": "0.9.7"
+    "@sap-ux/odata-service-writer": "0.25.10",
+    "@sap-ux/cap-config-writer": "0.9.8"
   },
   "engines": {
     "node": ">=18.x"