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.

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

update flavors. #700

Merged
merged 1 commit into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ApiDoc } from '../../../common/doc/ApiDoc';
import { ShowIcon } from './ShowIcon';
import React from 'react';
import { DeploymentText } from '../../../common/ocl/DeploymentText';
import { FlavoursText } from '../../../common/ocl/FlavorsText';
import { FlavorsText } from '../../../common/ocl/FlavorsText';
import { BillingText } from '../../../common/ocl/BillingText';
import { ServiceRegistrationStatus } from './ServiceRegistrationStatus';
import { ContactDetailsText } from '../../../common/ocl/ContactDetailsText';
Expand Down Expand Up @@ -59,7 +59,7 @@ function ServiceDetail({ serviceDetails }: { serviceDetails: ServiceTemplateDeta
<DeploymentText deployment={serviceDetails.deployment} />
</Descriptions.Item>
<Descriptions.Item label='Flavors'>
<FlavoursText flavors={serviceDetails.flavors} />
<FlavorsText flavors={serviceDetails.flavors.serviceFlavors} />
</Descriptions.Item>
<Descriptions.Item label='Billing'>
<BillingText billing={serviceDetails.billing} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ export const servicePoliciesStatuses: boolean[] = [true, false];

export const flavorNameList = (serviceDetails: ServiceTemplateDetailVo): string[] => {
const flavorNameList: string[] = [];
serviceDetails.flavors.forEach((flavorItem) => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
serviceDetails.flavors.serviceFlavors.forEach((flavorItem) => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
flavorNameList.push(flavorItem.name);
});
return flavorNameList;
Expand Down
4 changes: 2 additions & 2 deletions src/components/content/common/ocl/DisplayOclData.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import React from 'react';
import { Ocl } from '../../../../xpanse-api/generated';
import { Descriptions, Image, Tag } from 'antd';
import { DeploymentText } from './DeploymentText';
import { FlavoursText } from './FlavorsText';
import { BillingText } from './BillingText';
import { cspMap } from '../csp/CspLogo';
import { ContactDetailsText } from './ContactDetailsText';
import { ContactDetailsShowType } from './ContactDetailsShowType';
import { FlavorsText } from './FlavorsText';

function DisplayOclData({ ocl }: { ocl: Ocl }): React.JSX.Element | string {
const PLACE_HOLDER_UNKNOWN_VALUE: string = 'NOT PROVIDED';
Expand Down Expand Up @@ -90,7 +90,7 @@ function DisplayOclData({ ocl }: { ocl: Ocl }): React.JSX.Element | string {
<Tag color='cyan'>{ocl.namespace}</Tag>
</Descriptions.Item>
<Descriptions.Item label='Flavors'>
<FlavoursText flavors={ocl.flavors} />
<FlavorsText flavors={ocl.flavors.serviceFlavors} />
</Descriptions.Item>
<Descriptions.Item label='Billing'>
<BillingText billing={ocl.billing} />
Expand Down
4 changes: 2 additions & 2 deletions src/components/content/common/ocl/FlavorsText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* SPDX-FileCopyrightText: Huawei Inc.
*/

import { Flavor } from '../../../../xpanse-api/generated';
import { ServiceFlavor } from '../../../../xpanse-api/generated';
import React from 'react';
import YAML from 'yaml';
import { Button, Popover } from 'antd';

export function FlavoursText({ flavors }: { flavors: Flavor[] }): React.JSX.Element {
export function FlavorsText({ flavors }: { flavors: ServiceFlavor[] }): React.JSX.Element {
// These warnings must be suppressed because the Ocl object here is created from the import file and the data not necessarily contains all the mandatory fields.
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (flavors) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/content/order/formDataHelpers/flavorHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*/

import { Flavor } from '../types/Flavor';
import { FlavorBasic, UserOrderableServiceVo } from '../../../../xpanse-api/generated';
import { ServiceFlavor, UserOrderableServiceVo } from '../../../../xpanse-api/generated';

export function getFlavorList(
selectCsp: UserOrderableServiceVo.csp,
selectServiceHostingType: UserOrderableServiceVo.serviceHostingType,
userOrderableServices: UserOrderableServiceVo[] | undefined
): Flavor[] {
const flavorMapper: Map<string, FlavorBasic[]> = new Map<string, FlavorBasic[]>();
const flavorMapper: Map<string, ServiceFlavor[]> = new Map<string, ServiceFlavor[]>();
if (userOrderableServices) {
userOrderableServices.forEach((userOrderableServiceVo) => {
if (
Expand Down
4 changes: 2 additions & 2 deletions src/components/content/review/ServiceReviewsDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import React, { useState } from 'react';
import { Button, Descriptions, Image, Tag } from 'antd';
import { cspMap } from '../common/csp/CspLogo';
import { FlavoursText } from '../common/ocl/FlavorsText';
import { FlavorsText } from '../common/ocl/FlavorsText';
import { BillingText } from '../common/ocl/BillingText';
import { DeploymentText } from '../common/ocl/DeploymentText';
import { ContactDetailsText } from '../common/ocl/ContactDetailsText';
Expand Down Expand Up @@ -160,7 +160,7 @@ export const ServiceReviewsDetails = ({
<Tag color='cyan'>{currentServiceTemplateVo.namespace}</Tag>
</Descriptions.Item>
<Descriptions.Item label='Flavors'>
<FlavoursText flavors={currentServiceTemplateVo.flavors} />
<FlavorsText flavors={currentServiceTemplateVo.flavors.serviceFlavors} />
</Descriptions.Item>
<Descriptions.Item label='Billing'>
<BillingText billing={currentServiceTemplateVo.billing} />
Expand Down
Loading
Loading