@sap-ux/odata-service-inquirer 2.16.6 → 2.16.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -69,7 +69,7 @@ function getAbapOnBTPSystemQuestions(promptOptions, cachedConnectedSystem) {
69
69
  (connectValidator.validity.authenticated ?? connectValidator.validity.authRequired !== true))[0]);
70
70
  }
71
71
  // Service selection prompt
72
- questions.push(...(0, service_selection_1.getSystemServiceQuestion)(connectValidator, abapOnBtpPromptNamespace, promptOptions?.serviceSelection));
72
+ questions.push(...(0, service_selection_1.getSystemServiceQuestion)(connectValidator, abapOnBtpPromptNamespace, promptOptions?.serviceSelection, promptOptions?.valueHelpDownload?.hide));
73
73
  return questions;
74
74
  }
75
75
  /**
@@ -30,8 +30,7 @@ function getAbapOnPremQuestions(promptOptions) {
30
30
  // Prompt options
31
31
  const requiredOdataVersion = promptOptions?.serviceSelection?.requiredOdataVersion;
32
32
  const questions = getAbapOnPremSystemQuestions(promptOptions?.userSystemName, connectValidator, requiredOdataVersion);
33
- questions.push(...(0, service_selection_1.getSystemServiceQuestion)(connectValidator, abapOnPremPromptNamespace, promptOptions?.serviceSelection, false // Hide value help download prompt
34
- ));
33
+ questions.push(...(0, service_selection_1.getSystemServiceQuestion)(connectValidator, abapOnPremPromptNamespace, promptOptions?.serviceSelection, promptOptions?.valueHelpDownload?.hide));
35
34
  return questions;
36
35
  }
37
36
  /**
@@ -1,13 +1,13 @@
1
1
  import type { Question } from 'inquirer';
2
- import type { ServiceSelectionPromptOptions } from '../../../../types';
2
+ import type { OdataServicePromptOptions } from '../../../../types';
3
3
  import type { ServiceAnswer } from '../service-selection/types';
4
4
  /**
5
5
  * Cloud Foundry ABAP system prompts specifically for BAS environment since it requires additional destination configuration.
6
6
  * These will call out to cf tools to discover the available abap systems and services, and create a new destination if necessary,
7
7
  * to allow apps to access these cf hosted services.
8
8
  *
9
- * @param promptOptions prompt options to control some prompt behavior see {@link ServiceSelectionPromptOptions}
9
+ * @param promptOptions prompt options to control some prompt behavior see {@link OdataServicePromptOptions}
10
10
  * @returns the prompt questions
11
11
  */
12
- export declare function getCfAbapBASQuestions(promptOptions?: ServiceSelectionPromptOptions): Question<ServiceAnswer>[];
12
+ export declare function getCfAbapBASQuestions(promptOptions?: OdataServicePromptOptions): Question<ServiceAnswer>[];
13
13
  //# sourceMappingURL=questions.d.ts.map
@@ -9,7 +9,7 @@ const questions_2 = require("../service-selection/questions");
9
9
  * These will call out to cf tools to discover the available abap systems and services, and create a new destination if necessary,
10
10
  * to allow apps to access these cf hosted services.
11
11
  *
12
- * @param promptOptions prompt options to control some prompt behavior see {@link ServiceSelectionPromptOptions}
12
+ * @param promptOptions prompt options to control some prompt behavior see {@link OdataServicePromptOptions}
13
13
  * @returns the prompt questions
14
14
  */
