Skip to content

Commit e6f6da8

Browse files
WangLiNarutoWangLiNaruto
authored
Merge branch 'eclipse-xpanse:main' into main
2 parents 1565578 + 98887cd commit e6f6da8

File tree

72 files changed

+1724
-1448
lines changed

Some content is hidden

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

72 files changed

+1724
-1448
lines changed

‎.github/workflows/ui-docker-image.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Extract Docker metadata
4747
id: meta
48-
uses: docker/metadata-action@v5.6.1
48+
uses: docker/metadata-action@v5.7.0
4949
with:
5050
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
5151

‎.github/workflows/ui-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686

8787
- name: Extract Docker metadata
8888
id: meta
89-
uses: docker/metadata-action@v5.6.1
89+
uses: docker/metadata-action@v5.7.0
9090
with:
9191
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
9292

‎package-lock.json

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

‎package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"dependencies": {
77
"@ant-design/icons": "^5.6.1",
88
"@axa-fr/react-oidc": "^7.25.3",
9-
"@tanstack/react-query": "^5.66.9",
10-
"antd": "^5.24.1",
9+
"@tanstack/react-query": "^5.67.1",
10+
"antd": "^5.24.2",
1111
"echarts": "5.6.0",
1212
"echarts-for-react": "^3.0.2",
1313
"rc-field-form": "^2.6.0",
@@ -46,35 +46,35 @@
4646
"@axa-fr/oidc-client": "^7.22.32",
4747
"@eslint/compat": "^1.2.6",
4848
"@eslint/eslintrc": "^3.2.0",
49-
"@eslint/js": "^9.20.0",
50-
"@hey-api/openapi-ts": "^0.64.4",
49+
"@eslint/js": "^9.21.0",
50+
"@hey-api/openapi-ts": "^0.64.9",
5151
"@playwright/test": "^1.50.1",
5252
"@tanstack/eslint-plugin-query": "^5.66.1",
5353
"@types/react": "^19.0.10",
5454
"@types/react-dom": "^19.0.4",
5555
"@types/uuid": "^10.0.0",
56-
"@typescript-eslint/eslint-plugin": "^8.24.1",
57-
"@typescript-eslint/parser": "^8.24.1",
56+
"@typescript-eslint/eslint-plugin": "^8.26.0",
57+
"@typescript-eslint/parser": "^8.26.0",
5858
"@vitejs/plugin-react": "^4.3.4",
5959
"env-cmd": "^10.1.0",
60-
"eslint": "^9.20.1",
61-
"eslint-config-prettier": "^10.0.1",
62-
"eslint-import-resolver-typescript": "^3.8.1",
60+
"eslint": "^9.21.0",
61+
"eslint-config-prettier": "^10.0.2",
62+
"eslint-import-resolver-typescript": "^3.8.3",
6363
"eslint-plugin-css-modules": "^2.12.0",
6464
"eslint-plugin-import": "^2.31.0",
6565
"eslint-plugin-prettier": "^5.2.3",
6666
"eslint-plugin-react": "^7.37.4",
67-
"eslint-plugin-react-hooks": "^5.1.0",
67+
"eslint-plugin-react-hooks": "^5.2.0",
6868
"eslint-plugin-require-explicit-generics": "^1.0.0",
69-
"knip": "^5.44.5",
69+
"knip": "^5.45.0",
7070
"playwright-core": "^1.50.1",
71-
"prettier": "3.5.1",
71+
"prettier": "3.5.3",
7272
"prettier-plugin-organize-imports": "^4.1.0",
7373
"release-it": "^18.1.2",
74-
"typescript": "5.7.3",
75-
"typescript-eslint": "^8.24.1",
76-
"uuid": "^11.0.5",
77-
"vite": "^6.1.0"
74+
"typescript": "5.8.2",
75+
"typescript-eslint": "^8.26.0",
76+
"uuid": "^11.1.0",
77+
"vite": "^6.2.0"
7878
},
7979
"overrides": {
8080
"zustand": {

‎src/components/content/catalog/services/policies/ServicePolicies.tsx

+11-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import React, { useState } from 'react';
1111
import policyStyles from '../../../../../styles/policies.module.css';
1212
import servicePolicyStyles from '../../../../../styles/service-policies.module.css';
1313
import { ServicePolicy, ServiceTemplateDetailVo } from '../../../../../xpanse-api/generated';
14+
import { serviceUserPoliciesErrorText } from '../../../../utils/constants.tsx';
15+
import RetryPrompt from '../../../common/error/RetryPrompt.tsx';
1416
import { AddOrUpdateServicePolicy } from './AddOrUpdateServicePolicy';
15-
import ServicePolicyListError from './ServicePolicyListError';
1617
import ServicePolicyDeleteStatus from './deletePolicy/ServicePolicyDeleteStatus';
1718
import { useDeleteServicePolicy } from './deletePolicy/useDeleteServicePolicy';
1819
import { useGetServicePolicyList } from './policyList/useGetServicePolicyList';
@@ -240,7 +241,15 @@ export const ServicePolicies = ({
240241
Add
241242
</Button>
242243
</div>
243-
{servicePolicyListQuery.isError ? <ServicePolicyListError error={servicePolicyListQuery.error} /> : <></>}
244+
{servicePolicyListQuery.isError ? (
245+
<RetryPrompt
246+
error={servicePolicyListQuery.error}
247+
retryRequest={refreshServicePoliciesList}
248+
errorMessage={serviceUserPoliciesErrorText}
249+
/>
250+
) : (
251+
<></>
252+
)}
244253
<Modal
245254
title={currentServicePolicy === undefined ? 'Add service policy' : 'Update service policy'}
246255
width={1000}

‎src/components/content/catalog/services/policies/ServicePolicyListError.tsx

-40
This file was deleted.

‎src/components/content/catalog/services/policies/addPolicy/ServicePolicyCreateResultStatus.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ export default function ServicePolicyCreateResultStatus({
4242
{' '}
4343
<Alert
4444
message={'Adding Policy Failed'}
45-
description={
46-
<ServicePolicySubmitResult msg={error?.message ? error.message : <></>} uuid={''} />
47-
}
45+
description={<ServicePolicySubmitResult msg={error?.message ?? <></>} uuid={''} />}
4846
showIcon
4947
closable={true}
5048
type={'error'}

‎src/components/content/catalog/services/policies/deletePolicy/ServicePolicyDeleteStatus.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ export default function ServicePolicyDeleteStatus({
4949
{' '}
5050
<Alert
5151
message={'Deleting Policy Failed'}
52-
description={
53-
<ServicePolicySubmitResult msg={error?.message ? error.message : <></>} uuid={id} />
54-
}
52+
description={<ServicePolicySubmitResult msg={error?.message ?? <></>} uuid={id} />}
5553
showIcon
5654
closable={true}
5755
onClose={onClose}

‎src/components/content/catalog/services/policies/updatePolicy/ServicePolicyUpdateResultStatus.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ export default function ServicePolicyUpdateResultStatus({
4242
{' '}
4343
<Alert
4444
message={'Updating Policy Failed'}
45-
description={
46-
<ServicePolicySubmitResult msg={error?.message ? error.message : <></>} uuid={''} />
47-
}
45+
description={<ServicePolicySubmitResult msg={error?.message ?? <></>} uuid={''} />}
4846
showIcon
4947
closable={true}
5048
type={'error'}

‎src/components/content/catalog/services/tree/CategoryCatalog.tsx

+13-26
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
*/
55

66
import { TagOutlined } from '@ant-design/icons';
7-
import { Alert, Empty, Skeleton } from 'antd';
7+
import { Empty, Skeleton } from 'antd';
88
import { DataNode } from 'antd/es/tree';
99
import React, { useMemo, useState } from 'react';
1010
import catalogStyles from '../../../../../styles/catalog.module.css';
1111
import servicesEmptyStyles from '../../../../../styles/services-empty.module.css';
12-
import { category, ErrorResponse, ServiceTemplateDetailVo } from '../../../../../xpanse-api/generated';
13-
import { convertStringArrayToUnorderedList } from '../../../../utils/generateUnorderedList';
12+
import { category, ServiceTemplateDetailVo } from '../../../../../xpanse-api/generated';
13+
import { serviceDetailsErrorText } from '../../../../utils/constants.tsx';
1414
import {
1515
groupServicesByVersionForSpecificServiceName,
1616
groupServiceTemplatesByName,
1717
} from '../../../common/catalog/catalogProps';
18-
import { isHandleKnownErrorResponse } from '../../../common/error/isHandleKnownErrorResponse.ts';
18+
import RetryPrompt from '../../../common/error/RetryPrompt.tsx';
1919
import { useAvailableServiceTemplatesQuery } from '../query/useAvailableServiceTemplatesQuery';
2020
import { CatalogFullView } from './CatalogFullView';
2121

@@ -62,28 +62,15 @@ function CategoryCatalog({ category }: { category: category }): React.JSX.Elemen
6262

6363
// Handle errors
6464
if (availableServiceTemplatesQuery.isError) {
65-
if (isHandleKnownErrorResponse(availableServiceTemplatesQuery.error)) {
66-
const response: ErrorResponse = availableServiceTemplatesQuery.error.body;
67-
return (
68-
<Alert
69-
message={response.errorType}
70-
description={convertStringArrayToUnorderedList(response.details)}
71-
type={'error'}
72-
closable={true}
73-
className={catalogStyles.catalogSkeleton}
74-
/>
75-
);
76-
} else {
77-
return (
78-
<Alert
79-
message='Fetching Service Details Failed'
80-
description={availableServiceTemplatesQuery.error.message}
81-
type={'error'}
82-
closable={true}
83-
className={catalogStyles.catalogSkeleton}
84-
/>
85-
);
86-
}
65+
return (
66+
<RetryPrompt
67+
error={availableServiceTemplatesQuery.error}
68+
retryRequest={() => {
69+
void availableServiceTemplatesQuery.refetch();
70+
}}
71+
errorMessage={serviceDetailsErrorText}
72+
/>
73+
);
8774
}
8875

8976
// Handle loading state

‎src/components/content/common/error/RetryPrompt.tsx

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
* SPDX-FileCopyrightText: Huawei Inc.
4+
*/
5+
6+
import { Alert, Button, Row } from 'antd';
7+
import React from 'react';
8+
import errorAlertStyles from '../../../../styles/error-alert.module.css';
9+
import tableStyles from '../../../../styles/table.module.css';
10+
import { ErrorResponse } from '../../../../xpanse-api/generated';
11+
import { convertStringArrayToUnorderedList } from '../../../utils/generateUnorderedList.tsx';
12+
import { isHandleKnownErrorResponse } from './isHandleKnownErrorResponse.ts';
13+
14+
export default function RetryPrompt({
15+
error,
16+
retryRequest,
17+
errorMessage,
18+
}: {
19+
error: Error;
20+
retryRequest: () => void;
21+
errorMessage: string;
22+
}): React.JSX.Element {
23+
if (isHandleKnownErrorResponse(error)) {
24+
const response: ErrorResponse = error.body;
25+
return (
26+
<div>
27+
<Alert
28+
showIcon={true}
29+
message={response.errorType.valueOf()}
30+
description={convertStringArrayToUnorderedList(response.details)}
31+
type={'error'}
32+
closable={true}
33+
className={tableStyles.tableLoadFailureAlert}
34+
action={
35+
<>
36+
<Row>
37+
<Button
38+
className={errorAlertStyles.tryAgainBtnInAlertClass}
39+
size='small'
40+
type='primary'
41+
onClick={retryRequest}
42+
danger={true}
43+
>
44+
Retry Request
45+
</Button>
46+
</Row>
47+
</>
48+
}
49+
/>
50+
</div>
51+
);
52+
} else {
53+
return (
54+
<div>
55+
<Alert
56+
showIcon={true}
57+
message={errorMessage}
58+
description={error.message}
59+
type={'error'}
60+
closable={true}
61+
className={tableStyles.tableLoadFailureAlert}
62+
action={
63+
<>
64+
<Row>
65+
<Button
66+
className={errorAlertStyles.tryAgainBtnInAlertClass}
67+
size='small'
68+
type='primary'
69+
onClick={retryRequest}
70+
danger={true}
71+
>
72+
Retry Request
73+
</Button>
74+
</Row>
75+
</>
76+
}
77+
/>
78+
</div>
79+
);
80+
}
81+
}

‎src/components/content/common/queries/useLatestServiceOrderStatusQuery.ts

+10-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,16 @@ export function useLatestServiceOrderStatusQuery(
2525
};
2626
return getLatestServiceOrderStatus(data);
2727
},
28-
refetchInterval: (query) =>
29-
query.state.data && refetchUntilStates.includes(query.state.data.orderStatus as orderStatus)
30-
? false
31-
: deploymentStatusPollingInterval,
28+
refetchInterval: (query) => {
29+
if (
30+
!query.state.data ||
31+
query.state.error ||
32+
refetchUntilStates.includes(query.state.data.orderStatus as orderStatus)
33+
) {
34+
return false;
35+
}
36+
return deploymentStatusPollingInterval;
37+
},
3238
refetchIntervalInBackground: true,
3339
refetchOnWindowFocus: false,
3440
enabled: orderId !== undefined && isStartPolling,

0 commit comments

Comments
 (0)