diff --git a/src/components/content/deployedServices/myServices/MyServices.tsx b/src/components/content/deployedServices/myServices/MyServices.tsx index 62273836b..cdf1321b0 100644 --- a/src/components/content/deployedServices/myServices/MyServices.tsx +++ b/src/components/content/deployedServices/myServices/MyServices.tsx @@ -1420,7 +1420,7 @@ function MyServices(): React.JSX.Element { destroyOnClose={true} footer={null} onCancel={handleCancelMigrateModel} - width={2140} + width={1400} mask={true} > diff --git a/src/components/content/order/common/BillingModeSelection.tsx b/src/components/content/order/common/BillingModeSelection.tsx index 44ff10c0d..191476cb1 100644 --- a/src/components/content/order/common/BillingModeSelection.tsx +++ b/src/components/content/order/common/BillingModeSelection.tsx @@ -3,7 +3,7 @@ * SPDX-FileCopyrightText: Huawei Inc. */ -import { Alert, Flex, Form, Radio } from 'antd'; +import { Alert, Col, Flex, Form, Radio, Row } from 'antd'; import React, { Dispatch, SetStateAction } from 'react'; import serviceOrderStyles from '../../../../styles/service-order.module.css'; import { billingMode } from '../../../../xpanse-api/generated'; @@ -22,26 +22,29 @@ export const BillingModeSelection = ({ } return ( -
- - {'Billing Mode'} -

- } - labelCol={{ span: 2, style: { textAlign: 'left' } }} - required={true} - rules={[ - { - required: true, - message: 'billingMode is required', - }, - { type: 'string' }, - ]} - > + + + + {'Billing Mode'} +

+ } + labelCol={{ style: { textAlign: 'left' } }} + required={true} + rules={[ + { + required: true, + message: 'billingMode is required', + }, + { type: 'string' }, + ]} + >
+ + {billingModes && billingModes.length > 0 ? ( )} -
-
+ + ); }; diff --git a/src/components/content/order/common/FlavorSelection.tsx b/src/components/content/order/common/FlavorSelection.tsx index cd0a76aad..86243ecea 100644 --- a/src/components/content/order/common/FlavorSelection.tsx +++ b/src/components/content/order/common/FlavorSelection.tsx @@ -5,7 +5,7 @@ import { LoadingOutlined } from '@ant-design/icons'; import { UseQueryResult } from '@tanstack/react-query'; -import { Flex, Form, Radio, Spin } from 'antd'; +import { Col, Flex, Form, Radio, Row, Spin } from 'antd'; import React from 'react'; import flavorStyles from '../../../../styles/flavor.module.css'; import serviceOrderStyles from '../../../../styles/service-order.module.css'; @@ -33,19 +33,22 @@ export const FlavorSelection = ({ }; return ( -
- - {'Flavor'} -

- } - labelCol={{ span: 2, style: { textAlign: 'left' } }} - rules={[{ required: true, message: 'Flavor is required' }]} - > + + + + {'Flavor'} +

+ } + labelCol={{ style: { textAlign: 'left' } }} + rules={[{ required: true, message: 'Flavor is required' }]} + >
+ + {flavorList && flavorList.length > 0 ? ( ) : null} -
-
+ + ); }; diff --git a/src/components/content/order/common/MigrateServiceSubmitAvailabilityZoneInfo.tsx b/src/components/content/order/common/MigrateServiceSubmitAvailabilityZoneInfo.tsx index a9a5256c4..ad5da79c5 100644 --- a/src/components/content/order/common/MigrateServiceSubmitAvailabilityZoneInfo.tsx +++ b/src/components/content/order/common/MigrateServiceSubmitAvailabilityZoneInfo.tsx @@ -3,7 +3,7 @@ * SPDX-FileCopyrightText: Huawei Inc. */ -import { Flex, Form, Radio } from 'antd'; +import { Col, Flex, Form, Radio, Row } from 'antd'; import React from 'react'; import '../../../../styles/service-order.module.css'; import serviceOrderStyles from '../../../../styles/service-order.module.css'; @@ -17,41 +17,46 @@ export const MigrateServiceSubmitAvailabilityZoneInfo = ({ availabilityZones: Record; }): React.JSX.Element => { return ( -
+ {availabilityZoneConfigs ? availabilityZoneConfigs.map((availabilityZone) => ( - - {availabilityZone.displayName} -

- } - labelCol={{ span: 2, style: { textAlign: 'left' } }} - > - - - 0 + <> + + + {availabilityZone.displayName} +

+ } + labelCol={{ style: { textAlign: 'left' } }} + >
+ + + + + 0 + ? availabilityZones[availabilityZone.varName] + : {} + } + > + {availabilityZones[availabilityZone.varName] ? availabilityZones[availabilityZone.varName] - : {} - } - > - {availabilityZones[availabilityZone.varName] - ? availabilityZones[availabilityZone.varName] - : 'Not Selected'} - - - -
+ : 'Not Selected'} + + + + + )) : undefined} -
+ ); }; diff --git a/src/components/content/order/common/MigrateServiceSubmitBillingMode.tsx b/src/components/content/order/common/MigrateServiceSubmitBillingMode.tsx index 61c4de27b..c8d6c1525 100644 --- a/src/components/content/order/common/MigrateServiceSubmitBillingMode.tsx +++ b/src/components/content/order/common/MigrateServiceSubmitBillingMode.tsx @@ -3,25 +3,28 @@ * SPDX-FileCopyrightText: Huawei Inc. */ -import { Flex, Form, Radio } from 'antd'; +import { Col, Flex, Form, Radio, Row } from 'antd'; import React from 'react'; import serviceOrderStyles from '../../../../styles/service-order.module.css'; export const MigrateServiceSubmitBillingMode = ({ selectBillMode }: { selectBillMode: string }): React.JSX.Element => { return ( -
- - {'Billing Mode'} -

- } - labelCol={{ span: 2, style: { textAlign: 'left' } }} - required={true} - > + + + + {'Billing Mode'} +

+ } + labelCol={{ style: { textAlign: 'left' } }} + required={true} + >
+ + @@ -29,7 +32,7 @@ export const MigrateServiceSubmitBillingMode = ({ selectBillMode }: { selectBill -
-
+ + ); }; diff --git a/src/components/content/order/common/RegionSelection.tsx b/src/components/content/order/common/RegionSelection.tsx index a3580a567..98d23d5a0 100644 --- a/src/components/content/order/common/RegionSelection.tsx +++ b/src/components/content/order/common/RegionSelection.tsx @@ -3,7 +3,7 @@ * SPDX-FileCopyrightText: Huawei Inc. */ -import { Form, Select, Space } from 'antd'; +import { Col, Form, Row, Select, Space } from 'antd'; import React from 'react'; import serviceOrderStyles from '../../../../styles/service-order.module.css'; import { RegionDropDownInfo } from '../types/RegionDropDownInfo'; @@ -20,19 +20,22 @@ export const RegionSelection = ({ disabled?: boolean; }): React.JSX.Element => { return ( -
- - {'Region'} -

- } - labelCol={{ span: 2, style: { textAlign: 'left' } }} - rules={[{ required: true, message: 'Region is required' }]} - > + + + + {'Region'} +

+ } + labelCol={{ style: { textAlign: 'left' } }} + rules={[{ required: true, message: 'Region is required' }]} + >
+ + -
-
+ + ); } diff --git a/src/styles/service-order.module.css b/src/styles/service-order.module.css index 5a8650cce..d0308c137 100644 --- a/src/styles/service-order.module.css +++ b/src/styles/service-order.module.css @@ -115,44 +115,33 @@ } .cloud-provider-select { - display: flex; - flex-flow: nowrap row; - padding: 0; - width: 200px; - height: 60px; - margin: 10px; - border: 1px solid #b5b5b5; - border-radius: 10px; - box-shadow: 0 0 0 2px #b5b5b5; -} - -.cloud-provider-select-hover { cursor: pointer; display: flex; flex-flow: nowrap row; - padding: 0; width: 200px; - height: 62px; - border: 3px solid transparent; + height: 60px; + margin-top: 5px; + margin-right: 1em; + border: 1px solid transparent; outline: 1px transparent dashed; outline-offset: -5px; - border-radius: 10px; - box-shadow: 0 0 0 2px #b5b5b5; + border-radius: 5px; + box-shadow: 0 0 0 1px #b5b5b5; } -.cloud-provider-select:hover { +.cloud-provider-select-hover { cursor: pointer; display: flex; flex-flow: nowrap row; - padding: 0; width: 200px; height: 60px; - margin: 10px; - border: 3px solid #b5b5b5; + margin-top: 5px; + margin-right: 1em; + border: 1px solid transparent; outline: 1px transparent dashed; - outline-offset: -10px; - border-radius: 10px; - box-shadow: 0 0 0 2px #b5b5b5; + outline-offset: -5px; + border-radius: 5px; + box-shadow: 0 0 0 2px #1677ff; } .service-type-option-image { @@ -223,12 +212,12 @@ } .order-form-selection-first-in-group { - padding-top: 20px; + margin-top: 1em; } .select-box-class { box-sizing: border-box; - width: 450px; + width: 100%; } .select-cloud-provider-class { @@ -381,3 +370,55 @@ position: relative; top: -10px; } + +.order-form-service-host { + margin-top: 6px; +} + +@media screen and (max-width: 3840px) { + .order-form-label { + width: 10%; + } +} + +@media screen and (max-width: 1920px) { + .order-form-label { + width: 12%; + } +} + +@media screen and (max-width: 1680px) { + .order-form-label { + width: 18%; + } +} + +@media screen and (max-width: 1440px) { + .order-form-label { + width: 24%; + } +} + +@media screen and (max-width: 1366px) { + .order-form-label { + width: 28%; + } +} + +@media screen and (max-width: 1280px) { + .order-form-label { + width: 30%; + } +} + +@media screen and (max-width: 1024px) { + .order-form-label { + width: 40%; + } +} + +@media screen and (max-width: 720px) { + .order-form-label { + width: 50%; + } +}