15
15
  function getCfAbapBASQuestions(promptOptions) {
@@ -17,8 +17,8 @@ function getCfAbapBASQuestions(promptOptions) {
17
17
  const cfAbapBasPromptNamespace = 'cfAbapBas';
18
18
  const connectionValidator = new connectionValidator_1.ConnectionValidator();
19
19
  return [
20
- ...(0, questions_1.getCFDiscoverPrompts)(connectionValidator, cfAbapBasPromptNamespace, promptOptions?.requiredOdataVersion),
21
- ...(0, questions_2.getSystemServiceQuestion)(connectionValidator, cfAbapBasPromptNamespace, promptOptions)
20
+ ...(0, questions_1.getCFDiscoverPrompts)(connectionValidator, cfAbapBasPromptNamespace, promptOptions?.serviceSelection?.requiredOdataVersion),
21
+ ...(0, questions_2.getSystemServiceQuestion)(connectionValidator, cfAbapBasPromptNamespace, promptOptions?.serviceSelection, promptOptions?.valueHelpDownload?.hide)
22
22
  ];
23
23
  }
24
24
  //# sourceMappingURL=questions.js.map
@@ -9,8 +9,8 @@ import { type ServiceAnswer } from './types';
9
9
  * @param promptNamespace - The namespace for the prompt, used to identify the prompt instance and namespaced answers.
10
10
  * This is used to avoid conflicts with other prompts of the same types.
11
11
  * @param promptOptions - Options for the service selection prompt see {@link OdataServicePromptOptions}
12
- * @param showValueHelpDownloadPrompt - If true the value help download confirm prompt will be included
12
+ * @param hideValueHelpDownloadPrompt - If true the value help download confirm prompt will be hidden (default: true)
13
13
  * @returns the service selection prompt
14
14
  */
15
- export declare function getSystemServiceQuestion(connectValidator: ConnectionValidator, promptNamespace: string, promptOptions?: ServiceSelectionPromptOptions, showValueHelpDownloadPrompt?: boolean): Question<ServiceAnswer>[];
15
+ export declare function getSystemServiceQuestion(connectValidator: ConnectionValidator, promptNamespace: string, promptOptions?: ServiceSelectionPromptOptions, hideValueHelpDownloadPrompt?: boolean): Question<ServiceAnswer>[];
16
16
  //# sourceMappingURL=questions.d.ts.map
@@ -23,10 +23,10 @@ const cliServicePromptName = 'cliServiceSelection';
23
23
  * @param promptNamespace - The namespace for the prompt, used to identify the prompt instance and namespaced answers.
24
24
  * This is used to avoid conflicts with other prompts of the same types.
25
25
  * @param promptOptions - Options for the service selection prompt see {@link OdataServicePromptOptions}
26
- * @param showValueHelpDownloadPrompt - If true the value help download confirm prompt will be included
26
+ * @param hideValueHelpDownloadPrompt - If true the value help download confirm prompt will be hidden (default: true)
27
27
  * @returns the service selection prompt
28
28
  */
29
- function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptions, showValueHelpDownloadPrompt = false) {
29
+ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptions, hideValueHelpDownloadPrompt = true) {
30
30
  let serviceChoices = [];
31
31
  // Prevent re-requesting services repeatedly by only requesting them once and when the system or client is changed
32
32
  let previousSystemUrl;
@@ -166,7 +166,7 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
166
166
  name: `${promptNamespace}:${cliServicePromptName}`
167
167
  });
168
168
  }
