From bf3f64642408630a76fb0b821eeaa072d603cbc4 Mon Sep 17 00:00:00 2001
From: Frederick Borges <fborges@opennebula.io>
Date: Wed, 8 Feb 2023 18:48:50 +0100
Subject: [PATCH] M #~: Modify vcpu decimal text (#2490)

(cherry picked from commit fa1c9f1348a223332067baa58ec80985a10ddfc8)
---
 .../Forms/Vm/ResizeCapacityForm/schema.js     |  6 +++---
 .../Steps/General/capacitySchema.js           | 14 ++++++-------
 .../BasicConfiguration/capacitySchema.js      | 20 +++++++++----------
 .../src/client/constants/translates.js        |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/fireedge/src/client/components/Forms/Vm/ResizeCapacityForm/schema.js b/src/fireedge/src/client/components/Forms/Vm/ResizeCapacityForm/schema.js
index d914d6ac71..26f8f16ef4 100644
--- a/src/fireedge/src/client/components/Forms/Vm/ResizeCapacityForm/schema.js
+++ b/src/fireedge/src/client/components/Forms/Vm/ResizeCapacityForm/schema.js
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and       *
  * limitations under the License.                                            *
  * ------------------------------------------------------------------------- */
-import { boolean, number, object } from 'yup'
+import { INPUT_TYPES, T } from 'client/constants'
 import { getValidationFromFields } from 'client/utils'
-import { T, INPUT_TYPES } from 'client/constants'
+import { boolean, number, object } from 'yup'
 
 const ENFORCE = {
   name: 'enforce',
@@ -52,7 +52,7 @@ const PHYSICAL_CPU = {
 
 const VIRTUAL_CPU = {
   name: 'VCPU',
-  label: T.VirtualCpuWithPercent,
+  label: T.VirtualCpuWithDecimal,
   tooltip: T.VirtualCpuConcept,
   type: INPUT_TYPES.TEXT,
   htmlType: 'number',
diff --git a/src/fireedge/src/client/components/Forms/VmTemplate/CreateForm/Steps/General/capacitySchema.js b/src/fireedge/src/client/components/Forms/VmTemplate/CreateForm/Steps/General/capacitySchema.js
index 30321ae7e3..9c43fb363b 100644
--- a/src/fireedge/src/client/components/Forms/VmTemplate/CreateForm/Steps/General/capacitySchema.js
+++ b/src/fireedge/src/client/components/Forms/VmTemplate/CreateForm/Steps/General/capacitySchema.js
@@ -16,21 +16,21 @@
 import { number, string } from 'yup'
 
 import {
-  generateModificationInputs,
-  generateHotResizeInputs,
   generateCapacityInput,
   generateCostCapacityInput,
+  generateHotResizeInputs,
+  generateModificationInputs,
 } from 'client/components/Forms/VmTemplate/CreateForm/Steps/General/capacityUtils'
 import { Translate } from 'client/components/HOC'
-import { formatNumberByCurrency } from 'client/models/Helper'
-import { Field, arrayToOptions } from 'client/utils'
 import {
-  T,
   HYPERVISORS,
-  VmTemplateFeatures,
   INPUT_TYPES,
   MEMORY_RESIZE_OPTIONS,
+  T,
+  VmTemplateFeatures,
 } from 'client/constants'
+import { formatNumberByCurrency } from 'client/models/Helper'
+import { Field, arrayToOptions } from 'client/utils'
 
 const commonValidation = number()
   .positive()
@@ -96,7 +96,7 @@ export const CPU_FIELDS = [PHYSICAL_CPU, ...MOD_CPU_FIELDS]
 /** @type {Field} Virtual CPU field */
 export const VIRTUAL_CPU = generateCapacityInput({
   name: 'VCPU',
-  label: T.VirtualCpuWithPercent,
+  label: T.VirtualCpuWithDecimal,
   tooltip: T.VirtualCpuConcept,
   validation: commonValidation,
 })
diff --git a/src/fireedge/src/client/components/Forms/VmTemplate/InstantiateForm/Steps/BasicConfiguration/capacitySchema.js b/src/fireedge/src/client/components/Forms/VmTemplate/InstantiateForm/Steps/BasicConfiguration/capacitySchema.js
index 6084621218..24218e0232 100644
--- a/src/fireedge/src/client/components/Forms/VmTemplate/InstantiateForm/Steps/BasicConfiguration/capacitySchema.js
+++ b/src/fireedge/src/client/components/Forms/VmTemplate/InstantiateForm/Steps/BasicConfiguration/capacitySchema.js
@@ -15,21 +15,21 @@
  * ------------------------------------------------------------------------- */
 import { NumberSchema } from 'yup'
 
-import { scaleVcpuByCpuFactor } from 'client/models/VirtualMachine'
-import { getUserInputParams } from 'client/models/Helper'
 import {
-  Field,
-  schemaUserInput,
-  prettyBytes,
-  isDivisibleBy,
-} from 'client/utils'
-import {
-  T,
   HYPERVISORS,
+  T,
   USER_INPUT_TYPES,
   VmTemplate,
   VmTemplateFeatures,
 } from 'client/constants'
+import { getUserInputParams } from 'client/models/Helper'
+import { scaleVcpuByCpuFactor } from 'client/models/VirtualMachine'
+import {
+  Field,
+  isDivisibleBy,
+  prettyBytes,
+  schemaUserInput,
+} from 'client/utils'
 
 const { number, numberFloat, range, rangeFloat } = USER_INPUT_TYPES
 
@@ -42,7 +42,7 @@ const TRANSLATES = {
   CPU: { name: 'CPU', label: T.PhysicalCpuWithPercent, tooltip: T.CpuConcept },
   VCPU: {
     name: 'VCPU',
-    label: T.VirtualCpuWithPercent,
+    label: T.VirtualCpuWithDecimal,
     tooltip: T.VirtualCpuConcept,
   },
 }
diff --git a/src/fireedge/src/client/constants/translates.js b/src/fireedge/src/client/constants/translates.js
index 2a5f9f0827..36eafe48af 100644
--- a/src/fireedge/src/client/constants/translates.js
+++ b/src/fireedge/src/client/constants/translates.js
@@ -534,7 +534,7 @@ module.exports = {
   PhysicalCpu: 'Physical CPU',
   PhysicalCpuWithPercent: 'Physical CPU (%)',
   VirtualCpu: 'Virtual CPU',
-  VirtualCpuWithPercent: 'Virtual CPU (%)',
+  VirtualCpuWithDecimal: 'Virtual CPU (Decimal values are allowed)',
   VirtualCores: 'Virtual Cores',
   Cores: 'Cores',
   Sockets: 'Sockets',