bfg-common 1.5.39 → 1.5.41

package/assets/localization/local_be.json

@@ -2332,7 +2332,8 @@
     "backCap": "Назад",
     "processing": "Апрацоўка",
     "incompleteProcess": "Незавершаны працэс!",
-    "incompleteProcessMessage": "Хочаце пакінуць гэтую старонку? Ваш прагрэс будзе страчаны, і вам трэба будзе пачаць спачатку."
+    "incompleteProcessMessage": "Хочаце пакінуць гэтую старонку? Ваш прагрэс будзе страчаны, і вам трэба будзе пачаць спачатку.",
+    "notAvailable": "Не даступны"
   },
   "auth": {
     "welcomeTo": "Сардэчна запрашаем у",

package/assets/localization/local_en.json

@@ -2336,7 +2336,8 @@
     "backCap": "Back",
     "processing": "Processing",
     "incompleteProcess": "Incomplete Process!",
-    "incompleteProcessMessage": "Are you sure you want to leave this page? Your progress will be lost, and you’ll need to start over."
+    "incompleteProcessMessage": "Are you sure you want to leave this page? Your progress will be lost, and you’ll need to start over.",
+    "notAvailable": "Not Available"
   },
   "auth": {
     "welcomeTo": "Welcome to",

package/assets/localization/local_hy.json

@@ -2336,7 +2336,8 @@
     "backCap": "Վերադառնալ",
     "processing": "Մշակում",
     "incompleteProcess": "Անավարտ գործընթաց",
-    "incompleteProcessMessage": "Վստա՞հ եք, որ ցանկանում եք լքել այս էջը: Ձեր առաջընթացը կկորչի, և դուք պետք է նորից սկսեք:"
+    "incompleteProcessMessage": "Վստա՞հ եք, որ ցանկանում եք լքել այս էջը: Ձեր առաջընթացը կկորչի, և դուք պետք է նորից սկսեք:",
+    "notAvailable": "Հասանելի չէ"
   },
   "auth": {
     "welcomeTo": "Բարի գալուստ",

package/assets/localization/local_kk.json

@@ -2335,7 +2335,8 @@
     "backCap": "Артқа",
     "processing": "Өңдеу",
     "incompleteProcess": "Аяқталмаған Процесс!",
-    "incompleteProcessMessage": "Сіз бұл беттен кеткіңіз келетініне сенімдісіз бе? Сіздің жетістіктеріңіз жоғалады және сіз бәрін басынан бастауыңыз керек."
+    "incompleteProcessMessage": "Сіз бұл беттен кеткіңіз келетініне сенімдісіз бе? Сіздің жетістіктеріңіз жоғалады және сіз бәрін басынан бастауыңыз керек.",
+    "notAvailable": "Жоқ"
   },
   "auth": {
     "welcomeTo": "Қош келдіңіз",

package/assets/localization/local_ru.json

@@ -2337,7 +2337,8 @@
     "backCap": "Назад",
     "processing": "Обработка",
     "incompleteProcess": "Незавершенный процесс!",
-    "incompleteProcessMessage": "Вы уверены, что хотите покинуть эту страницу? Ваш прогресс будет потерян, и вам нужно будет начать сначала."
+    "incompleteProcessMessage": "Вы уверены, что хотите покинуть эту страницу? Ваш прогресс будет потерян, и вам нужно будет начать сначала.",
+    "notAvailable": "Не доступен"
   },
   "auth": {
     "welcomeTo": "Добро пожаловать в",

package/assets/localization/local_zh.json

@@ -2333,7 +2333,8 @@
     "backCap": "返回",
     "processing": "处理过程",
     "incompleteProcess": "不完整的过程！",
-    "incompleteProcessMessage": "你确定要离开这一页吗？ 你的进步将丢失，你需要重新开始。"
+    "incompleteProcessMessage": "你确定要离开这一页吗？ 你的进步将丢失，你需要重新开始。",
+    "notAvailable": "暂时没有"
   },
   "auth": {
     "welcomeTo": "欢迎来到",
@@ -2349,7 +2350,6 @@
     "loginErrorText": "无效的用户名或密码",
     "loginAccessErrorText": "您无法访问进入系统",
     "tooManyLoginAttempts": "太多的失败尝试授权。稍后再尝试。"
-
   },
   "home": {
     "objectsWithMostAlerts": "警报最多的对象",

package/components/common/pages/home/resource/lib/models/interfaces.ts

@@ -7,5 +7,8 @@ export interface UI_I_ResourceBlock {
   data: UI_I_ProgressWidgetData
   usedTitle: string
   capacityTitle: string
-  status: string
+  status: {
+    available: string
+    notAvailable: string
+  }
 }

package/components/common/pages/home/resource/lib/utils/resourceMeter.ts

@@ -42,7 +42,10 @@ export const constructResourceMeter = (
         },
         usedTitle: localization.common.used,
         capacityTitle: localization.common.capacity,
-        status: localization.common.available,
+        status: {
+          available: localization.common.available,
+          notAvailable: localization.common.notAvailable,
+        },
       }
     }) || []
   )

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

