Skip to content

Commit c2e0355

Browse files
committed
add output properties in ocl
1 parent d9d1a39 commit c2e0355

File tree

8 files changed

+1715
-1637
lines changed

8 files changed

+1715
-1637
lines changed

src/components/content/deployment/DeploymentManagement.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function DeploymentManagement({ deployment }: { deployment: Deployment }): React
1818
 Service Deployment Management
1919
</h3>
2020
<DeploymentInfomation deployment={deployment} />
21-
<DeploymentVariables variables={deployment.variables} />
21+
<DeploymentVariables variables={deployment.inputVariables} />
2222
</>
2323
);
2424
}

src/components/content/deployment/DeploymentVariables.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import { ColumnsType } from 'antd/es/table';
88
import React from 'react';
99
import catalogStyles from '../../../styles/catalog.module.css';
1010
import deploymentVariablesStyles from '../../../styles/deployment-variables.module.css';
11-
import { deployResourceKind, DeployVariable, sensitiveScope } from '../../../xpanse-api/generated';
11+
import { deployResourceKind, InputVariable, sensitiveScope } from '../../../xpanse-api/generated';
1212

13-
function DeploymentVariables({ variables }: { variables: DeployVariable[] }): React.JSX.Element {
14-
const columns: ColumnsType<DeployVariable> = [
13+
function DeploymentVariables({ variables }: { variables: InputVariable[] }): React.JSX.Element {
14+
const columns: ColumnsType<InputVariable> = [
1515
{
1616
title: <div className={deploymentVariablesStyles.variablesColumns}>Name</div>,
1717
dataIndex: 'name',
@@ -43,7 +43,7 @@ function DeploymentVariables({ variables }: { variables: DeployVariable[] }): Re
4343
{
4444
title: <div className={deploymentVariablesStyles.variablesColumns}>Description</div>,
4545
dataIndex: 'description',
46-
render: (_text: string, record: DeployVariable) => {
46+
render: (_text: string, record: InputVariable) => {
4747
return (
4848
<Popover
4949
content={
@@ -88,7 +88,7 @@ function DeploymentVariables({ variables }: { variables: DeployVariable[] }): Re
8888
{
8989
title: <div className={deploymentVariablesStyles.variablesColumns}>ValueSchema</div>,
9090
dataIndex: 'valueSchema',
91-
render: (_text: string, record: DeployVariable) => {
91+
render: (_text: string, record: InputVariable) => {
9292
if (!record.valueSchema) {
9393
return '';
9494
}

src/components/content/order/formDataHelpers/deployParamsHelper.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export const getDeployParams = (
5656
};
5757

5858
if (service !== undefined) {
59-
for (const param of service.variables) {
59+
for (const param of service.inputVariables) {
6060
props.params.push({
6161
name: param.name,
6262
kind: param.kind,

src/components/content/order/formDataHelpers/modifyParamsHelper.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-FileCopyrightText: Huawei Inc.
44
*/
55

6-
import { DeployVariable, sensitiveScope } from '../../../../xpanse-api/generated';
6+
import { InputVariable, sensitiveScope } from '../../../../xpanse-api/generated';
77
import { DeployParam } from '../types/DeployParam';
88

9-
export const getModifyParams = (variables: DeployVariable[]): DeployParam[] => {
9+
export const getModifyParams = (variables: InputVariable[]): DeployParam[] => {
1010
const params: DeployParam[] = [];
1111

1212
if (variables.length > 0) {

src/components/content/order/modify/Modify.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import serviceOrderStyles from '../../../../styles/service-order.module.css';
1313
import {
1414
csp,
1515
DeployedServiceDetails,
16-
DeployVariable,
16+
InputVariable,
1717
modify,
1818
type ModifyData,
1919
ModifyRequest,
@@ -40,14 +40,14 @@ export const Modify = ({
4040
const [form] = Form.useForm();
4141
const { Paragraph } = Typography;
4242
let getParams: DeployParam[] = [];
43-
let getVariables: DeployVariable[] = [];
43+
let getVariables: InputVariable[] = [];
4444

4545
const [modifyWarning, setModifyWarning] = useState<React.JSX.Element[]>([]);
4646

4747
const [isShowModifyingResult, setIsShowModifyingResult] = useState<boolean>(false);
4848
const [modifyStatus, setModifyStatus] = useState<serviceDeploymentState | undefined>(undefined);
4949
const [cacheFormVariable] = useOrderFormStore((state) => [state.addDeployVariable]);
50-
const [storedDeployVariables] = useOrderFormStore((state) => [state.deployParams]);
50+
const [storedInputVariables] = useOrderFormStore((state) => [state.deployParams]);
5151

5252
const orderableServiceDetailsQuery = useGetOrderableServiceDetails(currentSelectedService.serviceTemplateId);
5353
const modifyServiceRequest = useMutation({
@@ -67,13 +67,13 @@ export const Modify = ({
6767

6868
const hasVariableChanged: () => boolean = () => {
6969
const prevParamsString = JSON.stringify(getExistingServiceParameters(currentSelectedService));
70-
const newParamsString = JSON.stringify(storedDeployVariables);
70+
const newParamsString = JSON.stringify(storedInputVariables);
7171
return prevParamsString !== newParamsString;
7272
};
7373

7474
if (orderableServiceDetailsQuery.isSuccess) {
75-
getParams = getModifyParams(orderableServiceDetailsQuery.data.variables);
76-
getVariables = orderableServiceDetailsQuery.data.variables;
75+
getParams = getModifyParams(orderableServiceDetailsQuery.data.inputVariables);
76+
getVariables = orderableServiceDetailsQuery.data.inputVariables;
7777
}
7878

7979
const onFinish = () => {
@@ -124,7 +124,7 @@ export const Modify = ({
124124
const onClickModify = () => {
125125
const modifiedKeys = getModifiedProperties(
126126
getExistingServiceParameters(currentSelectedService),
127-
storedDeployVariables
127+
storedInputVariables
128128
);
129129
if (modifiedKeys.length > 0) {
130130
const warnings: React.JSX.Element[] = [];

src/components/content/order/scale/Scale.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export const Scale = ({
8080
);
8181
isDowngradeAllowed = orderableServiceDetailsQuery.data.flavors.isDowngradeAllowed;
8282
}
83-
getParams = getModifyParams(orderableServiceDetailsQuery.data.variables);
83+
getParams = getModifyParams(orderableServiceDetailsQuery.data.inputVariables);
8484
}
8585

8686
const onFinish = () => {

0 commit comments

Comments
 (0)