bfg-common 1.3.289 → 1.3.291

package/components/common/vm/actions/add/Add.vue

@@ -416,11 +416,7 @@ const vmFormCash = ref<UI_I_VmFormCash>({
 const onChangeName = (name: string, node: UI_I_TreeNode): void => {
   vmForm.value.name = name
   if (isSphere.value) {
-    vmForm.value.locationPath = $recursion.createAbsolutePathRecursion(
-      node,
-      'id',
-      'parent'
-    )
+    vmForm.value.locationPath = node.id
     vmForm.value.dataCenter = $recursion.findParentByValue(
       node,
       'datacenter',
@@ -434,11 +430,7 @@ const onChangeName = (name: string, node: UI_I_TreeNode): void => {
 const computeResourcePath = ref<string>('')
 const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
   emits('select-compute-resource-tree', node)
-  computeResourcePath.value = $recursion.createAbsolutePathRecursion(
-    node,
-    'id',
-    'parent'
-  )
+  computeResourcePath.value = node.id
 }
 const onChangeComputeResource = (node: UI_I_TreeNode): void => {
   vmForm.value.computeResource = node

package/components/common/vm/actions/add/lib/utils.ts

@@ -1,16 +1,17 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_VerticalStepItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
-import { UI_E_Fields } from '~/components/common/vm/actions/common/lib/models/enums'
+import { UI_E_FieldsSphere, UI_E_FieldsProcurator } from '~/components/common/vm/actions/common/lib/models/enums'
 import { checkAllField } from '~/components/common/vm/actions/lib/utils'
 
-export const getStepPositionByField = (field: string): number => {
+export const getStepPositionByField = (field: string, project: UI_T_Project): number => {
+  // TODO refactoring for procurator
   if (checkAllField(field)) {
-    return UI_E_Fields[field]
+    return project === 'sphere' ? UI_E_FieldsSphere[field] : UI_E_FieldsProcurator[field]
   } else if (field.includes('disk_devices')) {
-    return UI_E_Fields.disk_devices
+    return project === 'sphere' ? UI_E_FieldsSphere.disk_devices : UI_E_FieldsProcurator.disk_devices
   } else if (field.includes('network_devices')) {
-    return UI_E_Fields.network_devices
+    return project === 'sphere' ? UI_E_FieldsSphere.network_devices : UI_E_FieldsProcurator.network_devices
   }
   return 5
 }

package/components/common/vm/actions/common/lib/models/enums.ts

@@ -1,4 +1,34 @@
-export enum UI_E_Fields {
+export enum UI_E_FieldsSphere {
+  'compute_resource' = 2,
+  'storage.id' = 3,
+  'storage.name' = 3,
+  'storage.type' = 3,
+  'storage.pool' = 3,
+  'compatibility' = 4,
+  'guest_os_family' = 5,
+  'guest_os_version' = 5,
+  'machine_type' = 5,
+  'cpu.vcpus' = 6,
+  'cpu.max_vcpus' = 6,
+  'cpu.shares' = 6,
+  'cpu.core_per_socket' = 6,
+  'cpu.model' = 6,
+  'memory.size_mb' = 6,
+  'memory.limit_mb' = 6,
+  'memory.reservation_mb' = 6,
+  'video_card.adapter' = 6,
+  'video_card.displays' = 6,
+  'video_card.memory_mb' = 6,
+  'options.remote_console.type' = 6,
+  'options.remote_console.spice.img_compression' = 6,
+  'options.remote_console.spice.jpeg_compression' = 6,
+  'options.remote_console.spice.zlib_glz_compression' = 6,
+  'options.remote_console.spice.streaming_mode' = 6,
+  'options.boot_options.firmware' = 6,
+  'disk_devices' = 6,
+  'network_devices' = 6,
+}
+export enum UI_E_FieldsProcurator {
   'storage.id' = 2,
   'storage.name' = 2,
   'storage.type' = 2,
@@ -28,6 +58,7 @@ export enum UI_E_Fields {
   'network_devices' = 5,
 }
 
+// TODO remove because not used
 export enum UI_E_GetElemByField {
   'storage.id' = '#none',
   'storage.name' = '#none',

package/components/common/vm/actions/common/select/lib/models/types.ts

@@ -19,6 +19,7 @@ export type UI_T_CustomizeHardwareField =
 
 export type UI_T_AllField =
   | UI_T_CustomizeHardwareField
+  | 'compute_resource'
   | 'compatibility'
   | 'guest_os_family'
   | 'guest_os_version'

package/components/common/vm/actions/lib/utils.ts

@@ -194,6 +194,7 @@ const checkCustomizeHardware = (
 export const checkAllField = (field: string): field is UI_T_AllField => {
   return (
     checkCustomizeHardware(field) ||
+    field === 'compute_resource' ||
     field === 'compatibility' ||
     field === 'guest_os_family' ||
     field === 'guest_os_version' ||

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.3.289",
+  "version": "1.3.291",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",