Review tab - Move getFlavorText and refactor getFlavorValue

openshift · Apr 17, 2020 · 4756db0 · 4756db0
1 parent 4c7e102
commit 4756db0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/tabs/review-tab/utils.ts b/frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/tabs/review-tab/utils.ts
@@ -2,12 +2,13 @@ import { FormFieldType } from '../../form/form-field';
 import { getBooleanReadableValue } from '../../../../utils/strings';
 import { iGetFieldValue } from '../../selectors/immutable/field';
 import { VMSettingsField } from '../../types';
-import {iGet, iGetIn, toShallowJS} from '../../../../utils/immutable';
+import { iGet, iGetIn, toShallowJS } from '../../../../utils/immutable';
 import { CUSTOM_FLAVOR } from '../../../../constants/vm';
 import { iGetRelevantTemplate } from '../../../../selectors/immutable/template/combined';
 import { VMTemplateWrapper } from '../../../../k8s/wrapper/vm/vm-template-wrapper';
 import { Map as ImmutableMap } from 'immutable';
 import { ITemplate } from '../../../../types/template';
+import { getFlavorText } from '../../../../selectors/vm/flavor-text';
 
 export const getReviewValue = (field: any, fieldType: FormFieldType) => {
   const value = iGetFieldValue(field);
@@ -19,7 +20,8 @@ export const getReviewValue = (field: any, fieldType: FormFieldType) => {
 
 export const getField = (key: VMSettingsField, vmSettings) => iGet(vmSettings, key);
 
-export const getFieldValue = (vmSettings, key: VMSettingsField) => iGetIn(vmSettings, [key, 'value']);
+export const getFieldValue = (vmSettings, key: VMSettingsField) =>
+  iGetIn(vmSettings, [key, 'value']);
 
 export const getFlavorValue = ({
   iVMSettings,
@@ -28,22 +30,22 @@ export const getFlavorValue = ({
   relevantOptions,
 }: GetFlavorValueParams) => {
   const flavor = getFieldValue(iVMSettings, VMSettingsField.FLAVOR);
-  let cpuCores, memory;
+  let cpu, memory;
 
   if (flavor === CUSTOM_FLAVOR) {
-    cpuCores = getFieldValue(iVMSettings, VMSettingsField.CPU);
+    cpu = getFieldValue(iVMSettings, VMSettingsField.CPU);
     memory = getFieldValue(iVMSettings, VMSettingsField.MEMORY);
   } else {
     const template_ = toShallowJS(
       iGetRelevantTemplate(iUserTemplates, iCommonTemplates, relevantOptions),
     );
     const template = new VMTemplateWrapper(template_, true).init().clearRuntimeMetadata();
 
-    cpuCores = template.getCPU()?.cores;
+    cpu = template.getCPU();
     memory = template.getMemory();
   }
 
-  return `${flavor}: ${cpuCores} CPU, ${memory}`;
+  return getFlavorText({ cpu, memory, flavor });
 };
 
 type GetFlavorValueParams = {

diff --git a/frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-resource.tsx b/frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-resource.tsx
@@ -20,7 +20,6 @@ import {
 } from '../../selectors/vm/selectors';
 import { getTemplateOperatingSystems } from '../../selectors/vm-template/advanced';
 import { vmFlavorModal } from '../modals';
-import { getFlavorText } from '../flavor-text';
 import { EditButton } from '../edit-button';
 import { VMDetailsItem } from '../vms/vm-resource';
 import { DiskSummary } from '../vm-disks/disk-summary';
@@ -40,6 +39,7 @@ import {
   AFFINITY_MODAL_TITLE,
 } from '../modals/scheduling-modals/shared/consts';
 import './_vm-template-resource.scss';
+import { getFlavorText } from '../../selectors/vm/flavor-text';
 
 export const VMTemplateResourceSummary: React.FC<VMTemplateResourceSummaryProps> = ({
   template,

diff --git a/frontend/packages/kubevirt-plugin/src/components/vms/vm-resource.tsx b/frontend/packages/kubevirt-plugin/src/components/vms/vm-resource.tsx
@@ -17,7 +17,6 @@ import affinityModal from '../modals/scheduling-modals/affinity-modal/connected-
 import { getRowsDataFromAffinity } from '../modals/scheduling-modals/affinity-modal/helpers';
 import VMStatusModal from '../modals/vm-status-modal/vm-status-modal';
 import { getDescription } from '../../selectors/selectors';
-import { getFlavorText } from '../flavor-text';
 import { EditButton } from '../edit-button';
 import { VMStatuses } from '../vm-status';
 import { DiskSummary } from '../vm-disks/disk-summary';
@@ -30,6 +29,7 @@ import { VirtualMachineInstanceModel, VirtualMachineModel } from '../../models';
 import { asVMILikeWrapper } from '../../k8s/wrapper/utils/convert';
 import { getVMTemplate } from '../../selectors/vm-template/selectors';
 import { VMImportKind } from '../../types/vm-import/ovirt/vm-import';
+import { getFlavorText } from '../../selectors/vm/flavor-text';
 import {
   NODE_SELECTOR_MODAL_TITLE,
   DEDICATED_RESOURCES_PINNED,

diff --git a/...irt-plugin/src/components/flavor-text.tsx → ...rt-plugin/src/selectors/vm/flavor-text.ts b/...irt-plugin/src/components/flavor-text.tsx → ...rt-plugin/src/selectors/vm/flavor-text.ts
@@ -1,7 +1,7 @@
-import * as _ from 'lodash';
+import { CPURaw } from '../../types/vm';
+import { vCPUCount } from './cpu';
 import { convertToBaseValue, humanizeBinaryBytes } from '@console/internal/components/utils';
-import { vCPUCount } from '../selectors/vm';
-import { CPURaw } from '../types/vm';
+import * as _ from 'lodash';
 
 export const getFlavorText = ({
   cpu,