@sap-ux/abap-deploy-config-sub-generator 0.2.33 → 0.3.0
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.
- package/generators/app/index.js +2 -0
- package/generators/app/questions.js +14 -4
- package/package.json +11 -11
package/generators/app/index.js
CHANGED
|
@@ -180,6 +180,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
|
|
|
180
180
|
this.answers.destination = this.options.destination || this.answers.destination;
|
|
181
181
|
this.answers.url =
|
|
182
182
|
this.options.url || this.answers.url || (await (0, utils_1.determineUrlFromDestination)(this.answers.destination));
|
|
183
|
+
this.answers.connectPath = this.options.connectPath || this.answers.connectPath;
|
|
183
184
|
this.answers.client = this.options.client || this.answers.client;
|
|
184
185
|
this.answers.scp =
|
|
185
186
|
this.options.scp ||
|
|
@@ -250,6 +251,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
|
|
|
250
251
|
await (0, abap_deploy_config_writer_1.generate)(this.destinationPath(), {
|
|
251
252
|
target: {
|
|
252
253
|
url: this.answers.url,
|
|
254
|
+
connectPath: this.answers.connectPath,
|
|
253
255
|
client: this.answers.client,
|
|
254
256
|
scp: this.answers.scp,
|
|
255
257
|
destination: this.answers.destination,
|
|
@@ -17,14 +17,22 @@ const types_1 = require("./types");
|
|
|
17
17
|
* @returns - the ABAP target
|
|
18
18
|
*/
|
|
19
19
|
function getAbapTarget(destination, backendSystem, existingAbapDeployTask, backendConfig) {
|
|
20
|
-
let url, scp, client, destinationName, authenticationType;
|
|
20
|
+
let url, scp, client, destinationName, authenticationType, connectPath;
|
|
21
21
|
if ((0, btp_utils_1.isAppStudio)() && destination) {
|
|
22
22
|
// the destination used during app generation
|
|
23
23
|
destinationName = destination.Name;
|
|
24
24
|
}
|
|
25
25
|
else if (backendSystem) {
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
try {
|
|
27
|
+
const urlFromSystem = new URL(backendSystem.url);
|
|
28
|
+
// the backend system used during app generation
|
|
29
|
+
url = urlFromSystem.origin;
|
|
30
|
+
connectPath = urlFromSystem.pathname === '/' ? undefined : urlFromSystem.pathname;
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
// If URL parsing fails, use the URL as-is
|
|
34
|
+
url = backendSystem.url;
|
|
35
|
+
}
|
|
28
36
|
client = backendSystem.client;
|
|
29
37
|
scp = !!backendSystem.serviceKeys;
|
|
30
38
|
authenticationType = backendSystem.authenticationType;
|
|
@@ -40,6 +48,7 @@ function getAbapTarget(destination, backendSystem, existingAbapDeployTask, backe
|
|
|
40
48
|
else if (backendConfig) {
|
|
41
49
|
// the existing base configuration (ui5.yaml)
|
|
42
50
|
url = backendConfig.url;
|
|
51
|
+
connectPath = backendConfig.connectPath;
|
|
43
52
|
scp = backendConfig.scp;
|
|
44
53
|
client = backendConfig.client;
|
|
45
54
|
authenticationType = backendConfig.authenticationType;
|
|
@@ -50,7 +59,8 @@ function getAbapTarget(destination, backendSystem, existingAbapDeployTask, backe
|
|
|
50
59
|
scp,
|
|
51
60
|
client: client || '', // Needs to default to empty string
|
|
52
61
|
destination: destinationName,
|
|
53
|
-
authenticationType
|
|
62
|
+
authenticationType,
|
|
63
|
+
connectPath
|
|
54
64
|
};
|
|
55
65
|
}
|
|
56
66
|
/**
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"url": "https://github.com/SAP/open-ux-tools.git",
|
|
7
7
|
"directory": "packages/abap-deploy-config-sub-generator"
|
|
8
8
|
},
|
|
9
|
-
"version": "0.
|
|
9
|
+
"version": "0.3.0",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"main": "generators/app/index.js",
|
|
12
12
|
"files": [
|
|
@@ -21,16 +21,16 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"i18next": "25.8.18",
|
|
23
23
|
"@sap-devx/yeoman-ui-types": "1.22.0",
|
|
24
|
-
"@sap-ux/abap-deploy-config-inquirer": "1.
|
|
24
|
+
"@sap-ux/abap-deploy-config-inquirer": "1.8.0",
|
|
25
|
+
"@sap-ux/abap-deploy-config-writer": "0.3.0",
|
|
25
26
|
"@sap-ux/btp-utils": "1.1.10",
|
|
26
|
-
"@sap-ux/
|
|
27
|
-
"@sap-ux/deploy-config-generator-shared": "0.1.106",
|
|
27
|
+
"@sap-ux/deploy-config-generator-shared": "0.1.107",
|
|
28
28
|
"@sap-ux/feature-toggle": "0.3.7",
|
|
29
|
-
"@sap-ux/fiori-generator-shared": "0.13.
|
|
29
|
+
"@sap-ux/fiori-generator-shared": "0.13.88",
|
|
30
30
|
"@sap-ux/logger": "0.8.2",
|
|
31
|
-
"@sap-ux/project-access": "1.35.
|
|
32
|
-
"@sap-ux/ui5-config": "0.
|
|
33
|
-
"@sap-ux/adp-tooling": "0.18.
|
|
31
|
+
"@sap-ux/project-access": "1.35.14",
|
|
32
|
+
"@sap-ux/ui5-config": "0.30.0",
|
|
33
|
+
"@sap-ux/adp-tooling": "0.18.97",
|
|
34
34
|
"@sap-ux/axios-extension": "1.25.24"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
"mem-fs-editor": "9.4.0",
|
|
42
42
|
"unionfs": "4.4.0",
|
|
43
43
|
"yeoman-test": "6.3.0",
|
|
44
|
-
"@sap-ux/
|
|
45
|
-
"@sap-ux/
|
|
46
|
-
"@sap-ux/
|
|
44
|
+
"@sap-ux/store": "1.5.10",
|
|
45
|
+
"@sap-ux/system-access": "0.7.0",
|
|
46
|
+
"@sap-ux/telemetry": "0.6.88"
|
|
47
47
|
},
|
|
48
48
|
"scripts": {
|
|
49
49
|
"build": "tsc --build",
|