bfg-common 1.0.4 → 1.0.5

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

@@ -46,9 +46,7 @@
             @show-compute-resource-tree="
               emits('show-compute-resource-tree', $event)
             "
-            @select-compute-resource-tree="
-              emits('select-compute-resource-tree', $event)
-            "
+            @select-compute-resource-tree="onSelectComputeResourceTree"
             @clear-compute-resource-tree="
               emits('clear-compute-resource-tree', $event)
             "
@@ -285,6 +283,8 @@ const emits = defineEmits<{
   (event: 'clear-compute-resource-tree'): void // для сферы
 }>()
 
+const { $recursion } = useNuxtApp()
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const stepPosition = ref<number>(0)
@@ -307,6 +307,7 @@ const vmForm = ref<UI_I_VmForm>({
   guestOsVersion: null,
   computeResource: null,
   storage: null,
+  locationPath: '',
   dataCenter: null,
 })
 const vmFormCash = ref<UI_I_VmFormCash>({
@@ -321,11 +322,25 @@ const onChangeNameAndNext = (name: string, node: UI_I_TreeNode): void => {
   if (hasChanges) checkLocalChangeAndChangeStepStatus()
 
   vmForm.value.name = name
+  vmForm.value.locationPath = $recursion.createAbsolutePathRecursion(
+    node,
+    'id',
+    'parent'
+  )
   vmForm.value.dataCenter = node
   vmFormCash.value.dataCenterId = node?.id || null
   onNext(true)
 }
 // Для сферы
+const computeResourcePath = ref<string>('')
+const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
+  emits('select-compute-resource-tree', node)
+  computeResourcePath.value = $recursion.createAbsolutePathRecursion(
+    node,
+    'id',
+    'parent'
+  )
+}
 const changeComputeResourceAndNext = (node: UI_I_TreeNode): void => {
   const hasChanges =
     `${node.type}${node.id}` !== vmFormCash.value.computeResourceTypeAndId
@@ -410,7 +425,9 @@ const validateSendData = (): void => {
       virtualHardwareHardDisks.value,
       virtualHardwareCdDvdDrives.value,
       isPowerOnByDefault.value,
-      localization.value
+      localization.value,
+      vmForm.value.locationPath, // для сферы
+      computeResourcePath.value // для сферы
     )
     .then((data) => {
       loading.value = false
@@ -487,7 +504,8 @@ const checkSubmit = (force = false): boolean => {
   if (
     (props.project === 'sphere'
       ? stepPosition.value === 3
-      : stepPosition.value === 2) && !force
+      : stepPosition.value === 2) &&
+    !force
   ) {
     storageSubmit.value++
     return false
@@ -495,7 +513,8 @@ const checkSubmit = (force = false): boolean => {
   if (
     (props.project === 'sphere'
       ? stepPosition.value === 6
-      : stepPosition.value === 5) && !force
+      : stepPosition.value === 5) &&
+    !force
   ) {
     customizeHardwareSubmit.value++
     return false

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

@@ -16,6 +16,7 @@ export interface UI_I_VmForm {
   guestOsFamily: UI_I_OptionItem | null
   guestOsVersion: UI_I_OptionItem | null
   computeResource: UI_I_TreeNode | null
+  locationPath: string
   dataCenter: UI_I_TreeNode | null
 }
 export interface UI_I_VmFormCash {

package/components/common/vm/actions/add/models/types.ts

@@ -59,5 +59,6 @@ export type UI_T_AddVmFinishFunc<T = void> = (
   virtualHardwareCdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null,
   isPowerOnByDefault: boolean,
   localization: UI_I_Localization,
-  isValidation?: boolean
+  locationPath?: string, // для сферы
+  computeResourcePath?: string // для сферы
 ) => Promise<T>

package/models/store/vm/interfaces.ts

@@ -79,6 +79,8 @@ export interface UI_I_VmSettings {
 export interface UI_I_CreateVmPayload {
   start: boolean
   pvm: UI_I_CreateVmData
+  location?: string // для сферы
+  compute_resource?: string // для сферы
 }
 
 export interface UI_I_EditVmPayload {

package/package.json

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