@@ -21,6 +21,7 @@
           <common-vm-actions-common-select-template
             v-show="selectedStep.id === dynamicSteps.selectTemplate"
             :template-submit="templateSubmit"
+            :templates-tree="props.templatesTree"
             @submit="onChangeTemplate"
           />
           <common-vm-actions-common-select-name
@@ -230,6 +231,7 @@ const props = defineProps<{
   passthroughDevices: UI_I_PciDevice[]
   mediatedDevices: UI_I_MediatedDevice[]
   vmNameInWizard: string
+  templatesTree: UI_I_TreeNode[]
   capabilities?: UI_I_Capabilities
   dataCenter?: UI_I_TreeNode // для сферы
   computeResource?: UI_I_TreeNode // для сферы
@@ -553,6 +555,8 @@ const vmForm = ref<UI_I_VmForm>({
   locationPath: '',
   dataCenter: null,
 })
+
+// TODO remove (not used)
 const vmFormCash = ref<UI_I_VmFormCash>({
   dataCenterId: null,
   computeResourceTypeAndId: null,

package/components/common/vm/actions/clone/Clone.vue

@@ -20,13 +20,38 @@
             class="new-task-form"
           />
           <common-vm-actions-common-select-name
-            v-show="selectedStep.id === dynamicSteps.selectName"
-            :show="selectedStep.id === dynamicSteps.selectName"
+            v-show="
+              selectedStep.id === dynamicSteps.selectName ||
+              selectedStep.id === dynamicSteps.selectNameFolder
+            "
+            :show="
+              selectedStep.id === dynamicSteps.selectName ||
+              selectedStep.id === dynamicSteps.selectNameFolder
+            "
             :name-form-submit="nameFormSubmit"
             :project="props.project"
+            :data-center="props.dataCenter"
             @submit="onChangeName(...$event)"
             @check-name="emits('check-name', $event)"
           />
+          <common-vm-actions-common-select-compute-resource
+            v-if="isSphere"
+            v-show="selectedStep.id === dynamicSteps.selectComputeResource"
+            v-model="computeResource"
+            :compute-resource-submit="computeResourceSubmit"
+            :data-center="vmForm.dataCenter"
+            :compute-resource="props.computeResource"
+            :compute-resource-tree="props.computeResourceTree"
+            @submit="onChangeComputeResource"
+            @select-compute-resource-tree="onSelectComputeResourceTree"
+            @get-compute-resource-tree="
+              emits('get-compute-resource-tree', $event)
+            "
+            @show-compute-resource-tree="
+              emits('show-compute-resource-tree', $event)
+            "
+            @clear-compute-resource-tree="emits('clear-compute-resource-tree')"
+          />
           <common-vm-actions-common-select-storage
             v-show="selectedStep.id === dynamicSteps.selectStorage"
             :storage-submit="storageSubmit"
@@ -41,9 +66,9 @@
           />
           <common-vm-actions-common-select-os
             v-show="selectedStep.id === dynamicSteps.selectGuestOSMachineType"
-            v-model:machine-type="guestMachineType"
-            v-model:guest-os-family="guestOsFamily"
-            v-model:guest-os-version="guestOsVersion"
+            v-model:machine-type="vmForm.guestMachineType"
+            v-model:guest-os-family="vmForm.guestOsFamily"
+            v-model:guest-os-version="vmForm.guestOsVersion"
             :families-options="guestOsFamilies"
             :versions-options="guestOsVersions"
             :machine-types-options="machineTypes"
@@ -137,9 +162,8 @@ import type {
   UI_I_VmSettings,
 } from '~/lib/models/store/vm/interfaces'
 import type {
-  // I_DynamicSteps,
   UI_I_VmForm,
-} from '~/components/common/vm/actions/clone/lib/models/interfaces'
+} from '~/components/common/vm/actions/common/lib/models/interfaces'
 import type {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
@@ -147,6 +171,7 @@ import type {
 import type { UI_I_Capabilities } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import {
   stepsSchemeInitial,
   stepsFunc,
@@ -176,6 +201,9 @@ const props = defineProps<{
   capabilities?: UI_I_Capabilities
   schedulerTask?: any // TODO  надо interface переместить глобално
   selectedVirtualMachine?: UI_I_Capabilities
+  dataCenter?: UI_I_TreeNode // для сферы
+  computeResource?: UI_I_TreeNode // для сферы
+  computeResourceTree?: UI_I_TreeNode[] // для сферы
 }>()
 
 const emits = defineEmits<{
@@ -188,10 +216,21 @@ const emits = defineEmits<{
   (event: 'get-networks-table', value: UI_I_TablePayload): void
   (event: 'get-pci-devices'): void
   (event: 'hide'): void
+  (
+    event: 'get-compute-resource-tree',
+    value: { id: string | number; cb: () => void }
+  ): void // для сферы
+  (event: 'show-compute-resource-tree', value: UI_I_TreeNode): void // для сферы
+  (event: 'select-compute-resource-tree', value: UI_I_TreeNode): void // для сферы
+  (event: 'clear-compute-resource-tree'): void // для сферы
 }>()
 
+const { $recursion } = useNuxtApp()
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const isSphere = computed<boolean>(() => props.project === 'sphere')
+
 const isScheduledTasks = computed<boolean>(
   () => props.schedulerTask.isSchedulerTask
 )
@@ -229,9 +268,11 @@ const wizard: Wizard = new Wizard(
 watch(
   isScheduledTasks,
   (newValue) => {
-    wizard.changeScheme(newValue ? 4 : 0)
-    if (!newValue) {
-      wizard.selectStepHard(1)
+    if (newValue) {
+      wizard.changeScheme(isSphere ? 12 : 4)
+    } else {
+      wizard.changeScheme(isSphere ? 8 : 0)
+      wizard.selectStepHard(isSphere ? 2 : 1)
     }
   },
   { immediate: true }
@@ -270,7 +311,7 @@ const validationFunc = async (
   wizard.setLoader(true)
   if (
     wizard.isValidateForStep(
-      dynamicSteps.selectName,
+      isSphere.value ? dynamicSteps.selectNameFolder : dynamicSteps.selectName,
       currentStep.id,
       nextStep.id
     )
@@ -279,6 +320,18 @@ const validationFunc = async (
 
     value = nameValidation.newValue
     stepHasError = stepHasError || nameValidation.stepHasError
+  } else if (
+    isSphere.value &&
+    wizard.isValidateForStep(
+      dynamicSteps.selectComputeResource,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
+    const computeResourceValidation = await checkComputeResource(value)
+
+    value = computeResourceValidation.newValue
+    stepHasError = stepHasError || computeResourceValidation.stepHasError
   } else if (
     wizard.isValidateForStep(
       dynamicSteps.selectStorage,
@@ -318,14 +371,17 @@ const checkName = async (
   let stepHasError = false
 
   return new Promise((resolve) => {
+    const step = isSphere.value
+      ? dynamicSteps.selectNameFolder
+      : dynamicSteps.selectName
     nameFormSubmit.value = (isValid: boolean) => {
       if (!isValid) {
-        stepHasError = wizard.setValidation(dynamicSteps.selectName, 'name', {
+        stepHasError = wizard.setValidation(step, 'name', {
           fieldMessage: 'aaa',
           alertMessage: 'aaa',
         })
-      } else if (wizard.hasMessage(dynamicSteps.selectName, 'name')) {
-        value = wizard.removeValidation(dynamicSteps.selectName, 'name', value)
+      } else if (wizard.hasMessage(step, 'name')) {
+        value = wizard.removeValidation(step, 'name', value)
       }
 
       resolve({
@@ -336,6 +392,40 @@ const checkName = async (
     }
   })
 }
+const checkComputeResource = async (
+  value: UI_I_WizardStep[]
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+
+  return new Promise((resolve) => {
+    computeResourceSubmit.value = (isValid: boolean) => {
+      if (!isValid) {
+        stepHasError = wizard.setValidation(
+          dynamicSteps.selectComputeResource,
+          'computeResource',
+          {
+            fieldMessage: 'aaa',
+            alertMessage: 'aaa',
+          }
+        )
+      } else if (
+        wizard.hasMessage(dynamicSteps.selectComputeResource, 'computeResource')
+      ) {
+        value = wizard.removeValidation(
+          dynamicSteps.selectComputeResource,
+          'computeResource',
+          value
+        )
+      }
+
+      resolve({
+        stepHasError,
+        newValue: value,
+      })
+      computeResourceSubmit.value = null
+    }
+  })
+}
 const checkStorage = async (
   value: UI_I_WizardStep[]
 ): Promise<UI_I_ValidationReturn> => {
@@ -403,20 +493,34 @@ const checkCustomizeHardware = async (
   })
 }
 
-const storageIdCash = ref<string | null>(null)
 const vmForm = ref<UI_I_VmForm>({
   name: '',
+  compatibility: '',
+  guestMachineType: null,
+  guestOsFamily: null,
+  guestOsVersion: null,
+  computeResource: null,
   storage: null,
+  locationPath: '',
+  dataCenter: null,
   options: [],
 })
-const onChangeName = (name: string): void => {
+const onChangeName = (name: string, node: UI_I_TreeNode): void => {
   vmForm.value.name = name
+  if (isSphere.value) {
+    vmForm.value.locationPath = node.id
+    vmForm.value.dataCenter = $recursion.findParentByValue(
+      node,
+      'datacenter',
+      'type',
+      'parent'
+    )
+  }
 }
 const onChangeStorage = (storage: UI_I_DatastoreTableItem | null): void => {
   if (!storage) return
 
   vmForm.value.storage = storage
-  storageIdCash.value = storage.id
 }
 const onChangeSelectOptions = (options: string[]): void => {
   vmForm.value.options = options
@@ -424,13 +528,21 @@ const onChangeSelectOptions = (options: string[]): void => {
     options.includes('customize-os') &&
     options.includes('customize-hardware')
   ) {
-    wizard.changeScheme(isScheduledTasks.value ? 7 : 3)
+    let procuratorSchame = isScheduledTasks.value ? 7 : 3
+    let sphereSchame = isScheduledTasks.value ? 15 : 11
+    wizard.changeScheme(isSphere.value ? sphereSchame : procuratorSchame)
   } else if (options.includes('customize-os')) {
-    wizard.changeScheme(isScheduledTasks.value ? 5 : 1)
+    let procuratorSchame = isScheduledTasks.value ? 5 : 1
+    let sphereSchame = isScheduledTasks.value ? 13 : 9
+    wizard.changeScheme(isSphere.value ? sphereSchame : procuratorSchame)
   } else if (options.includes('customize-hardware')) {
-    wizard.changeScheme(isScheduledTasks.value ? 6 : 2)
+    let procuratorSchame = isScheduledTasks.value ? 6 : 2
+    let sphereSchame = isScheduledTasks.value ? 14 : 10
+    wizard.changeScheme(isSphere.value ? sphereSchame : procuratorSchame)
   } else {
-    wizard.changeScheme(isScheduledTasks.value ? 4 : 0)
+    let procuratorSchame = isScheduledTasks.value ? 4 : 0
+    let sphereSchame = isScheduledTasks.value ? 12 : 8
+    wizard.changeScheme(isSphere.value ? sphereSchame : procuratorSchame)
   }
 }
 const customizeHardware = ref<UI_I_SendDataCustomizeHardware | null>(null)
@@ -491,7 +603,9 @@ const validateSendData = async (
     virtualHardwareHardDisks.value,
     virtualHardwareCdDvdDrives.value,
     isPowerOnByDefault.value,
-    localization.value
+    localization.value,
+    vmForm.value.locationPath, // для сферы
+    computeResourcePath.value // для сферы
   )
 
   wizard.setLoader(false)
@@ -518,6 +632,8 @@ const onFinish = (): void => {
       virtualHardwareCdDvdDrives.value,
       isPowerOnByDefault.value,
       localization.value,
+      vmForm.value.locationPath, // для сферы
+      computeResourcePath.value, // для сферы
       false,
       newTaskForm.value,
       props.schedulerTask
@@ -531,28 +647,42 @@ const onFinish = (): void => {
 const selectedNavItem = ref<UI_T_SelectedNavItem>(0)
 
 const nameFormSubmit = ref<null | Function>(null)
+const computeResourceSubmit = ref<null | Function>(null)
 const storageSubmit = ref<null | Function>(null)
 const customizeHardwareSubmit = ref<null | Function>(null)
 
 const vmSettings = computed<UI_I_VmSettings | null>(() => props.vmSettings)
 const vmName = ref<string>(vmSettings.value?.name || '')
 
-const guestMachineType = ref<UI_I_OptionItem | null>(null)
-const guestOsFamily = ref<UI_I_OptionItem | null>(null)
-const guestOsVersion = ref<UI_I_OptionItem | null>(null)
-
 const guestOsFamilies = ref<UI_I_OptionItem[]>(capabilities.guestOsFamilies)
 const guestOsVersions = ref<UI_I_ArbitraryObject<UI_I_OptionItem[]>>(
   capabilities.guestOsVersions
 )
 const machineTypes = ref<UI_I_OptionItem[]>(capabilities.machineTypes)
 
+const computeResource = ref<UI_I_TreeNode | null>(null)
+const onChangeComputeResource = (node: UI_I_TreeNode): void => {
+  computeResource.value = node
+}
+// // Для сферы
+const computeResourcePath = ref<string>('')
+const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
+  emits('select-compute-resource-tree', node)
+  computeResourcePath.value = node.id
+}
+
 watch(vmSettings, (newValue) => {
   vmName.value = newValue?.name || ''
 
-  if (newValue?.guestOsFamily) guestOsFamily.value = newValue.guestOsFamily
-  if (newValue?.guestMachineType) guestMachineType.value = newValue.guestMachineType
-  if (newValue?.guestOsVersion) guestOsVersion.value = newValue.guestOsVersion
+  if (newValue?.guestOsFamily)
+    vmForm.value.guestOsFamily = newValue.guestOsFamily
+  if (newValue?.guestMachineType)
+    vmForm.value.guestMachineType = newValue.guestMachineType
+  if (newValue?.guestOsVersion)
+    vmForm.value.guestOsVersion = newValue.guestOsVersion
+
+  if (newValue?.compatibility)
+    vmForm.value.compatibility = newValue.compatibility
 })
 
 const onHideModal = (): void => {

package/components/common/vm/actions/clone/lib/config/steps.ts

@@ -5,11 +5,13 @@ import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
 export const dynamicSteps = {
   scheduledTasks: 0,
   selectName: 1,
-  selectStorage: 2,
-  selectOptions: 3,
-  selectGuestOSMachineType: 4,
-  customizeHardware: 5,
-  readyComplete: 6,
+  selectNameFolder: 2,
+  selectComputeResource: 3,
+  selectStorage: 4,
+  selectOptions: 5,
+  selectGuestOSMachineType: 6,
+  customizeHardware: 7,
+  readyComplete: 8,
 }
 
 export const stepsFunc = (
@@ -41,6 +43,38 @@ export const stepsFunc = (
         },
       },
     },
+    // Sphere
+    {
+      id: dynamicSteps.selectNameFolder,
+      stepName: '',
+      title: localization.common.selectNameFolder,
+      subTitle: localization.common.specifyUniqueNameTargetLocation,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-select-name-folder',
+      fields: {
+        name: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    // Sphere
+    {
+      id: dynamicSteps.selectComputeResource,
+      stepName: '',
+      title: localization.common.selectComputeResource,
+      subTitle: localization.common.selectDestinationComputeResourceOperation,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-select-compute-resource',
+      fields: {
+        computeResource: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
     {
       id: dynamicSteps.selectStorage,
       stepName: '',
@@ -107,6 +141,7 @@ export const stepsFunc = (
 }
 
 export const stepsSchemeInitial = [
+  // Procurator
   // 0
   [
     dynamicSteps.selectName,
@@ -175,4 +210,82 @@ export const stepsSchemeInitial = [
     dynamicSteps.customizeHardware,
     dynamicSteps.readyComplete,
   ],
+
+  // Sphere
+  // 8
+  [
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptions,
+    dynamicSteps.readyComplete,
+  ],
+  // 9 Customize the operating system
+  [
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptions,
+    dynamicSteps.selectGuestOSMachineType,
+    dynamicSteps.readyComplete,
+  ],
+  // 10 Customize this virtual machine's hardware
+  [
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptions,
+    dynamicSteps.customizeHardware,
+    dynamicSteps.readyComplete,
+  ],
+  // 11 Customize the operating system and this virtual machine's hardware
+  [
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptions,
+    dynamicSteps.selectGuestOSMachineType,
+    dynamicSteps.customizeHardware,
+    dynamicSteps.readyComplete,
+  ],
+  // 12 Width Scheduled Tasks
+  [
+    dynamicSteps.scheduledTasks,
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptions,
+    dynamicSteps.readyComplete,
+  ],
+  // 13 Customize the operating system
+  [
+    dynamicSteps.scheduledTasks,
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptions,
+    dynamicSteps.selectGuestOSMachineType,
+    dynamicSteps.readyComplete,
+  ],
+  // 14 Customize this virtual machine's hardware
+  [
+    dynamicSteps.scheduledTasks,
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptions,
+    dynamicSteps.customizeHardware,
+    dynamicSteps.readyComplete,
+  ],
+  // 15 Customize the operating system and this virtual machine's hardware
+  [
+    dynamicSteps.scheduledTasks,
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptions,
+    dynamicSteps.selectGuestOSMachineType,
+    dynamicSteps.customizeHardware,
+    dynamicSteps.readyComplete,
+  ],
 ]

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

@@ -28,6 +28,7 @@ export interface UI_I_VmForm {
   computeResource: UI_I_TreeNode | null
   locationPath: string
   dataCenter: UI_I_TreeNode | null
+  options?: string[]
 }
 export interface UI_I_VmFormCash {
   dataCenterId: string | number | null

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

@@ -1,51 +1,52 @@
-import type { UI_I_Capabilities } from '~/components/common/vm/actions/common/lib/models/interfaces'
-import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
-
-export const mapCapabilities = (
-  capabilitiesFromApi: UI_I_Capabilities
-): void => {
-  const { $binary } = useNuxtApp()
-
-  // Machine Types
-  capabilities.machineTypes = Object.keys(
-    capabilitiesFromApi.machine_types
-  ).map((key) => {
-    return {
-      text: capabilitiesFromApi.machine_types[key],
-      value: key,
-    }
-  })
-  // CPU Models
-  capabilities.cpuModels = Object.keys(capabilitiesFromApi.cpu_models).map(
-    (key) => {
-      return {
-        text: capabilitiesFromApi.cpu_models[key],
-        value: key,
-      }
-    }
-  )
-
-  Object.keys(capabilitiesFromApi.bus_types).forEach(key => {
-      capabilities.bus[key] = Object.keys(capabilitiesFromApi.bus_types[key]).map(
-          (key2) => {
-              return {
-                  text: capabilitiesFromApi.bus_types[key][key2],
-                  value: key2,
-              }
-          }
-      )
-  })
-  Object.keys(capabilitiesFromApi.cdrom_bus_type).forEach(key => {
-      capabilities.cdromBus[key] = Object.keys(capabilitiesFromApi.cdrom_bus_type[key]).map(
-          (key2) => {
-              return {
-                  text: capabilitiesFromApi.cdrom_bus_type[key][key2],
-                  value: key2,
-              }
-          }
-      )
-  })
-
-  capabilities.maxCpus = capabilitiesFromApi.max_vcpus
-  capabilities.maxMemory = $binary.kbToMb(capabilitiesFromApi.max_mem_kib)
-}
+import type { UI_I_Capabilities } from '~/components/common/vm/actions/common/lib/models/interfaces'
+import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
+
+export const mapCapabilities = (
+  capabilitiesFromApi: UI_I_Capabilities
+): void => {
+  if (!capabilitiesFromApi) return
+  const { $binary } = useNuxtApp()
+
+  // Machine Types
+  capabilities.machineTypes = Object.keys(
+    capabilitiesFromApi.machine_types
+  ).map((key) => {
+    return {
+      text: capabilitiesFromApi.machine_types[key],
+      value: key,
+    }
+  })
+  // CPU Models
+  capabilities.cpuModels = Object.keys(capabilitiesFromApi.cpu_models).map(
+    (key) => {
+      return {
+        text: capabilitiesFromApi.cpu_models[key],
+        value: key,
+      }
+    }
+  )
+
+  Object.keys(capabilitiesFromApi.bus_types).forEach((key) => {
+    capabilities.bus[key] = Object.keys(capabilitiesFromApi.bus_types[key]).map(
+      (key2) => {
+        return {
+          text: capabilitiesFromApi.bus_types[key][key2],
+          value: key2,
+        }
+      }
+    )
+  })
+  Object.keys(capabilitiesFromApi.cdrom_bus_type).forEach((key) => {
+    capabilities.cdromBus[key] = Object.keys(
+      capabilitiesFromApi.cdrom_bus_type[key]
+    ).map((key2) => {
+      return {
+        text: capabilitiesFromApi.cdrom_bus_type[key][key2],
+        value: key2,
+      }
+    })
+  })
+
+  capabilities.maxCpus = capabilitiesFromApi.max_vcpus
+  capabilities.maxMemory = $binary.kbToMb(capabilitiesFromApi.max_mem_kib)
+}

package/components/common/vm/actions/common/select/template/Template.vue

@@ -10,6 +10,7 @@
 
     <div class="tree-view-wrap">
       <common-vm-actions-common-select-template-tree-view
+        :templates-tree="props.templatesTree"
         @select-node="onSelectNode"
       />
     </div>
@@ -22,6 +23,7 @@ import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models
 
 const props = defineProps<{
   templateSubmit: null | Function
+  templatesTree: UI_I_TreeNode[]
 }>()
 const emits = defineEmits<{
   (event: 'submit', value: UI_I_TreeNode | null): void
@@ -42,7 +44,8 @@ watch(
 )
 
 const submit = async (cb: Function): Promise<void> => {
-  if (!selectedNode.value || selectedNode.value.type !== 'vm') { // TODO change vm to vmTemplate
+  if (!selectedNode.value || selectedNode.value.type !== 'vm') {
+    // TODO change vm to vmTemplate
     errors.value = [localization.value.vmWizard.selectValidTemplate]
     cb(false)
     return

package/components/common/vm/actions/common/select/template/TemplateTreeView.vue

@@ -19,6 +19,9 @@
 <script setup lang="ts">
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 
+const props = defineProps<{
+  templatesTree: UI_I_TreeNode[]
+}>()
 const emits = defineEmits<{
   (event: 'select-node', value: UI_I_TreeNode): void
 }>()
@@ -26,11 +29,8 @@ const emits = defineEmits<{
 const { $store, $recursion }: any = useNuxtApp()
 
 const nodes = ref<UI_I_TreeNode[]>([])
-const nodesFromStore = computed<UI_I_TreeNode[]>(
-  () => $store.getters['inventory/getTreeByName']('vm') || []
-)
 watch(
-  nodesFromStore,
+  () => props.templatesTree,
   (newValue) => {
     nodes.value = useDeepCopy(newValue)
   },

package/lib/models/store/interfaces.ts

@@ -9,6 +9,7 @@ export interface API_UI_I_Response<T> {
   response: {
     _data: T
     status: number
+    ok: boolean
   }
 }
 export interface API_UI_I_Error {

package/lib/models/store/vm/interfaces.ts

@@ -250,4 +250,6 @@ export interface API_UI_I_VmReadyToComplete {
     video_card: API_UI_I_VmReadyToCompleteVideoCard
     passthrough_pci_devices: API_UI_I_VmReadyToCompletePciDevice[]
   }
+  compute_resource?: string
+  location?: string
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.39",
+  "version": "1.5.41",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "1.0.22",
-    "bfg-uikit": "1.0.396",
+    "bfg-uikit": "1.0.397",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }