remove deploy request && add deployment input properties (#1529)

baixinsui · web-flow · commit 0545cb678f3e · 2025-02-25T05:03:37.000+01:00
diff --git a/src/components/content/deployedServices/common/DeployedServicesDetailsContent.tsx b/src/components/content/deployedServices/common/DeployedServicesDetailsContent.tsx
@@ -15,13 +15,11 @@ import { DeployedResources } from './DeployedResources';
 export function DeployedServicesDetailsContent({
     content,
     requestParams,
-    resultMessage,
     deployResources,
     serviceId,
 }: {
     content: Map<string, string>;
-    requestParams: Map<string, unknown>;
-    resultMessage: React.JSX.Element | undefined;
+    requestParams: Map<string, string>;
     deployResources: DeployResource[];
     serviceId: string;
 }): React.JSX.Element {
@@ -46,9 +44,6 @@ export function DeployedServicesDetailsContent({
     if (requestParams.size > 0) {
         items.push(convertMapToDetailsList(requestParams, 'Request Parameters'));
     }
-    if (resultMessage !== undefined) {
-        items.push(resultMessage);
-    }
     if (deployResources.length > 0) {
         items.push(DeployedResources(deployResources, 'Deployed Resources'));
     }
diff --git a/src/components/content/deployedServices/common/DeploymentResultMessage.tsx b/src/components/content/deployedServices/common/DeploymentResultMessage.tsx
diff --git a/src/components/content/deployedServices/myServices/MyServiceDetails.tsx b/src/components/content/deployedServices/myServices/MyServiceDetails.tsx
@@ -12,16 +12,14 @@ import {
     VendorHostedDeployedServiceDetails,
 } from '../../../../xpanse-api/generated';
 import { DeployedServicesDetailsContent } from '../common/DeployedServicesDetailsContent';
-import { DeploymentResultMessage } from '../common/DeploymentResultMessage';
 
 export const MyServiceDetails = ({
     deployedService,
 }: {
     deployedService: DeployedServiceDetails | VendorHostedDeployedServiceDetails;
 }): React.JSX.Element => {
     const endPointMap = new Map<string, string>();
-    const requestMap = new Map<string, unknown>();
-    let resultMessage = undefined;
+    const requestMap = new Map<string, string>();
     let deployResourceMap: DeployResource[] = [];
 
     if (deployedService.serviceHostingType.toString() === serviceHostingType.SELF.toString()) {
@@ -31,14 +29,11 @@ export const MyServiceDetails = ({
                 endPointMap.set(key, serviceDetailVo.deployedServiceProperties[key]);
             }
         }
-        if (serviceDetailVo.deployRequest.serviceRequestProperties) {
-            for (const key in serviceDetailVo.deployRequest.serviceRequestProperties) {
-                requestMap.set(key, serviceDetailVo.deployRequest.serviceRequestProperties[key]);
+        if (serviceDetailVo.inputProperties) {
+            for (const key in serviceDetailVo.inputProperties) {
+                requestMap.set(key, serviceDetailVo.inputProperties[key]);
             }
         }
-        if (serviceDetailVo.resultMessage) {
-            resultMessage = DeploymentResultMessage(serviceDetailVo.resultMessage);
-        }
         if (serviceDetailVo.deployResources) {
             deployResourceMap = serviceDetailVo.deployResources;
         }
@@ -49,9 +44,9 @@ export const MyServiceDetails = ({
                 endPointMap.set(key, serviceDetailVo.deployedServiceProperties[key]);
             }
         }
-        if (serviceDetailVo.deployRequest.serviceRequestProperties) {
-            for (const key in serviceDetailVo.deployRequest.serviceRequestProperties) {
-                requestMap.set(key, serviceDetailVo.deployRequest.serviceRequestProperties[key]);
+        if (serviceDetailVo.inputProperties) {
+            for (const key in serviceDetailVo.inputProperties) {
+                requestMap.set(key, serviceDetailVo.inputProperties[key]);
             }
         }
     }
@@ -61,7 +56,6 @@ export const MyServiceDetails = ({
             <DeployedServicesDetailsContent
                 content={endPointMap}
                 requestParams={requestMap}
-                resultMessage={resultMessage}
                 deployResources={deployResourceMap}
                 serviceId={deployedService.serviceId}
             />
diff --git a/src/components/content/deployedServices/myServices/MyServiceHistoryDetails.tsx b/src/components/content/deployedServices/myServices/MyServiceHistoryDetails.tsx
@@ -8,21 +8,7 @@ import serviceModifyStyles from '../../../../styles/service-modify.module.css';
 import { ServiceOrderDetails } from '../../../../xpanse-api/generated';
 const { Text } = Typography;
 export const MyServiceHistoryDetails = ({ record }: { record: ServiceOrderDetails }) => {
-    const requestBodyContent =
-        Object.keys(record.requestBody).length > 0 ? (
-            <>
-                <ul className={serviceModifyStyles.modifyHistoryValueLi}>
-                    {Object.entries(record.requestBody).map(([key, value]) => (
-                        <li key={key}>
-                            <Text strong>{key}:</Text>
-                            <pre>{JSON.stringify(value, null, 2)}</pre>
-                        </li>
-                    ))}
-                </ul>
-            </>
-        ) : (
-            <Text>Empty Requests</Text>
-        );
+    const requestBodyContent = <pre>{JSON.stringify(record.requestBody, null, 2)}</pre>;
 
     const resultPropertiesContent =
         record.resultProperties && Object.keys(record.resultProperties).length > 0 ? (
diff --git a/src/components/content/deployedServices/myServices/myServiceProps.tsx b/src/components/content/deployedServices/myServices/myServiceProps.tsx
@@ -186,14 +186,7 @@ function isHasDeployedServiceProperties(details: VendorHostedDeployedServiceDeta
 }
 
 function isHasServiceRequestProperties(details: VendorHostedDeployedServiceDetails | DeployedServiceDetails): boolean {
-    return !!(
-        details.deployRequest.serviceRequestProperties &&
-        Object.keys(details.deployRequest.serviceRequestProperties).length !== 0
-    );
-}
-
-function isHasResultMessage(details: DeployedServiceDetails): boolean {
-    return !!details.resultMessage;
+    return !!(details.inputProperties && Object.keys(details.inputProperties).length !== 0);
 }
 
 function isHasDeployResources(details: DeployedServiceDetails): boolean {
@@ -211,7 +204,6 @@ export const isDisableDetails = (record: DeployedService) => {
         if (
             isHasDeployedServiceProperties(details) ||
             isHasServiceRequestProperties(details) ||
-            isHasResultMessage(details) ||
             isHasDeployResources(details)
         ) {
             return false;
diff --git a/src/components/content/deployedServices/reports/ReportsServiceDetails.tsx b/src/components/content/deployedServices/reports/ReportsServiceDetails.tsx
@@ -10,32 +10,27 @@ import { DeployResource, ErrorResponse } from '../../../../xpanse-api/generated'
 import { convertStringArrayToUnorderedList } from '../../../utils/generateUnorderedList';
 import { isHandleKnownErrorResponse } from '../../common/error/isHandleKnownErrorResponse.ts';
 import { DeployedServicesDetailsContent } from '../common/DeployedServicesDetailsContent';
-import { DeploymentResultMessage } from '../common/DeploymentResultMessage';
 import useGetServiceDetailsByIdForIsvQuery from './query/useGetServiceDetailsByIdForIsvQuery';
 
 export const ReportsServiceDetails = ({ serviceId }: { serviceId: string }): React.JSX.Element => {
     const getServiceDetailsByIdQuery = useGetServiceDetailsByIdForIsvQuery(serviceId);
 
     if (getServiceDetailsByIdQuery.isSuccess) {
         const endPointMap = new Map<string, string>();
-        const requestMap = new Map<string, unknown>();
-        let resultMessage = undefined;
+        const requestMap = new Map<string, string>();
         let deployResourceMap: DeployResource[] = [];
         if (getServiceDetailsByIdQuery.data.deployedServiceProperties) {
             for (const key in getServiceDetailsByIdQuery.data.deployedServiceProperties) {
                 endPointMap.set(key, getServiceDetailsByIdQuery.data.deployedServiceProperties[key]);
             }
         }
-        if (getServiceDetailsByIdQuery.data.deployRequest.serviceRequestProperties) {
-            for (const key in getServiceDetailsByIdQuery.data.deployRequest.serviceRequestProperties) {
-                requestMap.set(key, getServiceDetailsByIdQuery.data.deployRequest.serviceRequestProperties[key]);
+        if (getServiceDetailsByIdQuery.data.inputProperties) {
+            for (const key in getServiceDetailsByIdQuery.data.inputProperties) {
+                requestMap.set(key, getServiceDetailsByIdQuery.data.inputProperties[key]);
             }
         }
 
         const serviceDetailVo = getServiceDetailsByIdQuery.data;
-        if (serviceDetailVo.resultMessage) {
-            resultMessage = DeploymentResultMessage(serviceDetailVo.resultMessage);
-        }
         if (serviceDetailVo.deployResources) {
             deployResourceMap = serviceDetailVo.deployResources;
         }
@@ -45,7 +40,6 @@ export const ReportsServiceDetails = ({ serviceId }: { serviceId: string }): Rea
                 <DeployedServicesDetailsContent
                     content={endPointMap}
                     requestParams={requestMap}
-                    resultMessage={resultMessage}
                     deployResources={deployResourceMap}
                     serviceId={serviceId}
                 />
diff --git a/src/components/content/order/common/utils/existingServiceParameters.ts b/src/components/content/order/common/utils/existingServiceParameters.ts
@@ -16,14 +16,14 @@ export function getExistingServiceParameters(deployedService: DeployedService):
     variables[CUSTOMER_SERVICE_NAME_FIELD] = deployedService.customerServiceName;
     if (deployedService.serviceHostingType === serviceHostingType.SELF) {
         const selfHostedService = deployedService as DeployedServiceDetails;
-        for (const key in selfHostedService.deployRequest.serviceRequestProperties) {
-            variables[key] = selfHostedService.deployRequest.serviceRequestProperties[key];
+        for (const key in selfHostedService.inputProperties) {
+            variables[key] = selfHostedService.inputProperties[key];
         }
     }
     if (deployedService.serviceHostingType === serviceHostingType.SERVICE_VENDOR) {
         const selfHostedService = deployedService as VendorHostedDeployedServiceDetails;
-        for (const key in selfHostedService.deployRequest.serviceRequestProperties) {
-            variables[key] = selfHostedService.deployRequest.serviceRequestProperties[key];
+        for (const key in selfHostedService.inputProperties) {
+            variables[key] = selfHostedService.inputProperties[key];
         }
     }
     return variables;
diff --git a/src/components/content/order/modify/Modify.tsx b/src/components/content/order/modify/Modify.tsx
@@ -240,8 +240,8 @@ export const Modify = ({
                             <OrderItem
                                 key={item.name}
                                 item={item}
-                                csp={currentSelectedService.deployRequest.csp as csp}
-                                region={currentSelectedService.deployRequest.region}
+                                csp={currentSelectedService.csp as csp}
+                                region={currentSelectedService.region}
                             />
                         ) : undefined
                     )}
diff --git a/src/components/content/order/scale/Scale.tsx b/src/components/content/order/scale/Scale.tsx
@@ -51,7 +51,7 @@ export const Scale = ({
     let isDowngradeAllowed: boolean = true;
     let getParams: DeployParam[] = [];
     const [modifyStatus, setModifyStatus] = useState<serviceDeploymentState | undefined>(undefined);
-    const [selectFlavor, setSelectFlavor] = useState<string>(currentSelectedService.flavor ?? '');
+    const [selectFlavor, setSelectFlavor] = useState<string>(currentSelectedService.flavor);
     const [scaleWarning, setScaleWarning] = useState<string>('Are you sure to scale the service?');
 
     const [isShowModifyingResult, setIsShowModifyingResult] = useState<boolean>(false);
@@ -137,10 +137,10 @@ export const Scale = ({
     };
 
     const getServicePriceQuery = useGetServicePricesQuery(
-        currentSelectedService.serviceTemplateId ?? '',
-        currentSelectedService.deployRequest.region.name,
-        currentSelectedService.deployRequest.region.site,
-        currentSelectedService.deployRequest.billingMode,
+        currentSelectedService.serviceTemplateId,
+        currentSelectedService.region.name,
+        currentSelectedService.region.site,
+        currentSelectedService.billingMode,
         flavorList
     );
 
@@ -301,8 +301,8 @@ export const Scale = ({
                             <OrderItem
                                 key={item.name}
                                 item={item}
-                                csp={currentSelectedService.deployRequest.csp as csp}
-                                region={currentSelectedService.deployRequest.region}
+                                csp={currentSelectedService.csp as csp}
+                                region={currentSelectedService.region}
                             />
                         ) : undefined
                     )}
diff --git a/src/components/content/order/servicePorting/SelectPortingTarget.tsx b/src/components/content/order/servicePorting/SelectPortingTarget.tsx
@@ -81,7 +81,7 @@ export const SelectPortingTarget = ({
             userOrderableServiceVoList
         );
         setRegionList(regionList);
-        setSelectRegion(regionList.length > 0 ? regionList[0].region : currentSelectedService.deployRequest.region);
+        setSelectRegion(regionList.length > 0 ? regionList[0].region : currentSelectedService.region);
         const billingModes: billingMode[] | undefined = getBillingModes(
             cspList[0],
             serviceHostTypes[0],
@@ -94,8 +94,7 @@ export const SelectPortingTarget = ({
             userOrderableServiceVoList
         );
         setSelectBillingMode(
-            defaultBillingMode ??
-                (billingModes ? billingModes[0] : (currentSelectedService.deployRequest.billingMode as billingMode))
+            defaultBillingMode ?? (billingModes ? billingModes[0] : (currentSelectedService.billingMode as billingMode))
         );
     };
 
@@ -117,7 +116,7 @@ export const SelectPortingTarget = ({
             regions = regionList;
         } else {
             regionList.forEach((region) => {
-                if (region.value !== currentSelectedService.deployRequest.region.name) {
+                if (region.value !== currentSelectedService.region.name) {
                     regions.push(region);
                 }
             });
diff --git a/src/components/content/order/servicePorting/ServicePorting.tsx b/src/components/content/order/servicePorting/ServicePorting.tsx
@@ -50,22 +50,36 @@ export const ServicePorting = ({
     );
 
     const [areaList, setAreaList] = useState<Tab[]>([]);
-    const [selectArea, setSelectArea] = useState<string>(currentSelectedService.deployRequest.region.area);
+    const [selectArea, setSelectArea] = useState<string>(currentSelectedService.region.area);
 
     const [regionList, setRegionList] = useState<RegionDropDownInfo[]>([]);
-    const [selectRegion, setSelectRegion] = useState<Region>(currentSelectedService.deployRequest.region);
+    const [selectRegion, setSelectRegion] = useState<Region>(currentSelectedService.region);
 
     const [selectAvailabilityZones, setSelectAvailabilityZones] = useState<Record<string, string>>(
-        currentSelectedService.deployRequest.availabilityZones ?? {}
+        currentSelectedService.availabilityZones ?? {}
     );
-    const [selectFlavor, setSelectFlavor] = useState<string>(currentSelectedService.deployRequest.flavor);
+    const [selectFlavor, setSelectFlavor] = useState<string>(currentSelectedService.flavor);
 
     const [billingModes, setBillingModes] = useState<billingMode[] | undefined>(undefined);
     const [selectBillingMode, setSelectBillingMode] = useState<billingMode>(
-        currentSelectedService.deployRequest.billingMode.toString() as billingMode
+        currentSelectedService.billingMode.toString() as billingMode
     );
 
-    const [deployParams, setDeployParams] = useState<DeployRequest>(currentSelectedService.deployRequest);
+    const deployRequest: DeployRequest = {
+        category: currentSelectedService.category,
+        serviceName: currentSelectedService.name,
+        version: currentSelectedService.version,
+        serviceHostingType: currentSelectedService.serviceHostingType,
+        csp: currentSelectedService.csp,
+        customerServiceName: currentSelectedService.customerServiceName,
+        region: currentSelectedService.region,
+        availabilityZones: currentSelectedService.availabilityZones,
+        flavor: currentSelectedService.flavor,
+        billingMode: currentSelectedService.billingMode,
+        serviceRequestProperties: currentSelectedService.inputProperties,
+    };
+
+    const [deployParams, setDeployParams] = useState<DeployRequest>(deployRequest);
 
     const getOrderableServicesQuery = useQuery({
         queryKey: [
@@ -117,7 +131,7 @@ export const ServicePorting = ({
     };
 
     const getServicePriceQuery = useGetServicePricesQuery(
-        currentSelectedService.serviceTemplateId ?? '',
+        currentSelectedService.serviceTemplateId,
         selectRegion.name,
         selectRegion.site,
         selectBillingMode,
diff --git a/src/xpanse-api/api.json b/src/xpanse-api/api.json
diff --git a/src/xpanse-api/generated/types.gen.ts b/src/xpanse-api/generated/types.gen.ts

Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,14 @@ import {`
`12`	`12`	`VendorHostedDeployedServiceDetails,`
`13`	`13`	`} from '../../../../xpanse-api/generated';`
`14`	`14`	`import { DeployedServicesDetailsContent } from '../common/DeployedServicesDetailsContent';`
`15`		`-import { DeploymentResultMessage } from '../common/DeploymentResultMessage';`
`16`	`15`
`17`	`16`	`export const MyServiceDetails = ({`
`18`	`17`	`deployedService,`
`19`	`18`	`}: {`
`20`	`19`	`deployedService: DeployedServiceDetails \| VendorHostedDeployedServiceDetails;`
`21`	`20`	`}): React.JSX.Element => {`
`22`	`21`	`const endPointMap = new Map<string, string>();`
`23`		`- const requestMap = new Map<string, unknown>();`
`24`		`- let resultMessage = undefined;`
	`22`	`+ const requestMap = new Map<string, string>();`
`25`	`23`	`let deployResourceMap: DeployResource[] = [];`
`26`	`24`
`27`	`25`	`if (deployedService.serviceHostingType.toString() === serviceHostingType.SELF.toString()) {`
`@@ -31,14 +29,11 @@ export const MyServiceDetails = ({`
`31`	`29`	`endPointMap.set(key, serviceDetailVo.deployedServiceProperties[key]);`
`32`	`30`	`}`
`33`	`31`	`}`
`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]);`
`37`	`35`	`}`
`38`	`36`	`}`
`39`		`- if (serviceDetailVo.resultMessage) {`
`40`		`- resultMessage = DeploymentResultMessage(serviceDetailVo.resultMessage);`
`41`		`- }`
`42`	`37`	`if (serviceDetailVo.deployResources) {`
`43`	`38`	`deployResourceMap = serviceDetailVo.deployResources;`
`44`	`39`	`}`
`@@ -49,9 +44,9 @@ export const MyServiceDetails = ({`
`49`	`44`	`endPointMap.set(key, serviceDetailVo.deployedServiceProperties[key]);`
`50`	`45`	`}`
`51`	`46`	`}`
`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]);`
`55`	`50`	`}`
`56`	`51`	`}`
`57`	`52`	`}`
`@@ -61,7 +56,6 @@ export const MyServiceDetails = ({`
`61`	`56`	`<DeployedServicesDetailsContent`
`62`	`57`	`content={endPointMap}`
`63`	`58`	`requestParams={requestMap}`
`64`		`- resultMessage={resultMessage}`
`65`	`59`	`deployResources={deployResourceMap}`
`66`	`60`	`serviceId={deployedService.serviceId}`
`67`	`61`	`/>`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@ export function getExistingServiceParameters(deployedService: DeployedService):`
`16`	`16`	`variables[CUSTOMER_SERVICE_NAME_FIELD] = deployedService.customerServiceName;`
`17`	`17`	`if (deployedService.serviceHostingType === serviceHostingType.SELF) {`
`18`	`18`	`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];`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`if (deployedService.serviceHostingType === serviceHostingType.SERVICE_VENDOR) {`
`24`	`24`	`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];`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`return variables;`