eclipse-xpanse · swaroopar · Dec 16, 2024 · Dec 16, 2024
diff --git a/src/components/content/catalog/services/delete/DeleteServiceMutation.ts b/src/components/content/catalog/services/delete/DeleteServiceMutation.ts
@@ -8,7 +8,7 @@ export function useDeleteRequest(id: string) {
         mutationKey: [id, deleteKey],
         mutationFn: () => {
             const deleteData: DeleteServiceTemplateData = {
-                id: id,
+                serviceTemplateId: id,
             };
             return deleteServiceTemplate(deleteData);
         },

diff --git a/src/components/content/catalog/services/details/ServiceProvider.tsx b/src/components/content/catalog/services/details/ServiceProvider.tsx
@@ -189,14 +189,7 @@ function ServiceProvider({
                     {activeServiceDetail ? (
                         <>
                             <UnregisterResult id={activeServiceDetail.serviceTemplateId} category={category} />
-                            <ReRegisterResult
-                                id={activeServiceDetail.serviceTemplateId}
-                                serviceRegistrationStatus={
-                                    reRegisterRequest.data
-                                        ?.serviceTemplateRegistrationState as serviceTemplateRegistrationState
-                                }
-                                category={category}
-                            />
+                            <ReRegisterResult id={activeServiceDetail.serviceTemplateId} category={category} />
                             <DeleteResult id={activeServiceDetail.serviceTemplateId} category={category} />
                             <Tabs
                                 items={items}

diff --git a/src/components/content/catalog/services/re-register/ReRegisterMutation.ts b/src/components/content/catalog/services/re-register/ReRegisterMutation.ts
@@ -3,22 +3,22 @@ import { reRegisterServiceTemplate, type ReRegisterServiceTemplateData } from '.
 
 const reRegisterKey: string = 're-register';
 
-export function useReRegisterRequest(id: string) {
+export function useReRegisterRequest(serviceTemplateId: string) {
     return useMutation({
-        mutationKey: [id, reRegisterKey],
+        mutationKey: [serviceTemplateId, reRegisterKey],
         mutationFn: () => {
             const data: ReRegisterServiceTemplateData = {
-                id: id,
+                serviceTemplateId: serviceTemplateId,
             };
             return reRegisterServiceTemplate(data);
         },
         gcTime: 0,
     });
 }
 
-export function useGetReRegisterMutationState(id: string) {
+export function useGetReRegisterMutationState(serviceTemplateId: string) {
     return useMutationState({
-        filters: { mutationKey: [id, reRegisterKey], exact: true },
+        filters: { mutationKey: [serviceTemplateId, reRegisterKey], exact: true },
         select: (mutation) => mutation.state,
     });
 }
diff --git a/src/components/content/catalog/services/re-register/ReRegisterResult.tsx b/src/components/content/catalog/services/re-register/ReRegisterResult.tsx
@@ -7,20 +7,12 @@ import { useQueryClient } from '@tanstack/react-query';
 import { Alert } from 'antd';
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
-import { ApiError, category, serviceTemplateRegistrationState } from '../../../../../xpanse-api/generated';
+import { ApiError, category } from '../../../../../xpanse-api/generated';
 import { catalogPageRoute } from '../../../../utils/constants';
 import { getQueryKey } from '../query/useAvailableServiceTemplatesQuery';
 import { useGetReRegisterMutationState } from './ReRegisterMutation';
 
-export function ReRegisterResult({
-    id,
-    serviceRegistrationStatus,
-    category,
-}: {
-    id: string;
-    serviceRegistrationStatus: serviceTemplateRegistrationState;
-    category: category;
-}): React.JSX.Element | undefined {
+export function ReRegisterResult({ id, category }: { id: string; category: category }): React.JSX.Element | undefined {
     const useReRegisterRequestState = useGetReRegisterMutationState(id);
     const queryClient = useQueryClient();
     const navigate = useNavigate();
@@ -37,11 +29,7 @@ export function ReRegisterResult({
         if (useReRegisterRequestState[0].status === 'success') {
             return (
                 <Alert
-                    message={
-                        serviceRegistrationStatus === serviceTemplateRegistrationState.APPROVED
-                            ? 'service added to catalog again successfully'
-                            : 'Service re-registered successfully'
-                    }
+                    message={'service added to catalog again successfully'}
                     description={'Service submitted for review of cloud provider.'}
                     showIcon
                     type={'success'}

diff --git a/src/components/content/catalog/services/re-register/ReRegisterService.tsx b/src/components/content/catalog/services/re-register/ReRegisterService.tsx
@@ -8,7 +8,7 @@ import { UseMutationResult } from '@tanstack/react-query';
 import { Button, Popconfirm } from 'antd';
 import React from 'react';
 import catalogStyles from '../../../../../styles/catalog.module.css';
-import { ServiceTemplateDetailVo, serviceTemplateRegistrationState } from '../../../../../xpanse-api/generated';
+import { serviceTemplateRegistrationState, ServiceTemplateRequestInfo } from '../../../../../xpanse-api/generated';
 import { useGetDeleteMutationState } from '../delete/DeleteServiceMutation';
 
 function ReRegisterService({
@@ -19,7 +19,7 @@ function ReRegisterService({
 }: {
     id: string;
     setIsViewDisabled: (isViewDisabled: boolean) => void;
-    reRegisterRequest: UseMutationResult<ServiceTemplateDetailVo, Error, void>;
+    reRegisterRequest: UseMutationResult<ServiceTemplateRequestInfo, Error, void>;
     serviceRegistrationStatus: serviceTemplateRegistrationState;
 }): React.JSX.Element {
     const deleteState = useGetDeleteMutationState(id);

diff --git a/src/components/content/catalog/services/unregister/UnregisterMutation.ts b/src/components/content/catalog/services/unregister/UnregisterMutation.ts
@@ -13,7 +13,7 @@ export function useUnregisterRequest(id: string) {
         mutationKey: [id, unregisterKey],
         mutationFn: () => {
             const data: UnregisterData = {
-                id: id,
+                serviceTemplateId: id,
             };
             return unregister(data);
         },

diff --git a/src/components/content/catalog/services/update/UpdateService.tsx b/src/components/content/catalog/services/update/UpdateService.tsx
@@ -14,12 +14,12 @@ import registerStyles from '../../../../../styles/register.module.css';
 import {
     ApiError,
     category,
-    details,
-    DetailsData,
     ErrorResponse,
+    getServiceTemplateDetailsById,
+    GetServiceTemplateDetailsByIdData,
     Ocl,
-    ServiceTemplateChangeInfo,
     serviceTemplateRegistrationState,
+    ServiceTemplateRequestInfo,
     update,
     type UpdateData,
 } from '../../../../../xpanse-api/generated';
@@ -55,19 +55,19 @@ function UpdateService({
     const updateServiceRequest = useMutation({
         mutationFn: (ocl: Ocl) => {
             const data: UpdateData = {
-                id: id,
+                serviceTemplateId: id,
                 isRemoveServiceTemplateUntilApproved: true,
                 requestBody: ocl,
             };
             return update(data);
         },
-        onSuccess: async (serviceTemplateChangeInfo: ServiceTemplateChangeInfo) => {
+        onSuccess: async (serviceTemplateRequestInfo: ServiceTemplateRequestInfo) => {
             files.current[0].status = 'done';
-            updateResult.current = [`ID - ${serviceTemplateChangeInfo.serviceTemplateId}`];
-            const detailsData: DetailsData = {
-                id: serviceTemplateChangeInfo.serviceTemplateId,
+            updateResult.current = [`ID - ${serviceTemplateRequestInfo.serviceTemplateId}`];
+            const getServiceTemplateDetailsByIdData: GetServiceTemplateDetailsByIdData = {
+                serviceTemplateId: serviceTemplateRequestInfo.serviceTemplateId,
             };
-            const serviceTemplateDetailsVo = await details(detailsData);
+            const serviceTemplateDetailsVo = await getServiceTemplateDetailsById(getServiceTemplateDetailsByIdData);
             serviceRegistrationStatus.current =
                 serviceTemplateDetailsVo.serviceTemplateRegistrationState as serviceTemplateRegistrationState;
         },

diff --git a/src/components/content/deployedServices/myServices/query/useGetOrderableServiceDetails.tsx b/src/components/content/deployedServices/myServices/query/useGetOrderableServiceDetails.tsx
@@ -4,13 +4,16 @@
  */
 
 import { useQuery } from '@tanstack/react-query';
-import { DetailsData, getOrderableServiceDetailsById } from '../../../../../xpanse-api/generated';
+import {
+    getOrderableServiceDetailsById,
+    GetOrderableServiceDetailsByIdData,
+} from '../../../../../xpanse-api/generated';
 
 export default function useGetOrderableServiceDetails(serviceTemplateId: string | undefined) {
     return useQuery({
         queryKey: ['getOrderableServiceDetailsById', serviceTemplateId],
         queryFn: () => {
-            const data: DetailsData = {
+            const data: GetOrderableServiceDetailsByIdData = {
                 id: serviceTemplateId ?? '',
             };
             return getOrderableServiceDetailsById(data);

diff --git a/src/components/content/register/RegisterPanel.tsx b/src/components/content/register/RegisterPanel.tsx
@@ -14,14 +14,14 @@ import registerStyles from '../../../styles/register.module.css';
 import {
     ApiError,
     category,
-    details,
-    DetailsData,
     ErrorResponse,
+    getServiceTemplateDetailsById,
+    GetServiceTemplateDetailsByIdData,
     Ocl,
     register,
     type RegisterData,
-    ServiceTemplateChangeInfo,
     serviceTemplateRegistrationState,
+    ServiceTemplateRequestInfo,
 } from '../../../xpanse-api/generated';
 import {
     registerFailedRoute,
@@ -59,13 +59,13 @@ function RegisterPanel(): React.JSX.Element {
             };
             return register(data);
         },
-        onSuccess: async (serviceTemplateChangeInfo: ServiceTemplateChangeInfo) => {
+        onSuccess: async (serviceTemplateRequestInfo: ServiceTemplateRequestInfo) => {
             files.current[0].status = 'done';
-            registerResult.current = [`ID - ${serviceTemplateChangeInfo.serviceTemplateId}`];
-            const detailsData: DetailsData = {
-                id: serviceTemplateChangeInfo.serviceTemplateId,
+            registerResult.current = [`ID - ${serviceTemplateRequestInfo.serviceTemplateId}`];
+            const getServiceTemplateDetailsByIdData: GetServiceTemplateDetailsByIdData = {
+                serviceTemplateId: serviceTemplateRequestInfo.serviceTemplateId,
             };
-            const serviceTemplateDetailsVo = await details(detailsData);
+            const serviceTemplateDetailsVo = await getServiceTemplateDetailsById(getServiceTemplateDetailsByIdData);
             serviceRegistrationStatus.current =
                 serviceTemplateDetailsVo.serviceTemplateRegistrationState as serviceTemplateRegistrationState;
             void queryClient.refetchQueries({ queryKey: getQueryKey(serviceTemplateDetailsVo.category as category) });

diff --git a/src/components/content/review/ApproveOrRejectServiceTemplate.tsx b/src/components/content/review/ApproveOrRejectServiceTemplate.tsx
@@ -7,19 +7,19 @@ import { UseMutationResult } from '@tanstack/react-query';
 import { Alert, Input, Modal } from 'antd';
 import React, { useState } from 'react';
 import serviceReviewStyles from '../../../styles/service-review.module.css';
-import { ApiError, ErrorResponse, reviewResult, ServiceTemplateDetailVo } from '../../../xpanse-api/generated';
+import { ApiError, ErrorResponse, reviewResult, ServiceTemplateRequestToReview } from '../../../xpanse-api/generated';
 import { isErrorResponse } from '../common/error/isErrorResponse';
 import { ApproveOrRejectRequestParams } from './query/useApproveOrRejectRequest';
 
 export const ApproveOrRejectServiceTemplate = ({
-    currentServiceTemplateVo,
+    currentServiceTemplateRequestToReview,
     isApproved,
     isModalOpen,
     handleModalClose,
     setAlertTipCloseStatus,
     approveOrRejectRequest,
 }: {
-    currentServiceTemplateVo: ServiceTemplateDetailVo;
+    currentServiceTemplateRequestToReview: ServiceTemplateRequestToReview;
     isApproved: boolean | undefined;
     isModalOpen: boolean;
     handleModalClose: (arg: boolean) => void;
@@ -31,8 +31,8 @@ export const ApproveOrRejectServiceTemplate = ({
     const handleOk = () => {
         if (isApproved !== undefined) {
             const request: ApproveOrRejectRequestParams = {
-                id: currentServiceTemplateVo.serviceTemplateId,
-                reviewRegistrationRequest: {
+                id: currentServiceTemplateRequestToReview.requestId,
+                reviewServiceTemplateRequest: {
                     reviewResult: isApproved ? reviewResult.APPROVED : reviewResult.REJECTED,
                     reviewComment: comments,
                 },