Skip to content

Commit 2f6e363

Browse files
chore: Bump ui5 webcomponent 2.8 (#3798)
* update ui5 packages * Adaptation to UI5 changes * Add style for selection and header for popin * Adjust columns width * Test correction * Test correction * Test correction * Test correction * Test correction * Correction for test * PR corrections * Removing unnecessary scroll * Fixed header tool clipping * Style correction * PR correction * style correction * Correct style * Style correction * correct padding
1 parent 450ff2d commit 2f6e363

File tree

24 files changed

+494
-358
lines changed

24 files changed

+494
-358
lines changed

package-lock.json

Lines changed: 253 additions & 193 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@
6565
"@types/pluralize": "^0.0.29",
6666
"@types/react-syntax-highlighter": "^15.5.13",
6767
"@ui-schema/ui-schema": "^0.4.5",
68-
"@ui5/webcomponents": "^2.7.0",
69-
"@ui5/webcomponents-base": "^2.7.0",
70-
"@ui5/webcomponents-compat": "^2.7.0",
71-
"@ui5/webcomponents-fiori": "^2.7.0",
72-
"@ui5/webcomponents-icons": "^2.7.0",
73-
"@ui5/webcomponents-icons-tnt": "^2.7.0",
74-
"@ui5/webcomponents-react": "^2.7.0",
75-
"@ui5/webcomponents-react-base": "^2.7.0",
76-
"@ui5/webcomponents-react-charts": "^2.7.0",
77-
"@ui5/webcomponents-react-compat": "^2.7.0",
68+
"@ui5/webcomponents": "^2.8.0",
69+
"@ui5/webcomponents-base": "^2.8.0",
70+
"@ui5/webcomponents-compat": "^2.8.0",
71+
"@ui5/webcomponents-fiori": "^2.8.0",
72+
"@ui5/webcomponents-icons": "^2.8.0",
73+
"@ui5/webcomponents-icons-tnt": "^2.8.0",
74+
"@ui5/webcomponents-react": "^2.8.1",
75+
"@ui5/webcomponents-react-base": "^2.8.1",
76+
"@ui5/webcomponents-react-charts": "^2.8.1",
77+
"@ui5/webcomponents-react-compat": "^2.8.1",
7878
"classnames": "^2.5.1",
7979
"copy-to-clipboard": "^3.2.0",
8080
"core-js": "^3.41.0",

src/command-pallette/CommandPalletteUI/CommandPaletteSearchBar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.command-palette-search-bar {
2-
width: var(--_ui5-v2-7-0_input_width) !important;
2+
width: var(--_ui5-v2-8-0_input_width) !important;
33
}
44

55
.ui5-shellbar-mid-content {

src/command-pallette/CommandPalletteUI/CommandPaletteUI.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.command-palette-ui {
22
position: absolute;
3-
top: calc(var(--_ui5-v2-7-0_shellbar_root_height) + 0.5rem);
3+
top: calc(var(--_ui5-v2-8-0_shellbar_root_height) + 0.5rem);
44
width: 100%;
55
height: 100%;
66

@@ -15,7 +15,7 @@
1515
width: 60vw;
1616
max-width: 700px;
1717
position: absolute;
18-
top: calc(var(--_ui5-v2-7-0_shellbar_root_height) * -1);
18+
top: calc(var(--_ui5-v2-8-0_shellbar_root_height) * -1);
1919
opacity: 0%; //prevent visually jumping
2020
}
2121

src/components/App/App.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ import { Navigate, Route, Routes } from 'react-router-dom';
33
import { useTranslation } from 'react-i18next';
44
import { useRecoilValue, useSetRecoilState } from 'recoil';
55

6-
// this import is necessary for the V1 Tables to work properly,
7-
// it can be removed after https://github.com/kyma-project/busola/issues/3489 is resolved
8-
import './UI5Imports';
9-
106
import { useUrl } from 'hooks/useUrl';
117
import { useSentry } from 'hooks/useSentry';
128
import { useAppTracking } from 'hooks/tracking';

src/components/App/ContentWrapper/ContentWrapper.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:root {
2-
--solidBg: var(--_ui5-v2-7-0_fcl_solid_bg);
2+
--solidBg: var(--_ui5-v2-8-0_fcl_solid_bg);
33
}
44

55
#content-wrap {

src/components/App/UI5Imports.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/Clusters/components/AddClusterWizard.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
}
3838

3939
ui5-wizard::part(step-content) {
40-
--_ui5-v2-7-0_wiz_content_item_wrapper_padding: 0;
41-
--_ui5-v2-7-0_wiz_content_item_wrapper_bg: transparent;
40+
--_ui5-v2-8-0_wiz_content_item_wrapper_padding: 0;
41+
--_ui5-v2-8-0_wiz_content_item_wrapper_bg: transparent;
4242
}
4343

4444
ui5-wizard {

src/components/Extensibility/components/Table.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ export function Table({
119119
cells,
120120
title: makeTitle(),
121121
collapseContent: (
122-
// TODO replace once new Table component is available in ui5-webcomponents-react
123-
<td colSpan="100%" className={tdClassNames}>
122+
<div className={tdClassNames}>
124123
{structure.collapsible.map((child, cellIndex) => (
125124
<Widget
126125
{...props}
@@ -136,7 +135,7 @@ export function Table({
136135
index={index}
137136
/>
138137
))}
139-
</td>
138+
</div>
140139
),
141140
};
142141
};

src/components/Extensibility/components/Table.scss

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,32 @@
55
}
66
}
77
}
8+
9+
ui5-table-row.collapse-content {
10+
overflow-x: auto;
11+
display: block;
12+
}
13+
14+
.collapsible-panel {
15+
min-width: max-content;
16+
position: absolute;
17+
display: inherit;
18+
19+
> :first-child {
20+
display: contents;
21+
min-width: max-content;
22+
overflow: auto;
23+
24+
&:not(ui5-panel) {
25+
display: flex;
26+
}
27+
28+
ui5-text {
29+
margin: 0.5rem 1rem;
30+
}
31+
}
32+
33+
ui5-table {
34+
min-width: max-content;
35+
}
36+
}

0 commit comments

Comments
 (0)