Skip to content

Commit 5e5e469

Browse files
authored
Merge pull request #1532 from swaroopar/feature/upgradeAntd5.24.1
dependencies: bump antd from 5.23.4 to 5.24.1 in the antd group
2 parents 94e76e5 + 182230c commit 5e5e469

10 files changed

+69
-46
lines changed

package-lock.json

+50-32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@ant-design/icons": "^5.6.1",
88
"@axa-fr/react-oidc": "^7.25.3",
99
"@tanstack/react-query": "^5.66.5",
10-
"antd": "^5.23.4",
10+
"antd": "^5.24.1",
1111
"echarts": "5.6.0",
1212
"echarts-for-react": "^3.0.2",
1313
"rc-field-form": "^2.6.0",
@@ -42,12 +42,12 @@
4242
]
4343
},
4444
"devDependencies": {
45+
"@ant-design/v5-patch-for-react-19": "^1.0.3",
4546
"@axa-fr/oidc-client": "^7.22.32",
4647
"@eslint/compat": "^1.2.6",
4748
"@eslint/eslintrc": "^3.2.0",
4849
"@eslint/js": "^9.20.0",
4950
"@hey-api/openapi-ts": "^0.64.4",
50-
"playwright-core": "^1.50.1",
5151
"@playwright/test": "^1.50.1",
5252
"@tanstack/eslint-plugin-query": "^5.66.1",
5353
"@types/react": "^19.0.10",
@@ -67,13 +67,14 @@
6767
"eslint-plugin-react-hooks": "^5.1.0",
6868
"eslint-plugin-require-explicit-generics": "^1.0.0",
6969
"knip": "^5.44.1",
70+
"playwright-core": "^1.50.1",
7071
"prettier": "3.5.0",
7172
"prettier-plugin-organize-imports": "^4.1.0",
7273
"release-it": "^18.1.2",
7374
"typescript": "5.7.3",
75+
"typescript-eslint": "^8.24.1",
7476
"uuid": "^11.0.5",
75-
"vite": "^6.1.0",
76-
"typescript-eslint": "^8.24.1"
77+
"vite": "^6.1.0"
7778
},
7879
"overrides": {
7980
"zustand": {

src/components/content/home/WelcomeCard.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import React from 'react';
1010
function WelcomeCard(): React.JSX.Element {
1111
return (
1212
<>
13-
<Card title='Welcome to Xpanse' bordered={true}>
13+
<Card title='Welcome to Xpanse' variant={'outlined'}>
1414
<RocketOutlined />{' '}
1515
<a href='https://eclipse.dev/xpanse' target='_blank' rel='noopener noreferrer'>
1616
Getting started with Xpanse

src/components/content/home/common/DashBoardError.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default function DashBoardError({
2020
if (isHandleKnownErrorResponse(error)) {
2121
const response: ErrorResponse = error.body;
2222
return (
23-
<Card title='Services Dashboard' bordered={true}>
23+
<Card title='Services Dashboard' variant={'outlined'}>
2424
<Alert
2525
message={response.errorType.valueOf()}
2626
description={convertStringArrayToUnorderedList(response.details)}
@@ -43,7 +43,7 @@ export default function DashBoardError({
4343
);
4444
} else {
4545
return (
46-
<Card title='Services Dashboard' bordered={true}>
46+
<Card title='Services Dashboard' variant={'outlined'}>
4747
<Alert
4848
message='Fetching Service Details Failed'
4949
description={error?.message}

src/components/content/home/common/DashBoardSkeleton.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import dashboardStyles from '../../../../styles/dashboard.module.css';
99

1010
export function DashBoardSkeleton(): React.JSX.Element {
1111
return (
12-
<Card title='Services Dashboard' bordered={true}>
12+
<Card title='Services Dashboard' variant={'outlined'}>
1313
<Skeleton
1414
avatar={false}
1515
active={true}

src/components/content/home/isv/IsvServicesDashBoard.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export function IsvServicesDashBoard(): React.JSX.Element {
9595

9696
return (
9797
<>
98-
<Card title='Services Dashboard' bordered={true}>
98+
<Card title='Services Dashboard' variant={'outlined'}>
9999
<Row gutter={16} justify='start'>
100100
<Col span={12} className={dashboardStyles.dashboardContainerClass}>
101101
<div

src/components/content/home/user/EndUserServicesDashboard.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export function EndUserServicesDashboard(): React.JSX.Element {
7070

7171
return (
7272
<>
73-
<Card title='Services Dashboard' bordered={true}>
73+
<Card title='Services Dashboard' variant={'outlined'}>
7474
<Row gutter={16} justify={'start'}>
7575
<Col span={12} className={dashboardStyles.dashboardContainerClass}>
7676
<div

src/index.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-FileCopyrightText: Huawei Inc.
44
*/
55

6+
// as recommended here - https://ant.design/docs/react/v5-for-19#compatibility-package
7+
// to be removed with antd v6
8+
import '@ant-design/v5-patch-for-react-19';
69
import React from 'react';
710
import ReactDOM from 'react-dom/client';
811
import { BrowserRouter } from 'react-router-dom';

tests/admin/healthcheck/health-check.spec.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ test('filtering by backend name works', async ({ page, baseURL }) => {
3535
await layoutHeader.switchUserRole('admin');
3636
const healthCheckMenu = new HealthCheckPage(page);
3737
await healthCheckMenu.clickHealthCheckMenuItem();
38-
await page.getByRole('columnheader', { name: 'Name filter' }).getByRole('button').click();
38+
await page.waitForTimeout(5000);
39+
await page.getByLabel('Name').getByRole('button', { name: 'filter' }).click();
3940
await page.locator('css=div:nth-child(2) > .ant-tree-checkbox > .ant-tree-checkbox-inner').click();
4041
await page.getByRole('button', { name: 'OK', exact: true }).click();
41-
await expect(page.getByRole('cell', { name: 'Terraform Boot' }).first()).toBeVisible();
42+
await expect(page.getByRole('cell', { name: 'Terra Boot' }).first()).toBeVisible();
4243
await expect(page.getByRole('button', { name: 'check-circle OK' })).toBeVisible();
4344
});
4445

tests/utils/mocks/health-check-mocks.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ export const mockHealthCheckSuccessResponse = async (page: Page, timeToWaitForRe
2121
details: null,
2222
},
2323
{
24-
backendSystemType: 'Terraform Boot',
25-
name: 'Terraform Boot',
24+
backendSystemType: 'Terra Boot',
25+
name: 'Terra Boot',
2626
healthStatus: 'OK',
2727
endpoint: 'http://localhost:9090',
2828
details: null,

0 commit comments

Comments
 (0)