Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add output properties in ocl #1566

Merged
merged 1 commit into from
Mar 5, 2025
Merged

add output properties in ocl #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/content/deployment/DeploymentManagement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function DeploymentManagement({ deployment }: { deployment: Deployment }): React
 Service Deployment Management
</h3>
<DeploymentInfomation deployment={deployment} />
<DeploymentVariables variables={deployment.variables} />
<DeploymentVariables variables={deployment.inputVariables} />
</>
);
}
Expand Down
10 changes: 5 additions & 5 deletions src/components/content/deployment/DeploymentVariables.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import { ColumnsType } from 'antd/es/table';
import React from 'react';
import catalogStyles from '../../../styles/catalog.module.css';
import deploymentVariablesStyles from '../../../styles/deployment-variables.module.css';
import { deployResourceKind, DeployVariable, sensitiveScope } from '../../../xpanse-api/generated';
import { deployResourceKind, InputVariable, sensitiveScope } from '../../../xpanse-api/generated';

function DeploymentVariables({ variables }: { variables: DeployVariable[] }): React.JSX.Element {
const columns: ColumnsType<DeployVariable> = [
function DeploymentVariables({ variables }: { variables: InputVariable[] }): React.JSX.Element {
const columns: ColumnsType<InputVariable> = [
{
title: <div className={deploymentVariablesStyles.variablesColumns}>Name</div>,
dataIndex: 'name',
Expand Down Expand Up @@ -43,7 +43,7 @@ function DeploymentVariables({ variables }: { variables: DeployVariable[] }): Re
{
title: <div className={deploymentVariablesStyles.variablesColumns}>Description</div>,
dataIndex: 'description',
render: (_text: string, record: DeployVariable) => {
render: (_text: string, record: InputVariable) => {
return (
<Popover
content={
Expand Down Expand Up @@ -88,7 +88,7 @@ function DeploymentVariables({ variables }: { variables: DeployVariable[] }): Re
{
title: <div className={deploymentVariablesStyles.variablesColumns}>ValueSchema</div>,
dataIndex: 'valueSchema',
render: (_text: string, record: DeployVariable) => {
render: (_text: string, record: InputVariable) => {
if (!record.valueSchema) {
return '';
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/content/order/formDataHelpers/deployParamsHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const getDeployParams = (
};

if (service !== undefined) {
for (const param of service.variables) {
for (const param of service.inputVariables) {
props.params.push({
name: param.name,
kind: param.kind,
Expand Down
4 changes: 2 additions & 2 deletions src/components/content/order/formDataHelpers/modifyParamsHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-FileCopyrightText: Huawei Inc.
*/

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

export const getModifyParams = (variables: DeployVariable[]): DeployParam[] => {
export const getModifyParams = (variables: InputVariable[]): DeployParam[] => {
const params: DeployParam[] = [];

if (variables.length > 0) {
Expand Down
14 changes: 7 additions & 7 deletions src/components/content/order/modify/Modify.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import serviceOrderStyles from '../../../../styles/service-order.module.css';
import {
csp,
DeployedServiceDetails,
DeployVariable,
InputVariable,
modify,
type ModifyData,
ModifyRequest,
Expand All @@ -40,14 +40,14 @@ export const Modify = ({
const [form] = Form.useForm();
const { Paragraph } = Typography;
let getParams: DeployParam[] = [];
let getVariables: DeployVariable[] = [];
let getVariables: InputVariable[] = [];

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

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

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

const hasVariableChanged: () => boolean = () => {
const prevParamsString = JSON.stringify(getExistingServiceParameters(currentSelectedService));
const newParamsString = JSON.stringify(storedDeployVariables);
const newParamsString = JSON.stringify(storedInputVariables);
return prevParamsString !== newParamsString;
};

if (orderableServiceDetailsQuery.isSuccess) {
getParams = getModifyParams(orderableServiceDetailsQuery.data.variables);
getVariables = orderableServiceDetailsQuery.data.variables;
getParams = getModifyParams(orderableServiceDetailsQuery.data.inputVariables);
getVariables = orderableServiceDetailsQuery.data.inputVariables;
}

const onFinish = () => {
Expand Down Expand Up @@ -124,7 +124,7 @@ export const Modify = ({
const onClickModify = () => {
const modifiedKeys = getModifiedProperties(
getExistingServiceParameters(currentSelectedService),
storedDeployVariables
storedInputVariables
);
if (modifiedKeys.length > 0) {
const warnings: React.JSX.Element[] = [];
Expand Down
2 changes: 1 addition & 1 deletion src/components/content/order/scale/Scale.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const Scale = ({
);
isDowngradeAllowed = orderableServiceDetailsQuery.data.flavors.isDowngradeAllowed;
}
getParams = getModifyParams(orderableServiceDetailsQuery.data.variables);
getParams = getModifyParams(orderableServiceDetailsQuery.data.inputVariables);
}

const onFinish = () => {
Expand Down
Loading
Loading