Skip to content

Commit 1723014

Browse files
iskeyiskey
authored
Merge pull request #1535 from swaroopar/feature/fixModelNames
generate new API client and model
2 parents 7f7136c + a13bb95 commit 1723014

38 files changed

+2465
-2054
lines changed

‎src/components/content/catalog/services/cancel/CancelServiceTemplateRequest.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function CancelServiceTemplateRequest({
2828
let requestId: string | undefined = undefined;
2929
if (serviceTemplateHistoryQuery.isSuccess && serviceTemplateHistoryQuery.data.length > 0) {
3030
requestId = serviceTemplateHistoryQuery.data.reduce((latest, current) => {
31-
return new Date(current.createTime) > new Date(latest.createTime) ? current : latest;
31+
return new Date(current.createdTime) > new Date(latest.createdTime) ? current : latest;
3232
}).requestId;
3333
}
3434

‎src/components/content/catalog/services/details/ServiceDetail.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ function ServiceDetail({ serviceDetails }: { serviceDetails: ServiceTemplateDeta
105105
<Descriptions.Item label='Description' styles={{ label: { width: '230px' } }}>
106106
{serviceDetails.description}
107107
</Descriptions.Item>
108-
<Descriptions.Item label='Register Time'>{serviceDetails.createTime}</Descriptions.Item>
108+
<Descriptions.Item label='Register Time'>{serviceDetails.createdTime}</Descriptions.Item>
109109
<Descriptions.Item label='Update Time'>{serviceDetails.lastModifiedTime}</Descriptions.Item>
110110
<Descriptions.Item label='Registration Status'>
111111
<ServiceTemplateRegisterStatus

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ export const ServicePolicies = ({
8787
},
8888
{
8989
title: 'CreatedAt',
90-
dataIndex: 'createTime',
90+
dataIndex: 'createdTime',
9191
defaultSortOrder: 'descend',
92-
sorter: (a, b) => a.createTime.length - b.createTime.length,
92+
sorter: (a, b) => a.createdTime.length - b.createdTime.length,
9393
sortDirections: ['descend'],
9494
},
9595
{

‎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 { getAllServicePolicies, type GetAllServicePoliciesData } 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/common/queries/useLatestServiceOrderStatusQuery.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import { useQuery } from '@tanstack/react-query';
77
import {
88
getLatestServiceOrderStatus,
99
GetLatestServiceOrderStatusData,
10-
taskStatus,
10+
orderStatus,
1111
} from '../../../../xpanse-api/generated';
1212
import { deploymentStatusPollingInterval } from '../../../utils/constants.tsx';
1313

1414
export function useLatestServiceOrderStatusQuery(
1515
orderId: string | undefined,
1616
isStartPolling: boolean,
17-
refetchUntilStates: taskStatus[]
17+
refetchUntilStates: orderStatus[]
1818
) {
1919
return useQuery({
2020
queryKey: ['getServiceDetailsById', orderId],
@@ -26,7 +26,7 @@ export function useLatestServiceOrderStatusQuery(
2626
return getLatestServiceOrderStatus(data);
2727
},
2828
refetchInterval: (query) =>
29-
query.state.data && refetchUntilStates.includes(query.state.data.taskStatus as taskStatus)
29+
query.state.data && refetchUntilStates.includes(query.state.data.orderStatus as orderStatus)
3030
? false
3131
: deploymentStatusPollingInterval,
3232
refetchIntervalInBackground: true,

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ import {
99
GetSelfHostedServiceDetailsByIdData,
1010
getVendorHostedServiceDetailsById,
1111
GetVendorHostedServiceDetailsByIdData,
12+
orderStatus,
1213
serviceHostingType,
13-
taskStatus,
1414
} from '../../../../xpanse-api/generated';
1515

1616
const GET_SERVICE_DETAILS_QUERY_ID = 'getServiceDetailsById';
1717

1818
export function useServiceDetailsByServiceIdQuery(
1919
serviceId: string | undefined,
2020
currentServiceHostingType: string,
21-
currentServiceOrderTaskStatus: string | undefined
21+
currentServiceOrderOrderStatus: string | undefined
2222
) {
2323
return useQuery({
2424
queryKey: [GET_SERVICE_DETAILS_QUERY_ID, serviceId, currentServiceHostingType],
@@ -37,8 +37,8 @@ export function useServiceDetailsByServiceIdQuery(
3737
},
3838
enabled:
3939
serviceId !== undefined &&
40-
(currentServiceOrderTaskStatus === taskStatus.SUCCESSFUL ||
41-
currentServiceOrderTaskStatus === taskStatus.FAILED),
40+
(currentServiceOrderOrderStatus === orderStatus.SUCCESSFUL ||
41+
currentServiceOrderOrderStatus === orderStatus.FAILED),
4242
staleTime: Infinity,
4343
gcTime: Infinity,
4444
});

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import serviceModifyStyles from '../../../../styles/service-modify.module.css';
1212
import {
1313
DeployedServiceDetails,
1414
ErrorResponse,
15+
orderStatus,
1516
ServiceOrderDetails,
16-
taskStatus,
1717
taskType,
1818
VendorHostedDeployedServiceDetails,
1919
} from '../../../../xpanse-api/generated';
@@ -29,15 +29,15 @@ export const MyServiceHistory = ({
2929
}): React.JSX.Element => {
3030
let orderIdFilters: ColumnFilterItem[] = [];
3131
let taskTypeFilters: ColumnFilterItem[] = [];
32-
let taskStatusFilters: ColumnFilterItem[] = [];
32+
let orderStatusFilters: ColumnFilterItem[] = [];
3333
let serviceOrdersHistoryList: ServiceOrderDetails[] = [];
3434
const listServiceOrdersHistoryQuery = useListServiceOrdersHistoryQuery(deployedService.serviceId);
3535

3636
if (listServiceOrdersHistoryQuery.isSuccess && listServiceOrdersHistoryQuery.data.length > 0) {
3737
serviceOrdersHistoryList = listServiceOrdersHistoryQuery.data;
3838
updateOrderIdFilters(listServiceOrdersHistoryQuery.data);
3939
updateTaskTypeFilters();
40-
updateTaskStatusFilters();
40+
updateorderStatusFilters();
4141
}
4242

4343
function updateOrderIdFilters(resp: ServiceOrderDetails[]): void {
@@ -64,16 +64,16 @@ export const MyServiceHistory = ({
6464
taskTypeFilters = filters;
6565
}
6666

67-
function updateTaskStatusFilters(): void {
67+
function updateorderStatusFilters(): void {
6868
const filters: ColumnFilterItem[] = [];
69-
Object.values(taskStatus).forEach((taskStatusItem) => {
69+
Object.values(orderStatus).forEach((orderStatusItem) => {
7070
const filter = {
71-
text: taskStatusItem,
72-
value: taskStatusItem,
71+
text: orderStatusItem,
72+
value: orderStatusItem,
7373
};
7474
filters.push(filter);
7575
});
76-
taskStatusFilters = filters;
76+
orderStatusFilters = filters;
7777
}
7878

7979
const columns: ColumnsType<ServiceOrderDetails> = [
@@ -163,28 +163,28 @@ export const MyServiceHistory = ({
163163
},
164164
},
165165
{
166-
title: 'TaskStatus',
167-
dataIndex: 'taskStatus',
166+
title: 'orderStatus',
167+
dataIndex: 'orderStatus',
168168
align: 'center',
169169
width: 50,
170-
filters: taskStatusFilters,
170+
filters: orderStatusFilters,
171171
filterMode: 'tree',
172172
filterSearch: true,
173-
onFilter: (value: React.Key | boolean, record) => record.taskStatus.startsWith(value.toString()),
173+
onFilter: (value: React.Key | boolean, record) => record.orderStatus.startsWith(value.toString()),
174174
render: (value) => {
175-
if (value === taskStatus.FAILED) {
175+
if (value === orderStatus.FAILED) {
176176
return (
177177
<Tag icon={<CloseCircleOutlined />} color={'error'}>
178178
{value}
179179
</Tag>
180180
);
181-
} else if (value === taskStatus.SUCCESSFUL) {
181+
} else if (value === orderStatus.SUCCESSFUL) {
182182
return (
183183
<Tag icon={<CheckCircleOutlined />} color={'success'}>
184184
{value}
185185
</Tag>
186186
);
187-
} else if (value === taskStatus.IN_PROGRESS) {
187+
} else if (value === orderStatus.IN_PROGRESS) {
188188
return (
189189
<Tag icon={<SyncOutlined />} color={'orange'}>
190190
{value}

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ import {
4747
DeployedService,
4848
DeployedServiceDetails,
4949
name,
50+
orderStatus,
5051
Region,
5152
serviceDeploymentState,
5253
serviceHostingType,
5354
serviceState,
54-
taskStatus,
5555
VendorHostedDeployedServiceDetails,
5656
} from '../../../../xpanse-api/generated';
5757
import { EndUserDashBoardPage, orderPageRoute } from '../../../utils/constants.tsx';
@@ -242,37 +242,37 @@ function MyServices(): React.JSX.Element {
242242
const getStartServiceDetailsQuery = useLatestServiceOrderStatusQuery(
243243
serviceStateStartQuery.data?.orderId ?? '',
244244
serviceStateStartQuery.isSuccess,
245-
[taskStatus.SUCCESSFUL, taskStatus.FAILED]
245+
[orderStatus.SUCCESSFUL, orderStatus.FAILED]
246246
);
247247

248248
const getStopServiceDetailsQuery = useLatestServiceOrderStatusQuery(
249249
serviceStateStopQuery.data?.orderId ?? '',
250250
serviceStateStopQuery.isSuccess,
251-
[taskStatus.SUCCESSFUL, taskStatus.FAILED]
251+
[orderStatus.SUCCESSFUL, orderStatus.FAILED]
252252
);
253253

254254
const getRestartServiceDetailsQuery = useLatestServiceOrderStatusQuery(
255255
serviceStateRestartQuery.data?.orderId ?? '',
256256
serviceStateRestartQuery.isSuccess,
257-
[taskStatus.SUCCESSFUL, taskStatus.FAILED]
257+
[orderStatus.SUCCESSFUL, orderStatus.FAILED]
258258
);
259259

260260
const getDestroyServiceStatusPollingQuery = useLatestServiceOrderStatusQuery(
261261
serviceDestroyQuery.data?.orderId ?? '',
262262
serviceDestroyQuery.isSuccess,
263-
[taskStatus.SUCCESSFUL, taskStatus.FAILED]
263+
[orderStatus.SUCCESSFUL, orderStatus.FAILED]
264264
);
265265

266266
const getReDeployLatestServiceOrderStatusQuery = useLatestServiceOrderStatusQuery(
267267
redeployFailedDeploymentQuery.data?.orderId ?? '',
268268
redeployFailedDeploymentQuery.isSuccess,
269-
[taskStatus.SUCCESSFUL, taskStatus.FAILED]
269+
[orderStatus.SUCCESSFUL, orderStatus.FAILED]
270270
);
271271

272272
const getRecreateServiceOrderStatusPollingQuery = useLatestServiceOrderStatusQuery(
273273
serviceRecreateRequest.data?.orderId,
274274
serviceRecreateRequest.isSuccess,
275-
[taskStatus.SUCCESSFUL, taskStatus.FAILED]
275+
[orderStatus.SUCCESSFUL, orderStatus.FAILED]
276276
);
277277

278278
const getPurgeServiceDetailsQuery = usePurgeRequestStatusQuery(
@@ -945,11 +945,11 @@ function MyServices(): React.JSX.Element {
945945
},
946946
{
947947
title: 'Created On',
948-
dataIndex: 'createTime',
948+
dataIndex: 'createdTime',
949949
defaultSortOrder: 'descend',
950950
sorter: (serviceVoA, serviceVoB) => {
951-
const dateA = new Date(serviceVoA.createTime);
952-
const dateB = new Date(serviceVoB.createTime);
951+
const dateA = new Date(serviceVoA.createdTime);
952+
const dateB = new Date(serviceVoB.createdTime);
953953
return dateA.getTime() - dateB.getTime();
954954
},
955955
align: 'center',

‎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+
type 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/Reports.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ function Reports(): React.JSX.Element {
209209
},
210210
{
211211
title: 'Created On',
212-
dataIndex: 'createTime',
212+
dataIndex: 'createdTime',
213213
defaultSortOrder: 'descend',
214214
sorter: (deployedServiceA, deployedServiceB) => {
215-
const dateA = new Date(deployedServiceA.createTime);
216-
const dateB = new Date(deployedServiceB.createTime);
215+
const dateA = new Date(deployedServiceA.createdTime);
216+
const dateB = new Date(deployedServiceB.createdTime);
217217
return dateA.getTime() - dateB.getTime();
218218
},
219219
align: 'center',

‎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, type 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/ScaleOrModifySubmitStatusAlert.tsx

+12-8
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import { useStopwatch } from 'react-timer-hook';
99
import {
1010
DeployedServiceDetails,
1111
ErrorResponse,
12+
orderStatus,
1213
serviceDeploymentState,
1314
serviceHostingType,
1415
ServiceOrder,
1516
ServiceOrderStatusUpdate,
1617
ServiceProviderContactDetails,
17-
taskStatus,
1818
VendorHostedDeployedServiceDetails,
1919
} from '../../../../xpanse-api/generated';
2020
import { convertStringArrayToUnorderedList } from '../../../utils/generateUnorderedList';
@@ -56,9 +56,10 @@ function ScaleOrModifySubmitStatusAlert({
5656
} else if (modifyServiceRequest.isSuccess) {
5757
if (
5858
getScaleOrModifyServiceOrderStatusQuery.isSuccess &&
59-
(getScaleOrModifyServiceOrderStatusQuery.data.taskStatus.toString() ===
60-
taskStatus.SUCCESSFUL.toString() ||
61-
getScaleOrModifyServiceOrderStatusQuery.data.taskStatus.toString() === taskStatus.FAILED.toString())
59+
(getScaleOrModifyServiceOrderStatusQuery.data.orderStatus.toString() ===
60+
orderStatus.SUCCESSFUL.toString() ||
61+
getScaleOrModifyServiceOrderStatusQuery.data.orderStatus.toString() ===
62+
orderStatus.FAILED.toString())
6263
) {
6364
return (
6465
<OrderProcessingStatus
@@ -76,7 +77,8 @@ function ScaleOrModifySubmitStatusAlert({
7677
}
7778
} else if (
7879
getScaleOrModifyServiceOrderStatusQuery.isPending ||
79-
getScaleOrModifyServiceOrderStatusQuery.data.taskStatus.toString() === taskStatus.IN_PROGRESS.toString()
80+
getScaleOrModifyServiceOrderStatusQuery.data.orderStatus.toString() ===
81+
orderStatus.IN_PROGRESS.toString()
8082
) {
8183
return 'Modifying, Please wait...';
8284
}
@@ -106,7 +108,7 @@ function ScaleOrModifySubmitStatusAlert({
106108
} else if (modifyServiceRequest.isSuccess) {
107109
if (
108110
getScaleOrModifyServiceOrderStatusQuery.isSuccess &&
109-
getScaleOrModifyServiceOrderStatusQuery.data.taskStatus.toString() === taskStatus.FAILED.toString()
111+
getScaleOrModifyServiceOrderStatusQuery.data.orderStatus.toString() === orderStatus.FAILED.toString()
110112
) {
111113
if (stopWatch.isRunning) {
112114
stopWatch.pause();
@@ -115,7 +117,8 @@ function ScaleOrModifySubmitStatusAlert({
115117
return 'error';
116118
} else if (
117119
getScaleOrModifyServiceOrderStatusQuery.isSuccess &&
118-
getScaleOrModifyServiceOrderStatusQuery.data.taskStatus.toString() === taskStatus.SUCCESSFUL.toString()
120+
getScaleOrModifyServiceOrderStatusQuery.data.orderStatus.toString() ===
121+
orderStatus.SUCCESSFUL.toString()
119122
) {
120123
if (stopWatch.isRunning) {
121124
stopWatch.pause();
@@ -124,7 +127,8 @@ function ScaleOrModifySubmitStatusAlert({
124127
return 'success';
125128
} else if (
126129
getScaleOrModifyServiceOrderStatusQuery.isPending ||
127-
getScaleOrModifyServiceOrderStatusQuery.data.taskStatus.toString() === taskStatus.IN_PROGRESS.toString()
130+
getScaleOrModifyServiceOrderStatusQuery.data.orderStatus.toString() ===
131+
orderStatus.IN_PROGRESS.toString()
128132
) {
129133
return 'success';
130134
}

0 commit comments

Comments
 (0)