Skip to content

Commit 5ac7623

Browse files
baixinsuibaixinsui
committed
remove deploy request && add deployment input properties
1 parent 607af58 commit 5ac7623

21 files changed

+2355
-5677
lines changed

‎src/components/content/catalog/services/policies/policyList/useGetServicePolicyList.tsx

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

66
import { useQuery } from '@tanstack/react-query';
7-
import { listServicePolicies, ListServicePoliciesData } from '../../../../../../xpanse-api/generated';
7+
import { GetAllServicePoliciesData, getAllServicePolicies } from '../../../../../../xpanse-api/generated';
88

99
export const useGetServicePolicyList = (serviceTemplateId: string) => {
1010
return useQuery({
1111
queryKey: ['listServicePolicies', serviceTemplateId],
1212
queryFn: () => {
13-
const data: ListServicePoliciesData = {
13+
const data: GetAllServicePoliciesData = {
1414
serviceTemplateId: serviceTemplateId,
1515
};
16-
return listServicePolicies(data);
16+
return getAllServicePolicies(data);
1717
},
1818
refetchOnWindowFocus: false,
1919
enabled: serviceTemplateId.length > 0,

‎src/components/content/deployedServices/common/DeployedServicesDetailsContent.tsx

+1-6
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ import { DeployedResources } from './DeployedResources';
1515
export function DeployedServicesDetailsContent({
1616
content,
1717
requestParams,
18-
resultMessage,
1918
deployResources,
2019
serviceId,
2120
}: {
2221
content: Map<string, string>;
23-
requestParams: Map<string, unknown>;
24-
resultMessage: React.JSX.Element | undefined;
22+
requestParams: Map<string, string>;
2523
deployResources: DeployResource[];
2624
serviceId: string;
2725
}): React.JSX.Element {
@@ -46,9 +44,6 @@ export function DeployedServicesDetailsContent({
4644
if (requestParams.size > 0) {
4745
items.push(convertMapToDetailsList(requestParams, 'Request Parameters'));
4846
}
49-
if (resultMessage !== undefined) {
50-
items.push(resultMessage);
51-
}
5247
if (deployResources.length > 0) {
5348
items.push(DeployedResources(deployResources, 'Deployed Resources'));
5449
}

‎src/components/content/deployedServices/common/DeploymentResultMessage.tsx

-30
This file was deleted.

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

+7-13
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ import {
1212
VendorHostedDeployedServiceDetails,
1313
} from '../../../../xpanse-api/generated';
1414
import { DeployedServicesDetailsContent } from '../common/DeployedServicesDetailsContent';
15-
import { DeploymentResultMessage } from '../common/DeploymentResultMessage';
1615

1716
export const MyServiceDetails = ({
1817
deployedService,
1918
}: {
2019
deployedService: DeployedServiceDetails | VendorHostedDeployedServiceDetails;
2120
}): React.JSX.Element => {
2221
const endPointMap = new Map<string, string>();
23-
const requestMap = new Map<string, unknown>();
24-
let resultMessage = undefined;
22+
const requestMap = new Map<string, string>();
2523
let deployResourceMap: DeployResource[] = [];
2624

2725
if (deployedService.serviceHostingType.toString() === serviceHostingType.SELF.toString()) {
@@ -31,14 +29,11 @@ export const MyServiceDetails = ({
3129
endPointMap.set(key, serviceDetailVo.deployedServiceProperties[key]);
3230
}
3331
}
34-
if (serviceDetailVo.deployRequest.serviceRequestProperties) {
35-
for (const key in serviceDetailVo.deployRequest.serviceRequestProperties) {
36-
requestMap.set(key, serviceDetailVo.deployRequest.serviceRequestProperties[key]);
32+
if (serviceDetailVo.inputProperties) {
33+
for (const key in serviceDetailVo.inputProperties) {
34+
requestMap.set(key, serviceDetailVo.inputProperties[key]);
3735
}
3836
}
39-
if (serviceDetailVo.resultMessage) {
40-
resultMessage = DeploymentResultMessage(serviceDetailVo.resultMessage);
41-
}
4237
if (serviceDetailVo.deployResources) {
4338
deployResourceMap = serviceDetailVo.deployResources;
4439
}
@@ -49,9 +44,9 @@ export const MyServiceDetails = ({
4944
endPointMap.set(key, serviceDetailVo.deployedServiceProperties[key]);
5045
}
5146
}
52-
if (serviceDetailVo.deployRequest.serviceRequestProperties) {
53-
for (const key in serviceDetailVo.deployRequest.serviceRequestProperties) {
54-
requestMap.set(key, serviceDetailVo.deployRequest.serviceRequestProperties[key]);
47+
if (serviceDetailVo.inputProperties) {
48+
for (const key in serviceDetailVo.inputProperties) {
49+
requestMap.set(key, serviceDetailVo.inputProperties[key]);
5550
}
5651
}
5752
}
@@ -61,7 +56,6 @@ export const MyServiceDetails = ({
6156
<DeployedServicesDetailsContent
6257
content={endPointMap}
6358
requestParams={requestMap}
64-
resultMessage={resultMessage}
6559
deployResources={deployResourceMap}
6660
serviceId={deployedService.serviceId}
6761
/>

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

+1-15
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,7 @@ import serviceModifyStyles from '../../../../styles/service-modify.module.css';
88
import { ServiceOrderDetails } from '../../../../xpanse-api/generated';
99
const { Text } = Typography;
1010
export const MyServiceHistoryDetails = ({ record }: { record: ServiceOrderDetails }) => {
11-
const requestBodyContent =
12-
Object.keys(record.requestBody).length > 0 ? (
13-
<>
14-
<ul className={serviceModifyStyles.modifyHistoryValueLi}>
15-
{Object.entries(record.requestBody).map(([key, value]) => (
16-
<li key={key}>
17-
<Text strong>{key}:</Text>
18-
<pre>{JSON.stringify(value, null, 2)}</pre>
19-
</li>
20-
))}
21-
</ul>
22-
</>
23-
) : (
24-
<Text>Empty Requests</Text>
25-
);
11+
const requestBodyContent = <pre>{JSON.stringify(record.requestBody, null, 2)}</pre>;
2612

2713
const resultPropertiesContent =
2814
record.resultProperties && Object.keys(record.resultProperties).length > 0 ? (

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

+1-9
Original file line numberDiff line numberDiff line change
@@ -187,14 +187,7 @@ function isHasDeployedServiceProperties(details: VendorHostedDeployedServiceDeta
187187
}
188188

189189
function isHasServiceRequestProperties(details: VendorHostedDeployedServiceDetails | DeployedServiceDetails): boolean {
190-
return !!(
191-
details.deployRequest.serviceRequestProperties &&
192-
Object.keys(details.deployRequest.serviceRequestProperties).length !== 0
193-
);
194-
}
195-
196-
function isHasResultMessage(details: DeployedServiceDetails): boolean {
197-
return !!details.resultMessage;
190+
return !!(details.inputProperties && Object.keys(details.inputProperties).length !== 0);
198191
}
199192

200193
function isHasDeployResources(details: DeployedServiceDetails): boolean {
@@ -212,7 +205,6 @@ export const isDisableDetails = (record: DeployedService) => {
212205
if (
213206
isHasDeployedServiceProperties(details) ||
214207
isHasServiceRequestProperties(details) ||
215-
isHasResultMessage(details) ||
216208
isHasDeployResources(details)
217209
) {
218210
return false;

‎src/components/content/deployedServices/myServices/query/useListDeployedServicesDetailsQuery.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,23 @@
44
*/
55

66
import { useQuery } from '@tanstack/react-query';
7-
import { listDeployedServicesDetails, ListDeployedServicesDetailsData } from '../../../../../xpanse-api/generated';
7+
import {
8+
getAllDeployedServicesWithDetails,
9+
GetAllDeployedServicesWithDetailsData,
10+
} from '../../../../../xpanse-api/generated';
811

912
export default function useListDeployedServicesDetailsQuery() {
1013
return useQuery({
1114
queryKey: ['listDeployedServicesDetails'],
1215
queryFn: () => {
13-
const data: ListDeployedServicesDetailsData = {
16+
const data: GetAllDeployedServicesWithDetailsData = {
1417
categoryName: undefined,
1518
cspName: undefined,
1619
serviceName: undefined,
1720
serviceVersion: undefined,
1821
serviceState: undefined,
1922
};
20-
return listDeployedServicesDetails(data);
23+
return getAllDeployedServicesWithDetails(data);
2124
},
2225
refetchOnWindowFocus: false,
2326
});

‎src/components/content/deployedServices/reports/ReportsServiceDetails.tsx

+4-10
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,27 @@ import { DeployResource, ErrorResponse } from '../../../../xpanse-api/generated'
1010
import { convertStringArrayToUnorderedList } from '../../../utils/generateUnorderedList';
1111
import { isHandleKnownErrorResponse } from '../../common/error/isHandleKnownErrorResponse.ts';
1212
import { DeployedServicesDetailsContent } from '../common/DeployedServicesDetailsContent';
13-
import { DeploymentResultMessage } from '../common/DeploymentResultMessage';
1413
import useGetServiceDetailsByIdForIsvQuery from './query/useGetServiceDetailsByIdForIsvQuery';
1514

1615
export const ReportsServiceDetails = ({ serviceId }: { serviceId: string }): React.JSX.Element => {
1716
const getServiceDetailsByIdQuery = useGetServiceDetailsByIdForIsvQuery(serviceId);
1817

1918
if (getServiceDetailsByIdQuery.isSuccess) {
2019
const endPointMap = new Map<string, string>();
21-
const requestMap = new Map<string, unknown>();
22-
let resultMessage = undefined;
20+
const requestMap = new Map<string, string>();
2321
let deployResourceMap: DeployResource[] = [];
2422
if (getServiceDetailsByIdQuery.data.deployedServiceProperties) {
2523
for (const key in getServiceDetailsByIdQuery.data.deployedServiceProperties) {
2624
endPointMap.set(key, getServiceDetailsByIdQuery.data.deployedServiceProperties[key]);
2725
}
2826
}
29-
if (getServiceDetailsByIdQuery.data.deployRequest.serviceRequestProperties) {
30-
for (const key in getServiceDetailsByIdQuery.data.deployRequest.serviceRequestProperties) {
31-
requestMap.set(key, getServiceDetailsByIdQuery.data.deployRequest.serviceRequestProperties[key]);
27+
if (getServiceDetailsByIdQuery.data.inputProperties) {
28+
for (const key in getServiceDetailsByIdQuery.data.inputProperties) {
29+
requestMap.set(key, getServiceDetailsByIdQuery.data.inputProperties[key]);
3230
}
3331
}
3432

3533
const serviceDetailVo = getServiceDetailsByIdQuery.data;
36-
if (serviceDetailVo.resultMessage) {
37-
resultMessage = DeploymentResultMessage(serviceDetailVo.resultMessage);
38-
}
3934
if (serviceDetailVo.deployResources) {
4035
deployResourceMap = serviceDetailVo.deployResources;
4136
}
@@ -45,7 +40,6 @@ export const ReportsServiceDetails = ({ serviceId }: { serviceId: string }): Rea
4540
<DeployedServicesDetailsContent
4641
content={endPointMap}
4742
requestParams={requestMap}
48-
resultMessage={resultMessage}
4943
deployResources={deployResourceMap}
5044
serviceId={serviceId}
5145
/>

‎src/components/content/monitor/useDeployedServicesByUserQuery.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
*/
55

66
import { useQuery } from '@tanstack/react-query';
7-
import { listDeployedServices, ListDeployedServicesData } from '../../../xpanse-api/generated';
7+
import { getAllDeployedServices, GetAllDeployedServicesData } from '../../../xpanse-api/generated';
88

99
export function useDeployedServicesByUserQuery() {
1010
return useQuery({
1111
queryKey: ['monitor'],
1212
queryFn: () => {
13-
const data: ListDeployedServicesData = {
13+
const data: GetAllDeployedServicesData = {
1414
categoryName: undefined,
1515
cspName: undefined,
1616
serviceName: undefined,
1717
serviceVersion: undefined,
1818
serviceState: undefined,
1919
};
20-
return listDeployedServices(data);
20+
return getAllDeployedServices(data);
2121
},
2222
refetchIntervalInBackground: false,
2323
refetchOnWindowFocus: false,

‎src/components/content/order/common/utils/existingServiceParameters.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ export function getExistingServiceParameters(deployedService: DeployedService):
1616
variables[CUSTOMER_SERVICE_NAME_FIELD] = deployedService.customerServiceName;
1717
if (deployedService.serviceHostingType === serviceHostingType.SELF) {
1818
const selfHostedService = deployedService as DeployedServiceDetails;
19-
for (const key in selfHostedService.deployRequest.serviceRequestProperties) {
20-
variables[key] = selfHostedService.deployRequest.serviceRequestProperties[key];
19+
for (const key in selfHostedService.inputProperties) {
20+
variables[key] = selfHostedService.inputProperties[key];
2121
}
2222
}
2323
if (deployedService.serviceHostingType === serviceHostingType.SERVICE_VENDOR) {
2424
const selfHostedService = deployedService as VendorHostedDeployedServiceDetails;
25-
for (const key in selfHostedService.deployRequest.serviceRequestProperties) {
26-
variables[key] = selfHostedService.deployRequest.serviceRequestProperties[key];
25+
for (const key in selfHostedService.inputProperties) {
26+
variables[key] = selfHostedService.inputProperties[key];
2727
}
2828
}
2929
return variables;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ export const Modify = ({
240240
<OrderItem
241241
key={item.name}
242242
item={item}
243-
csp={currentSelectedService.deployRequest.csp as csp}
244-
region={currentSelectedService.deployRequest.region}
243+
csp={currentSelectedService.csp as csp}
244+
region={currentSelectedService.region}
245245
/>
246246
) : undefined
247247
)}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const Scale = ({
5151
let isDowngradeAllowed: boolean = true;
5252
let getParams: DeployParam[] = [];
5353
const [modifyStatus, setModifyStatus] = useState<serviceDeploymentState | undefined>(undefined);
54-
const [selectFlavor, setSelectFlavor] = useState<string>(currentSelectedService.flavor ?? '');
54+
const [selectFlavor, setSelectFlavor] = useState<string>(currentSelectedService.flavor);
5555
const [scaleWarning, setScaleWarning] = useState<string>('Are you sure to scale the service?');
5656

5757
const [isShowModifyingResult, setIsShowModifyingResult] = useState<boolean>(false);
@@ -137,10 +137,10 @@ export const Scale = ({
137137
};
138138

139139
const getServicePriceQuery = useGetServicePricesQuery(
140-
currentSelectedService.serviceTemplateId ?? '',
141-
currentSelectedService.deployRequest.region.name,
142-
currentSelectedService.deployRequest.region.site,
143-
currentSelectedService.deployRequest.billingMode,
140+
currentSelectedService.serviceTemplateId,
141+
currentSelectedService.region.name,
142+
currentSelectedService.region.site,
143+
currentSelectedService.billingMode,
144144
flavorList
145145
);
146146

@@ -301,8 +301,8 @@ export const Scale = ({
301301
<OrderItem
302302
key={item.name}
303303
item={item}
304-
csp={currentSelectedService.deployRequest.csp as csp}
305-
region={currentSelectedService.deployRequest.region}
304+
csp={currentSelectedService.csp as csp}
305+
region={currentSelectedService.region}
306306
/>
307307
) : undefined
308308
)}

‎src/components/content/order/servicePorting/SelectPortingTarget.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export const SelectPortingTarget = ({
8181
userOrderableServiceVoList
8282
);
8383
setRegionList(regionList);
84-
setSelectRegion(regionList.length > 0 ? regionList[0].region : currentSelectedService.deployRequest.region);
84+
setSelectRegion(regionList.length > 0 ? regionList[0].region : currentSelectedService.region);
8585
const billingModes: billingMode[] | undefined = getBillingModes(
8686
cspList[0],
8787
serviceHostTypes[0],
@@ -94,8 +94,7 @@ export const SelectPortingTarget = ({
9494
userOrderableServiceVoList
9595
);
9696
setSelectBillingMode(
97-
defaultBillingMode ??
98-
(billingModes ? billingModes[0] : (currentSelectedService.deployRequest.billingMode as billingMode))
97+
defaultBillingMode ?? (billingModes ? billingModes[0] : (currentSelectedService.billingMode as billingMode))
9998
);
10099
};
101100

@@ -117,7 +116,7 @@ export const SelectPortingTarget = ({
117116
regions = regionList;
118117
} else {
119118
regionList.forEach((region) => {
120-
if (region.value !== currentSelectedService.deployRequest.region.name) {
119+
if (region.value !== currentSelectedService.region.name) {
121120
regions.push(region);
122121
}
123122
});

0 commit comments

Comments
 (0)