Skip to content

Commit b774b2a

Browse files
Lukas742Lukas742
committed
Merge branch 'master' into feat/analytical-table-sticky-scrollbars
# Conflicts: # packages/main/src/components/AnalyticalTable/__snapshots__/AnalyticalTable.test.tsx.snap # packages/main/src/components/AnalyticalTable/index.tsx
2 parents 2031123 + 5e21750 commit b774b2a

File tree

113 files changed

+1044
-530
lines changed

Some content is hidden

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

113 files changed

+1044
-530
lines changed

‎.github/workflows/release-rc.yml‎

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,48 @@
11
name: 'Release - Release Candidate'
22

3-
on:
4-
workflow_dispatch
5-
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
release_type:
7+
description: 'Release Type: premajor | preminor | prepatch | prerelease'
8+
required: true
9+
default: 'prerelease'
10+
611
jobs:
712
build-and-release:
813
if: github.actor == 'MarcusNotheis' || github.actor == 'vbersch' || github.actor == 'Lukas742'
9-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-latest
1015

1116
steps:
12-
- uses: actions/checkout@v2.3.2
13-
with:
14-
token: ${{ secrets.ACCESS_TOKEN }}
15-
fetch-depth: 0
16-
17-
- name: Setup Node.js environment
18-
uses: actions/setup-node@v2.1.0
19-
with:
20-
node-version: 12.x
21-
22-
- name: Install, test and build
23-
run: |
24-
yarn install
25-
yarn test
26-
yarn build
27-
28-
- name: publish
29-
run: |
30-
npm config set //registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}
31-
32-
git config user.email ${{ secrets.BOT_GIT_EMAIL }}
33-
git config user.name ${{ secrets.BOT_GIT_USERNAME }}
34-
35-
${GITHUB_WORKSPACE}/node_modules/.bin/lerna publish prerelease \
36-
--conventional-prerelease \
37-
--create-release github \
38-
--dist-tag next \
39-
--pre-dist-tag next
40-
env:
41-
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
42-
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
17+
- uses: actions/checkout@v2.3.2
18+
with:
19+
token: ${{ secrets.ACCESS_TOKEN }}
20+
fetch-depth: 0
21+
22+
- name: Setup Node.js environment
23+
uses: actions/setup-node@v2.1.0
24+
with:
25+
node-version: 12.x
26+
27+
- name: Install, test and build
28+
run: |
29+
yarn install
30+
yarn test
31+
yarn build
32+
33+
- name: publish
34+
run: |
35+
npm config set //registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}
36+
37+
git config user.email ${{ secrets.BOT_GIT_EMAIL }}
38+
git config user.name ${{ secrets.BOT_GIT_USERNAME }}
39+
40+
${GITHUB_WORKSPACE}/node_modules/.bin/lerna publish ${{ github.event.inputs.release_type }} \
41+
--conventional-prerelease \
42+
--create-release github \
43+
--dist-tag next \
44+
--pre-dist-tag next
45+
env:
46+
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
47+
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
4348

‎.github/workflows/release.yml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
name: 'Release'
22

3-
on:
3+
on:
44
workflow_dispatch:
55
inputs:
66
release_type:
77
description: 'Release Type: patch | minor | major'
88
required: true
99
default: 'patch'
10-
10+
1111
jobs:
1212
build-and-release:
1313
if: github.actor == 'MarcusNotheis' || github.actor == 'vbersch' || github.actor == 'Lukas742'
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v2.3.2
18-
with:
19-
token: ${{ secrets.ACCESS_TOKEN }}
20-
fetch-depth: 0
21-
22-
- name: Setup Node.js environment
23-
uses: actions/setup-node@v2.1.0
24-
with:
25-
node-version: 12.x
26-
27-
- name: Install, test and build
28-
run: |
29-
yarn install
30-
yarn test
31-
yarn build
32-
33-
- name: publish
34-
run: |
35-
npm config set //registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}
36-
37-
git config user.email ${{ secrets.BOT_GIT_EMAIL }}
38-
git config user.name ${{ secrets.BOT_GIT_USERNAME }}
39-
40-
${GITHUB_WORKSPACE}/node_modules/.bin/lerna publish ${{ github.event.inputs.release_type }} \
41-
--conventional-graduate \
42-
--create-release github
43-
env:
44-
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
45-
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
17+
- uses: actions/checkout@v2.3.2
18+
with:
19+
token: ${{ secrets.ACCESS_TOKEN }}
20+
fetch-depth: 0
21+
22+
- name: Setup Node.js environment
23+
uses: actions/setup-node@v2.1.0
24+
with:
25+
node-version: 12.x
26+
27+
- name: Install, test and build
28+
run: |
29+
yarn install
30+
yarn test
31+
yarn build
32+
33+
- name: publish
34+
run: |
35+
npm config set //registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}
36+
37+
git config user.email ${{ secrets.BOT_GIT_EMAIL }}
38+
git config user.name ${{ secrets.BOT_GIT_USERNAME }}
39+
40+
${GITHUB_WORKSPACE}/node_modules/.bin/lerna publish ${{ github.event.inputs.release_type }} \
41+
--conventional-graduate \
42+
--create-release github
43+
env:
44+
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
45+
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