169
- if (showValueHelpDownloadPrompt) {
169
+ if (!hideValueHelpDownloadPrompt) {
170
170
  /**
171
171
  * Only show the value help download prompt when a service has been validated (convertedMetadata is set), is odata version v4 and is an abap connection
172
172
  */
@@ -74,15 +74,14 @@ async function getSystemSelectionQuestions(promptOptions, connectedSystem) {
74
74
  const questions = await getSystemConnectionQuestions(connectValidator, promptOptions, connectedSystem);
75
75
  // Existing system (BackendSystem or Destination) selected,
76
76
  if (!promptOptions?.serviceSelection?.hide) {
77
- questions.push(...(0, inquirer_common_1.withCondition)((0, questions_4.getSystemServiceQuestion)(connectValidator, systemSelectionPromptNamespace, promptOptions?.serviceSelection, false // Hide value help download prompt
78
- ), (answers) => answers.systemSelection?.type !== 'newSystemChoice'));
77
+ questions.push(...(0, inquirer_common_1.withCondition)((0, questions_4.getSystemServiceQuestion)(connectValidator, systemSelectionPromptNamespace, promptOptions?.serviceSelection, promptOptions?.valueHelpDownload?.hide), (answers) => answers.systemSelection?.type !== 'newSystemChoice'));
79
78
  }
80
79
  // Create new system connection for storage only supported on non-App Studio environments
81
80
  if (!(0, btp_utils_1.isAppStudio)()) {
82
81
  questions.push(...(0, inquirer_common_1.withCondition)((0, questions_3.getNewSystemQuestions)(promptOptions, connectedSystem), (answers) => answers.systemSelection?.type === 'newSystemChoice'));
83
82
  }
84
83
  else {
85
- questions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getCfAbapBASQuestions)(promptOptions?.serviceSelection), (answers) => answers.systemSelection?.type === 'cfAbapEnvService'));
84
+ questions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getCfAbapBASQuestions)(promptOptions), (answers) => answers.systemSelection?.type === 'cfAbapEnvService'));
86
85
  }
87
86
  return questions;
88
87
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@sap-ux/odata-service-inquirer",
3
3
  "description": "Prompts module that can prompt users for inputs required for odata service writing",
4
- "version": "2.16.6",
4
+ "version": "2.16.8",
5
5
  "repository": {
6
6
  "type": "git",
7
7
  "url": "https://github.com/SAP/open-ux-tools.git",
@@ -31,15 +31,15 @@
31
31
  "os-name": "4.0.1",
32
32
  "@sap-ux/axios-extension": "1.25.10",
33
33
  "@sap-ux/btp-utils": "1.1.7",
34
- "@sap-ux/fiori-generator-shared": "0.13.64",
34
+ "@sap-ux/fiori-generator-shared": "0.13.66",
35
35
  "@sap-ux/guided-answers-helper": "0.4.2",
36
- "@sap-ux/telemetry": "0.6.65",
37
- "@sap-ux/inquirer-common": "0.10.24",
36
+ "@sap-ux/telemetry": "0.6.67",
37
+ "@sap-ux/inquirer-common": "0.10.26",
38
38
  "@sap-ux/logger": "0.8.1",
39
39
  "@sap-ux/nodejs-utils": "0.2.13",
40
- "@sap-ux/project-access": "1.34.6",
41
- "@sap-ux/project-input-validator": "0.6.50",
42
- "@sap-ux/store": "1.5.4"
40
+ "@sap-ux/project-access": "1.34.7",
41
+ "@sap-ux/project-input-validator": "0.6.51",
42
+ "@sap-ux/store": "1.5.5"
43
43
  },
44
44
  "devDependencies": {
45
45
  "@sap-ux/vocabularies-types": "0.14.5",
@@ -47,12 +47,12 @@
47
47
  "@types/inquirer-autocomplete-prompt": "2.0.2",
48
48
  "@types/inquirer": "8.2.6",
49
49
  "jest-extended": "6.0.0",
50
- "@sap-ux/fiori-generator-shared": "0.13.64",
51
- "@sap-ux/fiori-elements-writer": "2.8.58",
52
- "@sap-ux/fiori-freestyle-writer": "2.5.41",
50
+ "@sap-ux/fiori-generator-shared": "0.13.66",
51
+ "@sap-ux/fiori-elements-writer": "2.8.60",
52
+ "@sap-ux/fiori-freestyle-writer": "2.5.43",
53
53
  "@sap-ux/feature-toggle": "0.3.6",
54
- "@sap-ux/odata-service-writer": "0.29.13",
55
- "@sap-ux/cap-config-writer": "0.12.55"
54
+ "@sap-ux/odata-service-writer": "0.29.14",
55
+ "@sap-ux/cap-config-writer": "0.12.57"
56
56
  },
57
57
  "engines": {
58
58
  "node": ">=20.x"