@sap-ux/odata-service-inquirer 2.9.1 → 2.9.3

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

@@ -174,7 +174,22 @@ function getCFDiscoverPrompts(connectionValidator, promptNamespace, requiredOdat
             message: (0, i18n_1.t)('prompts.cloudFoundryAbapSystem.message'),
             validate: async (abapService) => {
                 if (abapService) {
-                    return await validateCFServiceInfo(abapService, connectionValidator, requiredOdataVersion, (0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli, cachedConnectedSystem);
+                    const valResult = await validateCFServiceInfo(abapService, connectionValidator, requiredOdataVersion, (0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli, cachedConnectedSystem);
+                    // If the system exists already stop progress
+                    if (!(0, btp_utils_1.isAppStudio)() && valResult === true && connectionValidator.validatedUrl) {
+                        const existingBackend = (0, utils_1.isBackendSystemKeyExisting)(utils_1.PromptState.backendSystemsCache, connectionValidator.validatedUrl, connectionValidator.validatedClient);
+                        if (existingBackend) {
+                            // Invalidate the connection to prevent service selection
+                            // This is a temp workaround until multiple systems with the same url/client key is supported
+                            // This is necessary since the ServiceInstanceInfo does not include url/client information
+                            connectionValidator.resetConnectionState(true);
+                            // Cannot create a new store system with the same key
+                            return (0, i18n_1.t)('prompts.validationMessages.backendSystemExistsWarning', {
+                                backendName: existingBackend.name
+                            });
+                        }
+                    }
+                    return valResult;
                 }
                 const errorType = prompt_helpers_1.errorHandler.getCurrentErrorType();
                 if (errorType === inquirer_common_1.ERROR_TYPE.NO_ABAP_ENVS) {

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

@@ -47,7 +47,7 @@ function getAbapOnPremSystemQuestions(systemNamePromptOptions, connectionValidat
     // This allows re-usability of the credentials prompts where a client prompt was not used (client was loaded from store).
     const sapClientRef = { sapClient: undefined, isValid: true };
     const questions = [
-        (0, shared_prompts_1.getSystemUrlQuestion)(connectValidator, abapOnPremPromptNamespace, requiredOdataVersion),
+        (0, shared_prompts_1.getSystemUrlQuestion)(connectValidator, abapOnPremPromptNamespace, requiredOdataVersion, undefined, false),
         {
             type: 'input',
             name: abapOnPremPromptNames.sapClient,
@@ -55,11 +55,20 @@ function getAbapOnPremSystemQuestions(systemNamePromptOptions, connectionValidat
             guiOptions: {
                 breadcrumb: (0, i18n_1.t)('prompts.sapClient.breadcrumb')
             },
-            validate: (client) => {
+            validate: (client, prevAnswers) => {
                 const valRes = (0, project_input_validator_1.validateClient)(client);
                 if (valRes === true) {
                     sapClientRef.sapClient = client;
                     sapClientRef.isValid = true;
+                    // If we also have a system url, warn about existing stored system overwrite
+                    if (prevAnswers?.[systemUrlPromptName]) {
+                        const existingBackend = (0, utils_1.isBackendSystemKeyExisting)(utils_1.PromptState.backendSystemsCache, prevAnswers[systemUrlPromptName], client);
+                        if (existingBackend) {
+                            return (0, i18n_1.t)('prompts.validationMessages.backendSystemExistsWarning', {
+                                backendName: existingBackend.name
+                            });
+                        }
+                    }
                     return true;
                 }
                 sapClientRef.sapClient = undefined;

package/dist/prompts/datasources/sap-system/shared-prompts/shared-prompts.d.ts

@@ -14,9 +14,10 @@ import { type NewSystemAnswers } from '../new-system/types';
  * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
  * @param requiredOdataVersion The required OData version for the system connection, only catalogs supporting the specifc odata version will be used.
  * @param cachedConnectedSystem An existing connection may be passed which will prevent reauthentication
+ * @param showExistingSystemWarning if the url exists in secure store a validation message will be returned
  * @returns the system url prompt
  */
-export declare function getSystemUrlQuestion<T extends Answers>(connectValidator: ConnectionValidator, promptNamespace?: string, requiredOdataVersion?: OdataVersion, cachedConnectedSystem?: ConnectedSystem): InputQuestion<T>;
+export declare function getSystemUrlQuestion<T extends Answers>(connectValidator: ConnectionValidator, promptNamespace?: string, requiredOdataVersion?: OdataVersion, cachedConnectedSystem?: ConnectedSystem, showExistingSystemWarning?: boolean): InputQuestion<T>;
 /**
  * Get a prompt for new system name.
  *

package/dist/prompts/datasources/sap-system/shared-prompts/shared-prompts.js

@@ -36,9 +36,10 @@ function systemAuthTypeToAuthenticationType(systemAuthType) {
  * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
  * @param requiredOdataVersion The required OData version for the system connection, only catalogs supporting the specifc odata version will be used.
  * @param cachedConnectedSystem An existing connection may be passed which will prevent reauthentication
+ * @param showExistingSystemWarning if the url exists in secure store a validation message will be returned
  * @returns the system url prompt
  */
-function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVersion, cachedConnectedSystem) {
+function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVersion, cachedConnectedSystem, showExistingSystemWarning = true) {
     const promptName = `${promptNamespace ? promptNamespace + ':' : ''}${types_2.newSystemPromptNames.newSystemUrl}`;
     const newSystemUrlQuestion = {
         type: 'input',
@@ -58,7 +59,7 @@ function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVe
                 cachedConnectedSystem.backendSystem?.authenticationType === 'reentranceTicket') {
                 connectValidator.setConnectedSystem(cachedConnectedSystem);
             }
-            else {
+            else if (showExistingSystemWarning) {
                 const existingBackend = (0, utils_1.isBackendSystemKeyExisting)(utils_1.PromptState.backendSystemsCache, url);
                 if (existingBackend) {
                     // Not a cached connection so re-validate as new backend system entry

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.9.1",
+  "version": "2.9.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -31,15 +31,15 @@
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.23.0",
     "@sap-ux/btp-utils": "1.1.4",
-    "@sap-ux/fiori-generator-shared": "0.13.24",
+    "@sap-ux/fiori-generator-shared": "0.13.25",
     "@sap-ux/guided-answers-helper": "0.4.0",
-    "@sap-ux/telemetry": "0.6.29",
-    "@sap-ux/inquirer-common": "0.8.1",
+    "@sap-ux/telemetry": "0.6.30",
+    "@sap-ux/inquirer-common": "0.8.2",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/nodejs-utils": "0.2.7",
     "@sap-ux/project-access": "1.32.4",
     "@sap-ux/project-input-validator": "0.6.26",
-    "@sap-ux/store": "1.2.0"
+    "@sap-ux/store": "1.2.1"
   },
   "devDependencies": {
     "@sap-ux/vocabularies-types": "0.13.0",
@@ -48,12 +48,12 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "6.0.0",
-    "@sap-ux/fiori-generator-shared": "0.13.24",
-    "@sap-ux/fiori-elements-writer": "2.7.25",
-    "@sap-ux/fiori-freestyle-writer": "2.4.52",
+    "@sap-ux/fiori-generator-shared": "0.13.25",
+    "@sap-ux/fiori-elements-writer": "2.7.26",
+    "@sap-ux/fiori-freestyle-writer": "2.4.53",
     "@sap-ux/feature-toggle": "0.3.2",
     "@sap-ux/odata-service-writer": "0.27.25",
-    "@sap-ux/cap-config-writer": "0.12.15"
+    "@sap-ux/cap-config-writer": "0.12.16"
   },
   "engines": {
     "node": ">=20.x"