‎CHANGELOG.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,34 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [0.11.0-rc.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.10.10...v0.11.0-rc.0) (2020-10-08)
7+
8+
9+
### Bug Fixes
10+
11+
* **AnalyticalTable:** don't crash when removing columns ([#716](https://github.com/SAP/ui5-webcomponents-react/issues/716)) ([6c74e5d](https://github.com/SAP/ui5-webcomponents-react/commit/6c74e5dcdefbdd41812c4a8d081afd060dbecdb0))
12+
13+
14+
### chore
15+
16+
* delete deprecated FilterItem ([#717](https://github.com/SAP/ui5-webcomponents-react/issues/717)) ([f30d2fc](https://github.com/SAP/ui5-webcomponents-react/commit/f30d2fc83a6bc4173b83e303fc2659e673c8633b)), closes [#646](https://github.com/SAP/ui5-webcomponents-react/issues/646)
17+
18+
19+
### Features
20+
21+
* upgrade ui5-webcomponents to 1.0.0-rc.9 ([#705](https://github.com/SAP/ui5-webcomponents-react/issues/705)) ([fb7d5c6](https://github.com/SAP/ui5-webcomponents-react/commit/fb7d5c62d10a6afa161cbd55c75850a068ec3383)), closes [#674](https://github.com/SAP/ui5-webcomponents-react/issues/674)
22+
23+
24+
### BREAKING CHANGES
25+
26+
* deleted deprecated component `FilterItem`, please use `FilterGroupItem` instead. The `FilterBar` is now accepting only `FilterGroupItem`s as children.
27+
* **Token**: the Token text is now defined via the `text` prop, `children` has no effect anymore.
28+
* **Token**: `onDelete` is removed as the Token shouldn’t be used as a standalone component.
29+
30+
31+
32+
33+
634
## [0.10.10](https://github.com/SAP/ui5-webcomponents-react/compare/v0.10.9...v0.10.10) (2020-10-02)
735

836

‎docs/2-MigrationGuide.stories.mdx‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
1+
import { Meta } from '@storybook/addon-docs/blocks';
22

33
<Meta title="Migration Guide" />
44

@@ -14,9 +14,58 @@ or the [changelog](https://github.com/SAP/ui5-webcomponents-react/blob/master/CH
1414

1515
## Table of Contents
1616

17+
- [0.10.x to 0.11.0](#migrating-from-010x-to-0110)
1718
- [0.9.x to 0.10.0](#migrating-from-09x-to-0100)
1819
- [0.8.x to 0.9.0](#migrating-from-08x-to-090)
1920

21+
## Migrating from 0.10.x to 0.11.0
22+
23+
<br />
24+
25+
### Deleted Components
26+
27+
The `FilterItem` component (which was deprecated in 0.10.0) is now deleted. Please use the `FilterGroupItem` component instead. <br />
28+
In addition to that, the `FilterBar` is now only accepting `FilterGroupItems` as children.
29+
30+
If you have the following `FilterItem` in your codebase
31+
32+
```jsx
33+
<FilterItem
34+
filterItems={[
35+
{ text: 'Text 1', key: '1' },
36+
{ text: 'Text 2', key: '2' }
37+
]}
38+
label="My Filter Item"
39+
key="filter_item"
40+
type={FilterType.Select}
41+
loading
42+
/>
43+
```
44+
45+
this will become
46+
47+
```jsx
48+
<FilterGroupItem label="My Filter Item" loading>
49+
<Select>
50+
<Option data-key="1">Text 1</Option>
51+
<Option data-key="2">Text 2</Option>
52+
</Select>
53+
</FilterGroupItem>
54+
```
55+
56+
The same pattern applies for other FilterTypes like `Default` or `MultiSelect`.
57+
58+
### Components with changed API
59+
60+
The `Token` component is now officially a public component, and its API has changed.
61+
The text content of a `Token` was previously defined via `children`, now you have to use `text` instead.
62+
63+
Example:
64+
`<Token>My Token</Token>` will become `<Token text="My Token" />`
65+
66+
Furthermore, the `onDelete` event is removed as the Token shouldn’t be used as a standalone component.
67+
Most probably, you will use the `Token` as child of `MultiInput` - there you can listen to the `onTokenDelete` event.
68+
2069
## Migrating from 0.9.x to 0.10.0
2170

2271
<br />

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "0.10.10",
5+
"version": "0.11.0-rc.0",
66
"npmClient": "yarn",
77
"useWorkspaces": true,
88
"command": {

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"pretest": "rimraf coverage && lerna run build:i18n",
1414
"test": "jest --config=config/jest.config.js --coverage",
1515
"clean": "lerna run clean --stream && rimraf coverage",
16-
"prettier:all": "prettier --write --config ./prettier.config.js \"packages/**/*.{ts,tsx}\"",
16+
"prettier:all": "prettier --write --config ./prettier.config.js \"packages/**/*.{ts,tsx,mdx}\"",
1717
"lint": "eslint packages",
1818
"lerna:version-dryrun": "lerna version --conventional-graduate --no-git-tag-version --no-push",
1919
"deploy:storybook": "lerna run build:i18n && storybook-to-ghpages --ci"
@@ -27,9 +27,9 @@
2727
"@storybook/cli": "6.0.26",
2828
"@storybook/react": "6.0.26",
2929
"@storybook/theming": "6.0.26",
30-
"@ui5/webcomponents": "1.0.0-rc.8",
31-
"@ui5/webcomponents-fiori": "1.0.0-rc.8",
32-
"@ui5/webcomponents-icons": "1.0.0-rc.8",
30+
"@ui5/webcomponents": "1.0.0-rc.9",
31+
"@ui5/webcomponents-fiori": "1.0.0-rc.9",
32+
"@ui5/webcomponents-icons": "1.0.0-rc.9",
3333
"react": "16.8.0",
3434
"react-dom": "16.8.0",
3535
"react-syntax-highlighter": "^13.5.1"
@@ -59,7 +59,7 @@
5959
"@types/react-dom": "^16.9.6",
6060
"@typescript-eslint/eslint-plugin": "^4.4.0",
6161
"@typescript-eslint/parser": "^4.4.0",
62-
"@ui5/webcomponents-tools": "^1.0.0-rc.8",
62+
"@ui5/webcomponents-tools": "^1.0.0-rc.9",
6363
"babel-loader": "^8.1.0",
6464
"chalk": "^4.0.0",
6565
"dedent": "^0.7.0",

‎packages/base/CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,23 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [0.11.0-rc.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.10.10...v0.11.0-rc.0) (2020-10-08)
7+
8+
9+
### Features
10+
11+
* upgrade ui5-webcomponents to 1.0.0-rc.9 ([#705](https://github.com/SAP/ui5-webcomponents-react/issues/705)) ([fb7d5c6](https://github.com/SAP/ui5-webcomponents-react/commit/fb7d5c62d10a6afa161cbd55c75850a068ec3383)), closes [#674](https://github.com/SAP/ui5-webcomponents-react/issues/674)
12+
13+
14+
### BREAKING CHANGES
15+
16+
* **Token**: the Token text is now defined via the `text` prop, `children` has no effect anymore.
17+
* **Token**: `onDelete` is removed as the Token shouldn’t be used as a standalone component.
18+
19+
20+
21+
22+
623
## [0.10.10](https://github.com/SAP/ui5-webcomponents-react/compare/v0.10.9...v0.10.10) (2020-10-02)
724

825
**Note:** Version bump only for package @ui5/webcomponents-react-base

‎packages/base/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ui5/webcomponents-react-base",
3-
"version": "0.10.10",
3+
"version": "0.11.0-rc.0",
44
"description": "Base for ui5-webcomponents-react",
55
"main": "index.cjs.js",
66
"module": "index.esm.js",
@@ -36,7 +36,7 @@
3636
"@sap-theming/theming-base-content": "11.1.18"
3737
},
3838
"peerDependencies": {
39-
"@ui5/webcomponents-base": "0.22.0",
39+
"@ui5/webcomponents-base": "1.0.0-rc.9",
4040
"react": "^16.8.0",
4141
"react-jss": "^10.0.4"
4242
},

‎packages/charts/CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,23 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [0.11.0-rc.0](https://github.com/SAP/ui5-webcomponents-react/compare/v0.10.10...v0.11.0-rc.0) (2020-10-08)
7+
8+
9+
### Features
10+
11+
* upgrade ui5-webcomponents to 1.0.0-rc.9 ([#705](https://github.com/SAP/ui5-webcomponents-react/issues/705)) ([fb7d5c6](https://github.com/SAP/ui5-webcomponents-react/commit/fb7d5c62d10a6afa161cbd55c75850a068ec3383)), closes [#674](https://github.com/SAP/ui5-webcomponents-react/issues/674)
12+
13+
14+
### BREAKING CHANGES
15+
16+
* **Token**: the Token text is now defined via the `text` prop, `children` has no effect anymore.
17+
* **Token**: `onDelete` is removed as the Token shouldn’t be used as a standalone component.
18+
19+
20+
21+
22+
623
## [0.10.10](https://github.com/SAP/ui5-webcomponents-react/compare/v0.10.9...v0.10.10) (2020-10-02)
724

825
**Note:** Version bump only for package @ui5/webcomponents-react-charts

‎packages/charts/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ui5/webcomponents-react-charts",
3-
"version": "0.10.10",
3+
"version": "0.11.0-rc.0",
44
"description": "Charts for ui5-webcomponents-react",
55
"main": "index.cjs.js",
66
"module": "index.esm.js",
@@ -26,8 +26,8 @@
2626
"recharts": "2.0.0-beta.6"
2727
},
2828
"peerDependencies": {
29-
"@ui5/webcomponents-react": "^0.9.0",
30-
"@ui5/webcomponents-react-base": "^0.9.0",
29+
"@ui5/webcomponents-react": "^0.11.0",
30+
"@ui5/webcomponents-react-base": "^0.11.0",
3131
"react": "^16.8.0",
3232
"react-jss": "^10.0.4"
3333
},

0 commit comments

Comments
 (0)