Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into fix/semanticDateMissingEnt…
Browse files Browse the repository at this point in the history
…itySetInChange
  • Loading branch information
nahmed22 committed Jan 29, 2025
2 parents 8491e39 + 827d9e4 commit 47fa44e
Show file tree
Hide file tree
Showing 427 changed files with 32,615 additions and 5,312 deletions.
5 changes: 0 additions & 5 deletions .changeset/tidy-frogs-joke.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
- name: Upload playwright reports
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: playwright-reports-os-${{ matrix.os }}-node-version-${{ matrix.node-version }}
path: |
Expand Down
31 changes: 31 additions & 0 deletions examples/fe-fpm-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
# @sap-ux/fe-fpm-cli

## 0.0.55

### Patch Changes

- Updated dependencies [e6f42df]
- @sap-ux/fe-fpm-writer@0.32.0

## 0.0.54

### Patch Changes

- @sap-ux/fe-fpm-writer@0.31.27

## 0.0.53

### Patch Changes

- @sap-ux/fe-fpm-writer@0.31.26

## 0.0.52

### Patch Changes

- @sap-ux/fe-fpm-writer@0.31.25

## 0.0.51

### Patch Changes

- @sap-ux/fe-fpm-writer@0.31.24

## 0.0.50

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion examples/fe-fpm-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sap-ux/fe-fpm-cli",
"version": "0.0.50",
"version": "0.0.55",
"description": "A simple CLI to prompt required information to create a building block using the fe-fpm-writer module's prompt and generate functions.",
"license": "Apache-2.0",
"private": true,
Expand Down
15 changes: 15 additions & 0 deletions examples/odata-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# @sap-ux/odata-cli

## 0.16.3

### Patch Changes

- Updated dependencies [df2d965]
- @sap-ux/btp-utils@0.18.0
- @sap-ux/axios-extension@1.18.3

## 0.16.2

### Patch Changes

- Updated dependencies [e516306]
- @sap-ux/axios-extension@1.18.2

## 0.16.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion examples/odata-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sap-ux/odata-cli",
"version": "0.16.1",
"version": "0.16.3",
"description": "Simple example CLI uing the @sap-ux/axios-extension module to fetch metadata and annotations from an SAP system.",
"license": "Apache-2.0",
"private": true,
Expand Down
118 changes: 118 additions & 0 deletions examples/simple-generator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,123 @@
# @sap-ux/generator-simple-fe

## 1.0.116

### Patch Changes

- Updated dependencies [df2d965]
- @sap-ux/btp-utils@0.18.0
- @sap-ux/axios-extension@1.18.3
- @sap-ux/system-access@0.5.28
- @sap-ux/fiori-elements-writer@2.0.6
- @sap-ux/fiori-freestyle-writer@2.0.5

## 1.0.115

### Patch Changes

- @sap-ux/fiori-elements-writer@2.0.5
- @sap-ux/fiori-freestyle-writer@2.0.4

## 1.0.114

### Patch Changes

- Updated dependencies [d6b7440]
- @sap-ux/fiori-freestyle-writer@2.0.3
- @sap-ux/fiori-elements-writer@2.0.4

## 1.0.113

### Patch Changes

- @sap-ux/fiori-elements-writer@2.0.3

## 1.0.112

### Patch Changes

- Updated dependencies [e516306]
- @sap-ux/axios-extension@1.18.2
- @sap-ux/system-access@0.5.27

## 1.0.111

### Patch Changes

- @sap-ux/axios-extension@1.18.1
- @sap-ux/system-access@0.5.26
- @sap-ux/fiori-elements-writer@2.0.2
- @sap-ux/fiori-freestyle-writer@2.0.2

## 1.0.110

### Patch Changes

- @sap-ux/fiori-elements-writer@2.0.1
- @sap-ux/fiori-freestyle-writer@2.0.1
- @sap-ux/axios-extension@1.18.1
- @sap-ux/system-access@0.5.26

## 1.0.109

### Patch Changes

- 77b0800: Adds support for entity related prompting. Update some exported types `fiori-elements-writer`, `fiori-freestyle-writer` to remove problematic enum usage.
The major version updates for modules `@sap-ux/fiori-elements-writer` and `@sap-ux/fiori-freestyle-writer` indicates a breaking change of type definitions:

`@sap-ux/fiori-elements-writer`:
`TemplateType`
`TableType`
`TableSelectionMode`

`@sap-ux/fiori-freestyle-writer`:
`TemplateType`

These changes are required to reduce the impact of importing these types by consumers. Previously defined as enums, requiring full dependencies and bloating
consumer code where only these types are required. The new type defintions still allow both uses (type or value) but the `enums` are now defined as `const`.
This change requires updates to consuming code where the type is imported and referenced.
Example where a single enum was used as a value type:

```
type Template = {
template: TemplateType.ListReportObjectPage
}
```
should now be defined as:
```
type Template = {
template: typeof TemplateType.ListReportObjectPage
}
```
- Updated dependencies [77b0800]
- @sap-ux/[email protected]
- @sap-ux/[email protected]
## 1.0.108
### Patch Changes
- @sap-ux/[email protected]
- @sap-ux/[email protected]
## 1.0.107
### Patch Changes
- @sap-ux/[email protected]
- @sap-ux/[email protected]
- @sap-ux/[email protected]
- @sap-ux/[email protected]
## 1.0.106
### Patch Changes
- @sap-ux/[email protected]
## 1.0.105
### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sap-ux/generator-simple-fe",
"version": "1.0.105",
"version": "1.0.116",
"description": "Simple example of a yeoman generator for Fiori elements.",
"license": "Apache-2.0",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-generator/src/app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default class extends Generator {
private app!: Ui5App & { app: { flpAppId: string } };
private service!: OdataService;
private template: {
type: TemplateType | FreestyleTemplateType.Basic;
type: TemplateType | typeof FreestyleTemplateType.Basic;
settings?: LROPSettings | OVPSettings | {};
};

Expand Down
8 changes: 8 additions & 0 deletions examples/ui-prompting-examples/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @sap-ux-private/ui-prompting-examples

## 0.2.28

### Patch Changes

- Updated dependencies [dd34d62]
- @sap-ux/ui-components@1.24.2
- @sap-ux/ui-prompting@0.3.14

## 0.2.27

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion examples/ui-prompting-examples/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sap-ux-private/ui-prompting-examples",
"version": "0.2.27",
"version": "0.2.28",
"description": "This project contains UI storybook stories with exampleS with prompt ui and FPM based building blocks.",
"license": "Apache-2.0",
"private": true,
Expand Down
69 changes: 69 additions & 0 deletions packages/abap-deploy-config-inquirer/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,74 @@
# @sap-ux/abap-deploy-config-inquirer

## 1.2.6

### Patch Changes

- Updated dependencies [5e3a5f8]
- @sap-ux/inquirer-common@0.6.9

## 1.2.5

### Patch Changes

- Updated dependencies [df2d965]
- @sap-ux/btp-utils@0.18.0
- @sap-ux/axios-extension@1.18.3
- @sap-ux/fiori-generator-shared@0.7.22
- @sap-ux/inquirer-common@0.6.8
- @sap-ux/system-access@0.5.28

## 1.2.4

### Patch Changes

- Updated dependencies [e516306]
- @sap-ux/axios-extension@1.18.2
- @sap-ux/system-access@0.5.27

## 1.2.3

### Patch Changes

- @sap-ux/axios-extension@1.18.1
- @sap-ux/fiori-generator-shared@0.7.21
- @sap-ux/system-access@0.5.26
- @sap-ux/inquirer-common@0.6.7

## 1.2.2

### Patch Changes

- Updated dependencies [19aad96]
- @sap-ux/ui5-config@0.26.1
- @sap-ux/axios-extension@1.18.1
- @sap-ux/fiori-generator-shared@0.7.20
- @sap-ux/system-access@0.5.26
- @sap-ux/inquirer-common@0.6.6

## 1.2.1

### Patch Changes

- Updated dependencies [080bda2]
- @sap-ux/guided-answers-helper@0.2.1
- @sap-ux/inquirer-common@0.6.5

## 1.2.0

### Minor Changes

- fc5916a: exposes getpackageprompts and gettransportrequest prompts

## 1.1.21

### Patch Changes

- @sap-ux/axios-extension@1.18.1
- @sap-ux/fiori-generator-shared@0.7.19
- @sap-ux/system-access@0.5.26
- @sap-ux/inquirer-common@0.6.4

## 1.1.20

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/abap-deploy-config-inquirer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"url": "https://github.com/SAP/open-ux-tools.git",
"directory": "packages/abap-deploy-config-inquirer"
},
"version": "1.1.20",
"version": "1.2.6",
"license": "Apache-2.0",
"main": "dist/index.js",
"scripts": {
Expand Down
4 changes: 3 additions & 1 deletion packages/abap-deploy-config-inquirer/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ToolsLogger, type Logger } from '@sap-ux/logger';
import { initI18n } from './i18n';
import { PromptState } from './prompts/prompt-state';
import { getAbapDeployConfigQuestions } from './prompts';
import { getAbapDeployConfigQuestions, getPackagePrompts, getTransportRequestPrompts } from './prompts';
import { getPackageAnswer, getTransportAnswer, reconcileAnswers } from './utils';
import LoggerHelper from './logger-helper';
import type { InquirerAdapter } from '@sap-ux/inquirer-common';
Expand Down Expand Up @@ -70,6 +70,8 @@ export {
getPackageAnswer,
getTransportAnswer,
reconcileAnswers,
getPackagePrompts,
getTransportRequestPrompts,
TargetSystemType,
PackageInputChoices,
TransportChoices,
Expand Down
16 changes: 6 additions & 10 deletions packages/abap-deploy-config-inquirer/src/prompts/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import {
TransportChoices,
type AbapSystemChoice,
type AbapDeployConfigAnswersInternal,
type BackendTarget
type BackendTarget,
type SystemConfig
} from '../types';
import { AuthenticationType, type BackendSystem } from '@sap-ux/store';
import type { ChoiceOptions, ListChoiceOptions } from 'inquirer';
Expand Down Expand Up @@ -248,29 +249,24 @@ export function updatePromptStateUrl(
*
* @param isCli - is running in CLI
* @param input - package input
* @param systemConfig - system configuration
* @param previousAnswers - previous answers
* @param backendTarget - backend target from abap deploy config prompt options
* @returns results of query and message based on number of results
*/
export async function getPackageChoices(
isCli: boolean,
input: string,
systemConfig: SystemConfig,
previousAnswers: AbapDeployConfigAnswersInternal,
backendTarget?: BackendTarget
): Promise<{ packages: string[]; morePackageResultsMsg: string }> {
let packages;
let morePackageResultsMsg = '';

// For YUI we need to ensure input is provided so the prompt is not re-rendered with no input
if (isCli || input) {
packages = await queryPackages(
input,
{
url: PromptState.abapDeployConfig.url,
client: PromptState.abapDeployConfig.client,
destination: PromptState.abapDeployConfig.destination
},
backendTarget
);
packages = await queryPackages(input, systemConfig, backendTarget);

morePackageResultsMsg =
packages && packages.length === ABAP_PACKAGE_SEARCH_MAX_RESULTS
Expand Down
Loading

0 comments on commit 47fa44e

Please sign in to comment.