update myservices of modify, scale api for end user.

eclipse-xpanse · Sep 18, 2024 · 96bf225 · 96bf225
1 parent 7cc755c
commit 96bf225
Show file tree

Hide file tree

Showing 7 changed files with 1,292 additions and 575 deletions.
diff --git a/...ces/query/useGetServiceTemplateDetails.ts → ...s/query/useGetOrderableServiceDetails.tsx b/...ces/query/useGetServiceTemplateDetails.ts → ...s/query/useGetOrderableServiceDetails.tsx
@@ -4,16 +4,16 @@
  */
 
 import { useQuery } from '@tanstack/react-query';
-import { details, DetailsData } from '../../../../../xpanse-api/generated';
+import { DetailsData, getOrderableServiceDetails } from '../../../../../xpanse-api/generated';
 
-export default function useGetServiceTemplateDetails(serviceTemplateId: string | undefined) {
+export default function useGetOrderableServiceDetails(serviceTemplateId: string | undefined) {
     return useQuery({
-        queryKey: ['getServiceTemplateDetails', serviceTemplateId],
+        queryKey: ['getOrderableServiceDetails', serviceTemplateId],
         queryFn: () => {
             const data: DetailsData = {
                 id: serviceTemplateId ?? '',
             };
-            return details(data);
+            return getOrderableServiceDetails(data);
         },
         enabled: serviceTemplateId !== undefined && serviceTemplateId.length > 0,
     });

diff --git a/src/components/content/order/formDataHelpers/flavorHelper.ts b/src/components/content/order/formDataHelpers/flavorHelper.ts
@@ -26,7 +26,7 @@ export function getServiceFlavorList(
             ) {
                 flavorMapper.set(
                     userOrderableServiceVo.csp,
-                    [...userOrderableServiceVo.flavors].sort((a, b) => a.priority - b.priority)
+                    [...userOrderableServiceVo.flavors.serviceFlavors].sort((a, b) => a.priority - b.priority)
                 );
             }
         });

diff --git a/src/components/content/order/modify/Modify.tsx b/src/components/content/order/modify/Modify.tsx
@@ -11,17 +11,17 @@ import appStyles from '../../../../styles/app.module.css';
 import serviceModifyStyles from '../../../../styles/service-modify.module.css';
 import serviceOrderStyles from '../../../../styles/service-order.module.css';
 import {
-    DeployVariable,
-    DeployedServiceDetails,
-    ModifyRequest,
-    VendorHostedDeployedServiceDetails,
     csp,
+    DeployedServiceDetails,
+    DeployVariable,
     modify,
-    serviceDeploymentState,
     type ModifyData,
+    ModifyRequest,
+    serviceDeploymentState,
+    VendorHostedDeployedServiceDetails,
 } from '../../../../xpanse-api/generated';
 import { CUSTOMER_SERVICE_NAME_FIELD } from '../../../utils/constants';
-import useGetServiceTemplateDetails from '../../deployedServices/myServices/query/useGetServiceTemplateDetails';
+import useGetOrderableServiceDetails from '../../deployedServices/myServices/query/useGetOrderableServiceDetails.tsx';
 import ScaleOrModifySubmitStatusAlert from '../common/ScaleOrModifySubmitStatusAlert';
 import { ModifySubmitRequest } from '../common/modifySubmitRequest';
 import { OrderItem } from '../common/utils/OrderItem';
