Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit cce266c

Browse files
committedMar 13, 2025··
update request body for order history.
1 parent 78f01c6 commit cce266c

File tree

7 files changed

+50
-52
lines changed

7 files changed

+50
-52
lines changed
 

‎src/components/content/deployedServices/myServices/MyServiceHistory.tsx

+9-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { Button, Popover, Table, Tag, Typography } from 'antd';
88
import { ColumnsType } from 'antd/es/table';
99
import { ColumnFilterItem } from 'antd/es/table/interface';
1010
import React from 'react';
11-
import serviceModifyStyles from '../../../../styles/service-modify.module.css';
11+
import serviceOperationStyles from '../../../../styles/service-operation.module.css';
1212
import {
1313
DeployedServiceDetails,
1414
ErrorResponse,
@@ -88,9 +88,9 @@ export const MyServiceHistory = ({
8888
onFilter: (value: React.Key | boolean, record) => record.orderId.startsWith(value.toString()),
8989
render: (value: string) => {
9090
return (
91-
<div className={serviceModifyStyles.serviceHistoryValue}>
91+
<div className={serviceOperationStyles.serviceHistoryValue}>
9292
<Paragraph
93-
className={serviceModifyStyles.serviceHistoryOrderIdClass}
93+
className={serviceOperationStyles.serviceHistoryOrderIdClass}
9494
ellipsis={true}
9595
copyable={{ tooltips: value }}
9696
>
@@ -123,7 +123,7 @@ export const MyServiceHistory = ({
123123
title={'Details'}
124124
trigger='hover'
125125
>
126-
<Button className={serviceModifyStyles.serviceOrderErrorDataHover} type={'link'}>
126+
<Button className={serviceOperationStyles.serviceOrderErrorDataHover} type={'link'}>
127127
{'details'}
128128
</Button>
129129
</Popover>
@@ -208,11 +208,13 @@ export const MyServiceHistory = ({
208208
if (value) {
209209
return (
210210
<Popover
211-
content={<pre className={serviceModifyStyles.serviceOrderErrorText}>{value.details}</pre>}
211+
content={
212+
<pre className={serviceOperationStyles.serviceOrderErrorText}>{value.details}</pre>
213+
}
212214
title={value.errorType}
213215
trigger='hover'
214216
>
215-
<Button className={serviceModifyStyles.serviceOrderErrorDataHover} type={'link'}>
217+
<Button className={serviceOperationStyles.serviceOrderErrorDataHover} type={'link'}>
216218
{'failure reason'}
217219
</Button>
218220
</Popover>
@@ -223,7 +225,7 @@ export const MyServiceHistory = ({
223225
];
224226

225227
return (
226-
<div className={serviceModifyStyles.modifyContainer}>
228+
<div className={serviceOperationStyles.orderOperationContainer}>
227229
<Table
228230
columns={columns}
229231
dataSource={serviceOrdersHistoryList}

‎src/components/content/deployedServices/myServices/MyServiceHistoryDetails.tsx

+12-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,25 @@
44
*/
55

66
import { Typography } from 'antd';
7-
import serviceModifyStyles from '../../../../styles/service-modify.module.css';
7+
import serviceOperationStyles from '../../../../styles/service-operation.module.css';
88
import { ServiceOrderDetails } from '../../../../xpanse-api/generated';
99
const { Text } = Typography;
1010
export const MyServiceHistoryDetails = ({ record }: { record: ServiceOrderDetails }) => {
11-
const requestBodyContent = <pre>{JSON.stringify(record.requestBody, null, 2)}</pre>;
11+
const requestBodyContent =
12+
record.requestBody && Object.keys(record.requestBody).length > 0 ? (
13+
<>
14+
<div className={serviceOperationStyles.orderHistoryRequestContent}>
15+
<pre>{JSON.stringify(record.requestBody, null, 2)}</pre>
16+
</div>
17+
</>
18+
) : (
19+
<Text>Empty Requests</Text>
20+
);
1221

1322
const resultPropertiesContent =
1423
record.resultProperties && Object.keys(record.resultProperties).length > 0 ? (
1524
<>
16-
<ul className={serviceModifyStyles.modifyHistoryValueLi}>
25+
<ul className={serviceOperationStyles.orderHistoryValueLi}>
1726
{Object.entries(record.resultProperties).map(([key, value]) => (
1827
<li key={key}>
1928
<Text strong>{key}:</Text>

‎src/components/content/order/common/FlavorFeatures.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { CheckOutlined } from '@ant-design/icons';
77
import { List } from 'antd';
88
import React from 'react';
99
import flavorStyles from '../../../../styles/flavor.module.css';
10-
import serviceModifyStyles from '../../../../styles/service-modify.module.css';
10+
import serviceOperationStyles from '../../../../styles/service-operation.module.css';
1111
import { ServiceFlavor } from '../../../../xpanse-api/generated';
1212

1313
export const FlavorFeatures = ({ flavor }: { flavor: ServiceFlavor }): React.JSX.Element => {
@@ -22,7 +22,7 @@ export const FlavorFeatures = ({ flavor }: { flavor: ServiceFlavor }): React.JSX
2222
renderItem={(item, _) => (
2323
<List.Item className={flavorStyles.flavorFeatureItemName}>
2424
<div>
25-
<CheckOutlined className={serviceModifyStyles.flavorFeaturesItemIcon} />
25+
<CheckOutlined className={serviceOperationStyles.flavorFeaturesItemIcon} />
2626
&nbsp;{item}
2727
</div>
2828
</List.Item>

‎src/components/content/order/common/FlavorPrice.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { Tag, Typography } from 'antd';
77
import React from 'react';
88
import flavorStyles from '../../../../styles/flavor.module.css';
9-
import serviceModifyStyles from '../../../../styles/service-modify.module.css';
9+
import serviceOperationStyles from '../../../../styles/service-operation.module.css';
1010
import { ServiceFlavor } from '../../../../xpanse-api/generated';
1111
import { convertToFlavorMap, getMappedPeriod } from '../formDataHelpers/flavorHelper.ts';
1212
import { ServiceFlavorWithPriceResult } from '../types/ServiceFlavorWithPrice.ts';
@@ -36,7 +36,7 @@ export const FlavorPrice = ({
3636
{flavor.name && flavorMap[flavor.name].price.successful ? (
3737
<>
3838
{flavorMap[flavor.name].price.recurringPrice ? (
39-
<Tag color={'blue'} className={serviceModifyStyles.flavorPriceContent}>
39+
<Tag color={'blue'} className={serviceOperationStyles.flavorPriceContent}>
4040
{flavorMap[flavor.name].price.recurringPrice?.cost
4141
.toString()
4242
.concat(' ')

‎src/components/content/order/modify/Modify.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { useMutation } from '@tanstack/react-query';
88
import { Button, Form, Input, Popconfirm, PopconfirmProps, Tooltip, Typography } from 'antd';
99
import React, { useState } from 'react';
1010
import appStyles from '../../../../styles/app.module.css';
11-
import serviceModifyStyles from '../../../../styles/service-modify.module.css';
11+
import serviceOperationStyles from '../../../../styles/service-operation.module.css';
1212
import serviceOrderStyles from '../../../../styles/service-order.module.css';
1313
import {
1414
csp,
@@ -176,8 +176,8 @@ export const Modify = ({
176176
};
177177

178178
return (
179-
<div className={serviceModifyStyles.modifySelectClass}>
180-
<div className={`${serviceModifyStyles.modifyTitleClass} ${appStyles.contentTitle}`}>
179+
<div className={serviceOperationStyles.serviceSelectClass}>
180+
<div className={`${serviceOperationStyles.serviceTitleClass} ${appStyles.contentTitle}`}>
181181
Modify Parameters:
182182
</div>
183183
{isShowModifyingResult ? (
@@ -199,7 +199,7 @@ export const Modify = ({
199199
autoComplete='off'
200200
initialValues={useOrderFormStore.getState().deployParams}
201201
onFinish={onFinish}
202-
className={serviceModifyStyles.modifyContainer}
202+
className={serviceOperationStyles.orderOperationContainer}
203203
validateTrigger={['onSubmit', 'onBlur', 'onChange']}
204204
key='scale'
205205
disabled={modifyServiceRequest.isPending || modifyServiceRequest.isSuccess}
@@ -247,13 +247,13 @@ export const Modify = ({
247247
)}
248248
</div>
249249
<div className={serviceOrderStyles.orderParamItemLeft} />
250-
<div className={serviceModifyStyles.serviceModifySubmitResetContainer}>
251-
<div className={serviceModifyStyles.serviceModifySubmitClass}>
250+
<div className={serviceOperationStyles.serviceUpdateSubmitResetContainer}>
251+
<div className={serviceOperationStyles.serviceUpdateSubmitClass}>
252252
<Popconfirm
253253
placement='top'
254254
title='Modify parameters'
255255
description={
256-
<div className={serviceModifyStyles.serviceModifyWarningsContent}>
256+
<div className={serviceOperationStyles.serviceModifyWarningsContent}>
257257
<Paragraph>{modifyWarning}</Paragraph>
258258
</div>
259259
}

‎src/components/content/order/scale/Scale.tsx

+9-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Badge, Button, Flex, Form, Input, Popconfirm, PopconfirmProps, Radio, S
99
import React, { useState } from 'react';
1010
import appStyles from '../../../../styles/app.module.css';
1111
import flavorStyles from '../../../../styles/flavor.module.css';
12-
import serviceModifyStyles from '../../../../styles/service-modify.module.css';
12+
import serviceOperationStyles from '../../../../styles/service-operation.module.css';
1313
import serviceOrderStyles from '../../../../styles/service-order.module.css';
1414
import {
1515
csp,
@@ -151,8 +151,10 @@ export const Scale = ({
151151
};
152152

153153
return (
154-
<div className={serviceModifyStyles.modifySelectClass}>
155-
<div className={`${serviceModifyStyles.modifyTitleClass} ${appStyles.contentTitle}`}>Change Flavor:</div>
154+
<div className={serviceOperationStyles.serviceSelectClass}>
155+
<div className={`${serviceOperationStyles.serviceTitleClass} ${appStyles.contentTitle}`}>
156+
Change Flavor:
157+
</div>
156158
{isShowModifyingResult ? (
157159
<ScaleOrModifySubmitStatusAlert
158160
modifyServiceRequest={modifyServiceRequest}
@@ -173,7 +175,7 @@ export const Scale = ({
173175
autoComplete='off'
174176
initialValues={useOrderFormStore.getState().deployParams}
175177
onFinish={onFinish}
176-
className={serviceModifyStyles.modifyContainer}
178+
className={serviceOperationStyles.orderOperationContainer}
177179
validateTrigger={['onSubmit', 'onBlur', 'onChange']}
178180
key='scale'
179181
disabled={
@@ -248,7 +250,7 @@ export const Scale = ({
248250
<div className={flavorStyles.ribbonContainer}>
249251
<Badge.Ribbon
250252
text='current'
251-
className={serviceModifyStyles.flavorCardCustomRibbon}
253+
className={serviceOperationStyles.flavorCardCustomRibbon}
252254
color={'#b5b5b5'}
253255
>
254256
{radioButton}
@@ -308,8 +310,8 @@ export const Scale = ({
308310
)}
309311
</div>
310312
<div className={serviceOrderStyles.orderParamItemLeft} />
311-
<div className={serviceModifyStyles.serviceModifySubmitResetContainer}>
312-
<div className={serviceModifyStyles.serviceModifySubmitClass}>
313+
<div className={serviceOperationStyles.serviceUpdateSubmitResetContainer}>
314+
<div className={serviceOperationStyles.serviceUpdateSubmitClass}>
313315
<Popconfirm
314316
placement='top'
315317
title='Scale'

‎src/styles/service-modify.module.css ‎src/styles/service-operation.module.css

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

6-
.modify-select-class {
6+
.service-select-class {
77
height: 80%;
88
}
99

10-
.modify-select-flavor-billing {
11-
width: 100%;
12-
margin-bottom: 20px;
13-
}
14-
15-
.modify-title-class {
10+
.service-title-class {
1611
margin-left: 24px;
1712
margin-bottom: 8px;
1813
}
@@ -64,27 +59,17 @@
6459
align-items: center;
6560
}
6661

67-
.modify-container {
62+
.order-operation-container {
6863
margin-left: 5px;
6964
max-width: 1600px;
7065
}
7166

72-
.modify-history-value {
73-
white-space: normal;
74-
word-break: break-word;
75-
vertical-align: top;
76-
}
77-
78-
.modify-history-error-msg-value {
79-
display: inline-block;
80-
max-width: 145px;
81-
white-space: nowrap;
82-
overflow: hidden;
83-
text-overflow: ellipsis;
84-
vertical-align: middle;
67+
.order-history-request-content {
68+
text-align: left;
69+
margin-left: 30px;
8570
}
8671

87-
.modify-history-value-li {
72+
.order-history-value-li {
8873
text-align: left;
8974
}
9075

@@ -98,7 +83,7 @@
9883
left: 70%;
9984
}
10085

101-
.service-modify-submit-reset-container {
86+
.service-update-submit-reset-container {
10287
display: flex;
10388
gap: 20px;
10489
flex-direction: row;
@@ -107,7 +92,7 @@
10792
width: 600px;
10893
}
10994

110-
.service-modify-submit-class {
95+
.service-update-submit-class {
11196
display: flex;
11297
flex-direction: row;
11398
text-align: right;

0 commit comments

Comments
 (0)
Please sign in to comment.