diff --git a/src/components/content/order/create/SelectServiceForm.tsx b/src/components/content/order/create/SelectServiceForm.tsx
index 3e358d1e0..543978e1d 100644
--- a/src/components/content/order/create/SelectServiceForm.tsx
+++ b/src/components/content/order/create/SelectServiceForm.tsx
@@ -3,7 +3,7 @@
* SPDX-FileCopyrightText: Huawei Inc.
*/
-import { To, useLocation, useSearchParams } from 'react-router-dom';
+import { To, useLocation, useNavigate, useSearchParams } from 'react-router-dom';
import React, { useEffect, useMemo, useState } from 'react';
import {
AvailabilityZoneConfig,
@@ -22,7 +22,7 @@ import { getFlavorList } from '../formDataHelpers/flavorHelper';
import { convertAreasToTabs } from '../formDataHelpers/areaHelper';
import { getRegionDropDownValues } from '../formDataHelpers/regionHelper';
import { getBilling } from '../formDataHelpers/billingHelper';
-import { Col, Form, Row, Select, Tabs } from 'antd';
+import { Button, Col, Form, Row, Select, Tabs, Tooltip, Typography } from 'antd';
import NavigateOrderSubmission from './NavigateOrderSubmission';
import { ContactDetailsText } from '../../common/ocl/ContactDetailsText';
import { ContactDetailsShowType } from '../../common/ocl/ContactDetailsShowType';
@@ -31,19 +31,24 @@ import { ServiceHostingSelection } from '../common/ServiceHostingSelection';
import { RegionInfo } from '../common/RegionInfo';
import { FlavorInfo } from '../common/FlavorInfo';
import { BillingInfo } from '../common/BillingInfo';
-import GoToSubmit from './GoToSubmit';
-import { servicesSubPageRoute } from '../../../utils/constants';
+import { orderPageRoute, servicesSubPageRoute } from '../../../utils/constants';
import { OrderSubmitProps } from '../common/utils/OrderSubmitProps';
import useGetAvailabilityZonesForRegionQuery from '../common/utils/useGetAvailabilityZonesForRegionQuery';
import { getAvailabilityZoneRequirementsForAService } from '../formDataHelpers/getAvailabilityZoneRequirementsForAService';
import { AvailabilityZoneFormItem } from '../common/availabilityzone/AvailabilityZoneFormItem';
+import { getEulaByCsp } from '../formDataHelpers/eulaHelper';
+import { getDeployParams } from '../formDataHelpers/deployParamsHelper';
export function SelectServiceForm({ services }: { services: UserOrderableServiceVo[] }): React.JSX.Element {
+ const { Paragraph } = Typography;
+ const [form] = Form.useForm();
const [urlParams] = useSearchParams();
const location = useLocation();
+ const navigate = useNavigate();
const latestVersion = decodeURI(urlParams.get('latestVersion') ?? '');
const serviceName = decodeURI(urlParams.get('serviceName') ?? '');
const categoryName = decodeURI(urlParams.get('catalog') ?? '');
+
const servicePageUrl = servicesSubPageRoute + categoryName;
let serviceInfo: OrderSubmitProps | undefined;
const versionToServicesMap = useMemo
>(() => {
@@ -101,6 +106,7 @@ export function SelectServiceForm({ services }: { services: UserOrderableService
let currentServiceProviderContactDetails: ServiceProviderContactDetails | undefined =
getContactServiceDetailsOfServiceByCsp(selectCsp, versionToServicesMap.get(selectVersion));
+ const currentEula: string | undefined = getEulaByCsp(selectCsp, versionToServicesMap.get(selectVersion));
let currentBilling: Billing = getBilling(selectCsp, selectServiceHostType, versionToServicesMap.get(selectVersion));
const getAvailabilityZonesForRegionQuery = useGetAvailabilityZonesForRegionQuery(selectCsp, selectRegion);
@@ -224,28 +230,51 @@ export function SelectServiceForm({ services }: { services: UserOrderableService
return availabilityZoneConfigs.filter((availabilityZoneConfig) => availabilityZoneConfig.mandatory).length > 0;
}
+ const gotoOrderSubmit = function () {
+ const orderSubmitParams: OrderSubmitProps = getDeployParams(
+ versionToServicesMap.get(selectVersion) ?? [],
+ selectCsp,
+ selectServiceHostType,
+ { name: selectRegion, area: selectArea },
+ selectFlavor,
+ currentServiceProviderContactDetails,
+ selectAvailabilityZones,
+ currentEula
+ );
+
+ navigate(
+ orderPageRoute
+ .concat('?serviceName=', orderSubmitParams.name)
+ .concat('&version=', orderSubmitParams.version)
+ .concat('#', orderSubmitParams.category),
+ {
+ state: orderSubmitParams,
+ }
+ );
+ };
+
return (
<>
-
diff --git a/src/components/content/order/services/Services.tsx b/src/components/content/order/services/Services.tsx
index fca998f5c..dc4628883 100644
--- a/src/components/content/order/services/Services.tsx
+++ b/src/components/content/order/services/Services.tsx
@@ -8,7 +8,7 @@ import '../../../../styles/service_order.css';
import React, { useEffect } from 'react';
import { useLocation, useNavigate } from 'react-router-dom';
import { createServicePageRoute } from '../../../utils/constants';
-import { Col, Empty, Row } from 'antd';
+import { Col, Empty, Row, Tooltip, Typography } from 'antd';
import { Badge, Space } from 'antd';
import { sortVersion } from '../../../utils/Sort';
import { DeployedService, UserOrderableServiceVo } from '../../../../xpanse-api/generated';
@@ -20,6 +20,7 @@ import userOrderableServicesQuery from '../query/userOrderableServicesQuery';
import { UserServiceDisplayType } from './UserServiceDisplayType';
function Services(): React.JSX.Element {
+ const { Paragraph } = Typography;
const navigate = useNavigate();
const location = useLocation();
const [clearFormVariables] = useOrderFormStore((state) => [state.clearFormVariables]);
@@ -108,7 +109,16 @@ function Services(): React.JSX.Element {
/>