Skip to content

Commit cb35e17

Browse files
devineadevinea
committed
Merge remote-tracking branch 'origin/main' into mcp_improve_enabling_chart_on_list_v4
* origin/main: chore: apply latest changesets feat(fpm-writer): table building block custom columns (#3665) chore: apply latest changesets fix: Project type appears twice under system and password prompts when cloud system is selected. (#3706) chore: apply latest changesets fix(adp)(vscode): SAP Fiori Launchpad Configuration step appears multiple times. (#3683) chore: apply latest changesets update axios version (#3732) chore: apply latest changesets fix(fiori-annotation-api): wrong origin range (#3729) chore: apply latest changesets TBI - Replace service key (UAA/OAuth2) based connections with re-entrance tickets (#3693) chore: apply latest changesets fix: smartlinks target prompt (#3643) chore: apply latest changesets feat: Add ADP Generator Cloud Foundry prompting code (#3518)
2 parents eba8f08 + 63ddf87 commit cb35e17

File tree

256 files changed

+12777
-1605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+12777
-1605
lines changed

‎examples/fe-fpm-cli/CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# @sap-ux/fe-fpm-cli
22

3+
## 0.1.46
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [43dc48c]
8+
- @sap-ux/fe-fpm-writer@0.39.8
9+
10+
## 0.1.45
11+
12+
### Patch Changes
13+
14+
- @sap-ux/fe-fpm-writer@0.39.7
15+
316
## 0.1.44
417

518
### Patch Changes

‎examples/fe-fpm-cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux/fe-fpm-cli",
3-
"version": "0.1.44",
3+
"version": "0.1.46",
44
"description": "A simple CLI to prompt required information to create a building block using the fe-fpm-writer module's prompt and generate functions.",
55
"license": "Apache-2.0",
66
"private": true,

‎examples/odata-cli/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @sap-ux/odata-cli
22

3+
## 0.17.16
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [bacaf93]
8+
- @sap-ux/axios-extension@1.23.0
9+
310
## 0.17.15
411

512
### Patch Changes

‎examples/odata-cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux/odata-cli",
3-
"version": "0.17.15",
3+
"version": "0.17.16",
44
"description": "Simple example CLI uing the @sap-ux/axios-extension module to fetch metadata and annotations from an SAP system.",
55
"license": "Apache-2.0",
66
"private": true,

‎examples/simple-generator/CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# @sap-ux/generator-simple-fe
22

3+
## 1.1.91
4+
5+
### Patch Changes
6+
7+
- @sap-ux/fiori-elements-writer@2.7.22
8+
9+
## 1.1.90
10+
11+
### Patch Changes
12+
13+
- @sap-ux/fiori-elements-writer@2.7.21
14+
15+
## 1.1.89
16+
17+
### Patch Changes
18+
19+
- Updated dependencies [bacaf93]
20+
- @sap-ux/axios-extension@1.23.0
21+
- @sap-ux/system-access@0.6.20
22+
- @sap-ux/fiori-elements-writer@2.7.20
23+
- @sap-ux/fiori-freestyle-writer@2.4.51
24+
325
## 1.1.88
426

527
### Patch Changes

‎examples/simple-generator/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux/generator-simple-fe",
3-
"version": "1.1.88",
3+
"version": "1.1.91",
44
"description": "Simple example of a yeoman generator for Fiori elements.",
55
"license": "Apache-2.0",
66
"private": true,

‎packages/abap-deploy-config-inquirer/CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# @sap-ux/abap-deploy-config-inquirer
22

3+
## 1.6.29
4+
5+
### Patch Changes
6+
7+
- bacaf93: Connections to Abap cloud will always use re-entrance tickets instead of UAA/OAuth2
8+
- Updated dependencies [bacaf93]
9+
- @sap-ux/axios-extension@1.23.0
10+
- @sap-ux/store@1.2.0
11+
- @sap-ux/fiori-generator-shared@0.13.23
12+
- @sap-ux/system-access@0.6.20
13+
- @sap-ux/ui5-config@0.29.8
14+
- @sap-ux/inquirer-common@0.7.51
15+
316
## 1.6.28
417

518
### Patch Changes

‎packages/abap-deploy-config-inquirer/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"url": "https://github.com/SAP/open-ux-tools.git",
77
"directory": "packages/abap-deploy-config-inquirer"
88
},
9-
"version": "1.6.28",
9+
"version": "1.6.29",
1010
"license": "Apache-2.0",
1111
"main": "dist/index.js",
1212
"scripts": {

‎packages/abap-deploy-config-inquirer/src/prompts/conditions.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export function showScpQuestion(previousAnswers: AbapDeployConfigAnswersInternal
6060
*/
6161
function showClientCondition(scp?: boolean): boolean {
6262
return Boolean(
63-
!isAppStudio() && !PromptState.abapDeployConfig?.isS4HC && !scp && !PromptState.abapDeployConfig?.scp
63+
!isAppStudio() && !PromptState.abapDeployConfig?.isAbapCloud && !scp && !PromptState.abapDeployConfig?.scp
6464
);
6565
}
6666

@@ -142,7 +142,7 @@ export function showUi5AppDeployConfigQuestion(ui5AbapPromptOptions?: UI5AbapRep
142142
!ui5AbapPromptOptions?.hide &&
143143
ui5AbapPromptOptions?.hideIfOnPremise &&
144144
!PromptState.abapDeployConfig?.scp &&
145-
!PromptState.abapDeployConfig?.isS4HC
145+
!PromptState.abapDeployConfig?.isAbapCloud
146146
) {
147147
return false;
148148
}
@@ -238,7 +238,7 @@ function defaultOrShowTransportQuestion(): boolean {
238238
export function showTransportInputChoice(options?: TransportInputChoicePromptOptions): boolean {
239239
if (
240240
options?.hideIfOnPremise === true &&
241-
!PromptState.abapDeployConfig?.isS4HC &&
241+
!PromptState.abapDeployConfig?.isAbapCloud &&
242242
!PromptState.abapDeployConfig?.scp
243243
) {
244244
return false;
@@ -276,7 +276,7 @@ export function defaultOrShowTransportListQuestion(
276276
return (
277277
transportInputChoice === TransportChoices.ListExistingChoice &&
278278
!isTransportListEmpty(PromptState.transportAnswers.transportList) &&
279-
!(transportInputChoiceOptions?.hideIfOnPremise === true && PromptState?.abapDeployConfig?.isS4HC === false)
279+
!(transportInputChoiceOptions?.hideIfOnPremise === true && PromptState?.abapDeployConfig?.isAbapCloud === false)
280280
);
281281
}
282282

@@ -311,7 +311,8 @@ export function defaultOrShowManualTransportQuestion(
311311
return (
312312
defaultOrShowTransportQuestion() &&
313313
(transportInputChoice === TransportChoices.EnterManualChoice ||
314-
(transportInputChoiceOptions?.hideIfOnPremise === true && PromptState?.abapDeployConfig?.isS4HC === false))
314+
(transportInputChoiceOptions?.hideIfOnPremise === true &&
315+
PromptState?.abapDeployConfig?.isAbapCloud === false))
315316
);
316317
}
317318

‎packages/abap-deploy-config-inquirer/src/prompts/helpers.ts‎

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
} from '../types';
1818
import { AuthenticationType, type BackendSystem } from '@sap-ux/store';
1919
import type { ChoiceOptions, ListChoiceOptions } from 'inquirer';
20-
import { getSystemDisplayName } from '@sap-ux/fiori-generator-shared';
20+
import { getBackendSystemDisplayName, getSystemDisplayName } from '@sap-ux/fiori-generator-shared';
2121
import type { AbapServiceProvider } from '@sap-ux/axios-extension';
2222

2323
/**
@@ -40,32 +40,6 @@ function getDestinationChoices(destinations: Destinations = {}): AbapSystemChoic
4040
return systemChoices;
4141
}
4242

43-
/**
44-
* Returns the display name for the backend system.
45-
*
46-
* @param options options for display name
47-
* @param options.backendSystem backend system
48-
* @param options.includeUserName include user name in the display name
49-
* @returns backend display name
50-
*/
51-
function getBackendDisplayName({
52-
backendSystem,
53-
includeUserName = true
54-
}: {
55-
backendSystem: BackendSystem;
56-
includeUserName?: boolean;
57-
}): string {
58-
const userDisplayName = includeUserName && backendSystem.userDisplayName ? `${backendSystem.userDisplayName}` : '';
59-
const systemDisplayName = getSystemDisplayName(
60-
backendSystem.name,
61-
userDisplayName,
62-
!!backendSystem.serviceKeys,
63-
backendSystem.authenticationType === AuthenticationType.ReentranceTicket
64-
);
65-
66-
return systemDisplayName;
67-
}
68-
6943
/**
7044
* Returns a list of backend system choices.
7145
*
@@ -102,12 +76,12 @@ async function getBackendTargetChoices(
10276
}
10377
return {
10478
name: isDefault
105-
? `${getBackendDisplayName({ backendSystem: system })} (Source system)`
106-
: getBackendDisplayName({ backendSystem: system }) ?? '',
79+
? `${getBackendSystemDisplayName(system)} (Source system)`
80+
: getBackendSystemDisplayName(system) ?? '',
10781
value: system.url,
10882
isDefault,
109-
scp: !!system.serviceKeys,
110-
isS4HC: system.authenticationType === AuthenticationType.ReentranceTicket,
83+
scp: !!system.serviceKeys, // legacy service key store entries
84+
isAbapCloud: system.authenticationType === AuthenticationType.ReentranceTicket,
11185
client: system.client
11286
};
11387
});
@@ -123,13 +97,14 @@ async function getBackendTargetChoices(
12397
name: `${getSystemDisplayName(
12498
systemName,
12599
user,
126-
target.scp,
127-
target.authenticationType === AuthenticationType.ReentranceTicket
100+
target.scp || target.authenticationType === AuthenticationType.ReentranceTicket
101+
? 'ABAPCloud'
102+
: undefined // scp is retained for legacy apps yamls that contain this value
128103
)} (Source system)`,
129104
value: target.url,
130105
isDefault: true,
131106
scp: target.scp,
132-
isS4HC: target.authenticationType === AuthenticationType.ReentranceTicket,
107+
isAbapCloud: target.authenticationType === AuthenticationType.ReentranceTicket,
133108
client: target.client
134109
});
135110
}

0 commit comments

Comments
 (0)