@@ -47,7 +47,7 @@ export const Modify = ({
     const [cacheFormVariable] = useOrderFormStore((state) => [state.addDeployVariable]);
     const [storedDeployVariables] = useOrderFormStore((state) => [state.deployParams]);
 
-    const serviceTemplateDetailsQuery = useGetServiceTemplateDetails(currentSelectedService.serviceTemplateId);
+    const orderableServiceDetailsQuery = useGetOrderableServiceDetails(currentSelectedService.serviceTemplateId);
     const modifyServiceRequest = useMutation({
         mutationFn: (modifyServiceRequestParams: ModifySubmitRequest) => {
             const data: ModifyData = {
@@ -64,9 +64,9 @@ export const Modify = ({
         return prevParamsString !== newParamsString;
     };
 
-    if (serviceTemplateDetailsQuery.isSuccess) {
-        getParams = getModifyParams(serviceTemplateDetailsQuery.data.variables);
-        getVariables = serviceTemplateDetailsQuery.data.variables;
+    if (orderableServiceDetailsQuery.isSuccess) {
+        getParams = getModifyParams(orderableServiceDetailsQuery.data.variables);
+        getVariables = orderableServiceDetailsQuery.data.variables;
     }
 
     const onFinish = () => {
@@ -180,8 +180,8 @@ export const Modify = ({
                     isSubmitInProgress={modifyServiceRequest.isPending}
                     currentSelectedService={currentSelectedService}
                     serviceProviderContactDetails={
-                        serviceTemplateDetailsQuery.isSuccess
-                            ? serviceTemplateDetailsQuery.data.serviceProviderContactDetails
+                        orderableServiceDetailsQuery.isSuccess
+                            ? orderableServiceDetailsQuery.data.serviceProviderContactDetails
                             : undefined
                     }
                     getModifyDetailsStatus={getModifyDetailsStatus}

diff --git a/src/components/content/order/scale/Scale.tsx b/src/components/content/order/scale/Scale.tsx
@@ -12,17 +12,17 @@ import flavorStyles from '../../../../styles/flavor.module.css';
 import serviceModifyStyles from '../../../../styles/service-modify.module.css';
 import serviceOrderStyles from '../../../../styles/service-order.module.css';
 import {
+    csp,
     DeployedServiceDetails,
+    modify,
+    type ModifyData,
     ModifyRequest,
+    serviceDeploymentState,
     ServiceFlavor,
     VendorHostedDeployedServiceDetails,
-    csp,
-    modify,
-    serviceDeploymentState,
-    type ModifyData,
 } from '../../../../xpanse-api/generated';
 import { CUSTOMER_SERVICE_NAME_FIELD } from '../../../utils/constants';
-import useGetServiceTemplateDetails from '../../deployedServices/myServices/query/useGetServiceTemplateDetails';
+import useGetOrderableServiceDetails from '../../deployedServices/myServices/query/useGetOrderableServiceDetails.tsx';
 import { FlavorFeatures } from '../common/FlavorFeatures';
 import { FlavorPrice } from '../common/FlavorPrice.tsx';
 import { FlavorTitle } from '../common/FlavorTitle';
@@ -57,7 +57,7 @@ export const Scale = ({
     const [isShowModifyingResult, setIsShowModifyingResult] = useState<boolean>(false);
     const [cacheFormVariable] = useOrderFormStore((state) => [state.addDeployVariable]);
 
-    const serviceTemplateDetailsQuery = useGetServiceTemplateDetails(currentSelectedService.serviceTemplateId);
+    const orderableServiceDetailsQuery = useGetOrderableServiceDetails(currentSelectedService.serviceTemplateId);
     const modifyServiceRequest = useMutation({
         mutationFn: (modifyServiceRequestParams: ModifySubmitRequest) => {
             const data: ModifyData = {
@@ -68,14 +68,14 @@ export const Scale = ({
         },
     });
 
-    if (serviceTemplateDetailsQuery.isSuccess) {
-        if (serviceTemplateDetailsQuery.data.flavors.serviceFlavors.length > 0) {
-            flavorList = [...serviceTemplateDetailsQuery.data.flavors.serviceFlavors].sort(
+    if (orderableServiceDetailsQuery.isSuccess) {
+        if (orderableServiceDetailsQuery.data.flavors.serviceFlavors.length > 0) {
+            flavorList = [...orderableServiceDetailsQuery.data.flavors.serviceFlavors].sort(
                 (a, b) => a.priority - b.priority
             );
-            isDowngradeAllowed = serviceTemplateDetailsQuery.data.flavors.isDowngradeAllowed;
+            isDowngradeAllowed = orderableServiceDetailsQuery.data.flavors.isDowngradeAllowed;
         }
-        getParams = getModifyParams(serviceTemplateDetailsQuery.data.variables);
+        getParams = getModifyParams(orderableServiceDetailsQuery.data.variables);
     }
 
     const onFinish = () => {
@@ -106,18 +106,18 @@ export const Scale = ({
 
     const onClickScale = () => {
         if (
-            serviceTemplateDetailsQuery.data?.flavors.modificationImpact.isDataLost &&
-            serviceTemplateDetailsQuery.data.flavors.modificationImpact.isServiceInterrupted
+            orderableServiceDetailsQuery.data?.flavors.modificationImpact.isDataLost &&
+            orderableServiceDetailsQuery.data.flavors.modificationImpact.isServiceInterrupted
         ) {
             setScaleWarning(ChangeFlavorServiceWillBeRestartedAndDataWillBeLost);
         } else if (
-            serviceTemplateDetailsQuery.data?.flavors.modificationImpact.isDataLost &&
-            !serviceTemplateDetailsQuery.data.flavors.modificationImpact.isServiceInterrupted
+            orderableServiceDetailsQuery.data?.flavors.modificationImpact.isDataLost &&
+            !orderableServiceDetailsQuery.data.flavors.modificationImpact.isServiceInterrupted
         ) {
             setScaleWarning(ChangeFlavorServiceDataWillBeLost);
         } else if (
-            !serviceTemplateDetailsQuery.data?.flavors.modificationImpact.isDataLost &&
-            serviceTemplateDetailsQuery.data?.flavors.modificationImpact.isServiceInterrupted
+            !orderableServiceDetailsQuery.data?.flavors.modificationImpact.isDataLost &&
+            orderableServiceDetailsQuery.data?.flavors.modificationImpact.isServiceInterrupted
         ) {
             setScaleWarning(ChangeFlavorServiceWillBeRestarted);
         }
@@ -155,8 +155,8 @@ export const Scale = ({
                     isSubmitInProgress={modifyServiceRequest.isPending}
                     currentSelectedService={currentSelectedService}
                     serviceProviderContactDetails={
-                        serviceTemplateDetailsQuery.isSuccess
-                            ? serviceTemplateDetailsQuery.data.serviceProviderContactDetails
+                        orderableServiceDetailsQuery.isSuccess
+                            ? orderableServiceDetailsQuery.data.serviceProviderContactDetails
                             : undefined
                     }
                     getModifyDetailsStatus={getModifyDetailsStatus}