update flavors.

eclipse-xpanse · Apr 11, 2024 · 0a38908 · 0a38908
1 parent 40c1aa5
commit 0a38908
Show file tree

Hide file tree

Showing 16 changed files with 316 additions and 326 deletions.
diff --git a/src/components/content/catalog/services/details/ServiceDetail.tsx b/src/components/content/catalog/services/details/ServiceDetail.tsx
@@ -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';
@@ -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} />

diff --git a/src/components/content/catalog/services/policies/servicePoliciesParams.ts b/src/components/content/catalog/services/policies/servicePoliciesParams.ts
@@ -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;

diff --git a/src/components/content/common/ocl/DisplayOclData.tsx b/src/components/content/common/ocl/DisplayOclData.tsx
@@ -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';
@@ -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} />

diff --git a/src/components/content/common/ocl/FlavorsText.tsx b/src/components/content/common/ocl/FlavorsText.tsx
@@ -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) {

diff --git a/src/components/content/order/formDataHelpers/flavorHelper.ts b/src/components/content/order/formDataHelpers/flavorHelper.ts
@@ -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 (

diff --git a/src/components/content/review/ServiceReviewsDetails.tsx b/src/components/content/review/ServiceReviewsDetails.tsx
@@ -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';
@@ -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} />