Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
AlekseyManetov committed Dec 17, 2024
2 parents 7557353 + 3d4de92 commit 327a9ac
Show file tree
Hide file tree
Showing 25 changed files with 2,266 additions and 2,055 deletions.
26 changes: 13 additions & 13 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/app",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "EPAM Unified UI landing",
"author": "EPAM",
"license": "MIT",
Expand All @@ -17,19 +17,19 @@
"dependencies": {
"@babel/plugin-proposal-private-property-in-object": "7.21.11",
"@elastic/apm-rum": "^5.14.0",
"@epam/assets": "5.11.1-rc.0",
"@epam/draft-rte": "5.11.1-rc.0",
"@epam/electric": "5.11.1-rc.0",
"@epam/assets": "5.12.0",
"@epam/draft-rte": "5.12.0",
"@epam/electric": "5.12.0",
"@epam/internal": "0.0.2",
"@epam/loveship": "5.11.1-rc.0",
"@epam/promo": "5.11.1-rc.0",
"@epam/uui": "5.11.1-rc.0",
"@epam/uui-components": "5.11.1-rc.0",
"@epam/uui-core": "5.11.1-rc.0",
"@epam/uui-db": "5.11.1-rc.0",
"@epam/uui-docs": "5.11.1-rc.0",
"@epam/uui-editor": "5.11.1-rc.0",
"@epam/uui-timeline": "5.11.1-rc.0",
"@epam/loveship": "5.12.0",
"@epam/promo": "5.12.0",
"@epam/uui": "5.12.0",
"@epam/uui-components": "5.12.0",
"@epam/uui-core": "5.12.0",
"@epam/uui-db": "5.12.0",
"@epam/uui-docs": "5.12.0",
"@epam/uui-editor": "5.12.0",
"@epam/uui-timeline": "5.12.0",
"@tanstack/react-query": "^5.17.19",
"@udecode/plate-common": "31.3.2",
"amplitude-js": "8.9.1",
Expand Down
2 changes: 1 addition & 1 deletion app/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import '@epam/assets/theme/theme_eduverse_light.scss';
import '@epam/assets/theme/theme_eduverse_dark.scss';
import './index.module.scss';

i18n.errorHandler.supportLink = (
i18n.errorHandler.supportMessage = (
<>
You can track the service availability at
{' '}
Expand Down
21 changes: 17 additions & 4 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
# 5.xx.xx - xx.xx.2024
# 5.12.0 - 12.12.2024

**What's New**
* [ErrorPage]: added possibility to add message with support link for error pages(`500, 503, default` errors).
For EPAM applications it's recommended to add following code to the root of your app to enable it:
```
import { i18n } from '@epam/uui';
i18n.errorHandler.supportMessage = (
<>
You can track the service availability at
{' '}
<a href={ `https://status.epam.com/?utm_source=${window.location.host}&utm_medium=ErrorPage&utm_campaign=StatusAquisitionTracking` }>status.epam.com</a>
</>
);
```
* Remove 'prop-types' from UUI packages dependencies. Remove `uuiContextTypes` interface, since it was needed for already outdated React context API.
* [Alert]: added support for size theming
* [DataTable]: added support of column groups in table header. Read more - https://uui.epam.com/documents?id=advancedTables&mode=doc&category=tables&theme=electric#table_with_header_groups
* [ErrorPage]: added field for additional message with support link (it works with `500, 503, default` errors), added support link for the site
* [ErrorPage]: embed typography styles for error page texts
* [Alert]: small tweaks according to the design


**What's Fixed**
* [Dropdown][Tooltip]: Fixed a bug where the body overflowed if there was no space for the default or opposite placement.
Expand Down Expand Up @@ -37,7 +50,7 @@
**What's Fixed**
* [TabButton][VerticalTabButton]: decreased paddings, added gaps `3px` between internal items for all sizes according to design
* [Tag]: Added gaps between internal items, changed padding according to design
[Badge]: changed gaps & paddings according design, removed padding before first icon & after counter
* [Badge]: changed gaps & paddings according design, removed padding before first icon & after counter
* [VirtualList]: fixed estimatedHeight calculations in components with pagination
* [RTE]: fixed working of old iframe data structure with 'src' prop
* [VerticalTabButton]: reverted paddings & gaps to previous values for all sizes
Expand Down
10 changes: 5 additions & 5 deletions draft-rte/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/draft-rte",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"author": "EPAM",
"license": "MIT",
"main": "index.js",
Expand All @@ -11,10 +11,10 @@
"prepublish": "yarn build"
},
"dependencies": {
"@epam/assets": "5.11.1-rc.0",
"@epam/loveship": "5.11.1-rc.0",
"@epam/uui-components": "5.11.1-rc.0",
"@epam/uui-core": "5.11.1-rc.0",
"@epam/assets": "5.12.0",
"@epam/loveship": "5.12.0",
"@epam/uui-components": "5.12.0",
"@epam/uui-core": "5.12.0",
"@types/draft-js": "0.10.23",
"classnames": "^2.2.6",
"draft-convert": "^2.1.2",
Expand Down
2 changes: 1 addition & 1 deletion epam-assets/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/assets",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "EPAM Assets Library",
"author": "EPAM",
"license": "MIT",
Expand Down
8 changes: 4 additions & 4 deletions epam-electric/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/electric",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "EPAM UUI components set branded with 'electric' style",
"author": "EPAM",
"license": "MIT",
Expand All @@ -12,9 +12,9 @@
"prepublish": "yarn build"
},
"dependencies": {
"@epam/uui": "5.11.1-rc.0",
"@epam/uui-components": "5.11.1-rc.0",
"@epam/uui-core": "5.11.1-rc.0"
"@epam/uui": "5.12.0",
"@epam/uui-components": "5.12.0",
"@epam/uui-core": "5.12.0"
},
"devDependencies": {
"mockdate": "^3.0.5"
Expand Down
10 changes: 5 additions & 5 deletions epam-promo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/promo",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "EPAM UUI4 components set",
"author": "EPAM",
"license": "MIT",
Expand All @@ -12,10 +12,10 @@
"prepublish": "yarn build"
},
"dependencies": {
"@epam/assets": "5.11.1-rc.0",
"@epam/uui": "5.11.1-rc.0",
"@epam/uui-components": "5.11.1-rc.0",
"@epam/uui-core": "5.11.1-rc.0",
"@epam/assets": "5.12.0",
"@epam/uui": "5.12.0",
"@epam/uui-components": "5.12.0",
"@epam/uui-core": "5.12.0",
"@types/classnames": "2.2.6",
"classnames": "2.2.6"
},
Expand Down
8 changes: 4 additions & 4 deletions extra/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-extra",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "EPAM UUI components set branded with 'loveship' style",
"author": "EPAM",
"license": "MIT",
Expand All @@ -11,9 +11,9 @@
"build": "ts-node ../uui-build/ts/scripts/buildUuiModule.ts"
},
"dependencies": {
"@epam/loveship": "5.11.1-rc.0",
"@epam/promo": "5.11.1-rc.0",
"@epam/uui-core": "5.11.1-rc.0",
"@epam/loveship": "5.12.0",
"@epam/promo": "5.12.0",
"@epam/uui-core": "5.12.0",
"immutable": "3.8.2"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "5.11.1-rc.0",
"version": "5.12.0",
"npmClient": "yarn",
"useWorkspaces": true,
"exact": true
Expand Down
10 changes: 5 additions & 5 deletions loveship/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/loveship",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "EPAM UUI components set branded with 'loveship' style",
"author": "EPAM",
"license": "MIT",
Expand All @@ -12,10 +12,10 @@
"prepublish": "yarn build"
},
"dependencies": {
"@epam/assets": "5.11.1-rc.0",
"@epam/uui": "5.11.1-rc.0",
"@epam/uui-components": "5.11.1-rc.0",
"@epam/uui-core": "5.11.1-rc.0",
"@epam/assets": "5.12.0",
"@epam/uui": "5.12.0",
"@epam/uui-components": "5.12.0",
"@epam/uui-core": "5.12.0",
"@types/classnames": "2.2.6",
"classnames": "2.2.6"
},
Expand Down
2 changes: 1 addition & 1 deletion templates/uui-cra-template/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/cra-template-uui",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"keywords": [
"UUI",
"react",
Expand Down
4 changes: 2 additions & 2 deletions test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-test-utils",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"author": "EPAM",
"license": "MIT",
"private": false,
Expand All @@ -11,7 +11,7 @@
"prepublish": "yarn build"
},
"dependencies": {
"@epam/uui-core": "5.11.1-rc.0",
"@epam/uui-core": "5.12.0",
"@testing-library/react": "14.0.0",
"@testing-library/user-event": "14.4.3",
"@types/react-test-renderer": "18.0.0",
Expand Down
10 changes: 5 additions & 5 deletions uui-build/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-build",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"bin": {
"epam-uui-build": "./bin/cli.js"
},
Expand All @@ -25,13 +25,13 @@
"fs-extra": "11.2.0",
"magic-string": "0.30.9",
"postcss": "8.4.38",
"postcss-scss": "^4.0.6",
"postcss-scss": "4.0.6",
"rollup": "4.22.4",
"rollup-plugin-postcss": "4.0.2",
"rollup-plugin-visualizer": "5.12.0",
"sass": "^1.78.0",
"ts-node": "^10.9.1",
"tslib": "^2.6.2"
"sass": "1.78.0",
"ts-node": "10.9.1",
"tslib": "2.6.2"
},
"devDependencies": {
"@babel/eslint-parser": "7.23.10",
Expand Down
4 changes: 2 additions & 2 deletions uui-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-components",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "EPAM UUI Components",
"author": "EPAM",
"license": "MIT",
Expand All @@ -13,7 +13,7 @@
"prepublish": "yarn build"
},
"dependencies": {
"@epam/uui-core": "5.11.1-rc.0",
"@epam/uui-core": "5.12.0",
"@popperjs/core": "2.9.0",
"@types/classnames": "2.2.6",
"@types/react-measure": "2.0.8",
Expand Down
2 changes: 1 addition & 1 deletion uui-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-core",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "EPAM UUI Core",
"author": "EPAM",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions uui-db/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-db",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "UUI - client-side relational state cache",
"author": "EPAM",
"license": "MIT",
Expand All @@ -14,7 +14,7 @@
"prepublish": "yarn build"
},
"dependencies": {
"@epam/uui-core": "5.11.1-rc.0",
"@epam/uui-core": "5.12.0",
"@types/lodash.countby": "4.6.6",
"@types/lodash.filter": "4.6.6",
"@types/lodash.foreach": "4.5.6",
Expand Down
12 changes: 6 additions & 6 deletions uui-docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-docs",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "EPAM UUI Documentation infrastructure",
"author": "EPAM",
"license": "MIT",
Expand All @@ -12,11 +12,11 @@
"prepublish": "yarn build"
},
"dependencies": {
"@epam/assets": "5.11.1-rc.0",
"@epam/promo": "5.11.1-rc.0",
"@epam/uui": "5.11.1-rc.0",
"@epam/uui-components": "5.11.1-rc.0",
"@epam/uui-core": "5.11.1-rc.0",
"@epam/assets": "5.12.0",
"@epam/promo": "5.12.0",
"@epam/uui": "5.12.0",
"@epam/uui-components": "5.12.0",
"@epam/uui-core": "5.12.0",
"@types/classnames": "2.2.6",
"classnames": "^2.2.6"
},
Expand Down
2 changes: 1 addition & 1 deletion uui-e2e-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-e2e-tests",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"description": "",
"author": "EPAM",
"license": "MIT",
Expand Down
10 changes: 5 additions & 5 deletions uui-editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-editor",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"author": "EPAM",
"license": "MIT",
"main": "index.js",
Expand All @@ -12,10 +12,10 @@
},
"dependencies": {
"@braintree/sanitize-url": "7.0.0",
"@epam/assets": "5.11.1-rc.0",
"@epam/uui": "5.11.1-rc.0",
"@epam/uui-components": "5.11.1-rc.0",
"@epam/uui-core": "5.11.1-rc.0",
"@epam/assets": "5.12.0",
"@epam/uui": "5.12.0",
"@epam/uui-components": "5.12.0",
"@epam/uui-core": "5.12.0",
"@udecode/plate-autoformat": "31.0.0",
"@udecode/plate-basic-marks": "31.0.0",
"@udecode/plate-block-quote": "31.0.0",
Expand Down
6 changes: 3 additions & 3 deletions uui-timeline/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-timeline",
"version": "5.11.1-rc.0",
"version": "5.12.0",
"author": "EPAM",
"license": "MIT",
"main": "index.js",
Expand All @@ -11,8 +11,8 @@
"prepublish": "yarn build"
},
"dependencies": {
"@epam/uui-components": "5.11.1-rc.0",
"@epam/uui-core": "5.11.1-rc.0",
"@epam/uui-components": "5.12.0",
"@epam/uui-core": "5.12.0",
"@types/lodash.sortedindex": "^4.1.9",
"classnames": "^2.2.6",
"lodash.sortedindex": "^4.1.0"
Expand Down
2 changes: 1 addition & 1 deletion uui/components/errors/ErrorPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const ErrorPage: React.FC<ErrorPageProps> = (props) => {
<img className="uui-error-image" src={ isMobileScreen && props.mobileImageUrl ? props.mobileImageUrl : props.imageUrl } alt="ERROR OCCURRED!" />
<div className="uui-error-title">{props.title}</div>
<div className="uui-error-subtitle">{props.subtitle}</div>
<div className="uui-error-support-link">{props?.supportLink}</div>
{ props?.supportLink && <div className="uui-error-support-link">{props?.supportLink}</div> }
</div>
</div>
);
Expand Down
Loading

0 comments on commit 327a9ac

Please sign in to comment.