bfg-common 1.5.556 → 1.5.558

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptions.vue

@@ -1,70 +1,39 @@
 <template>
   <common-vm-actions-common-customize-hardware-vmoptions-boot-options-new
     v-if="isNewView"
-    v-model:firmware="firmware"
-    v-model:secure-boot="secureBoot"
-    v-model:boot-menu="bootMenu"
-    v-model:boot-delay="bootDelay"
+    v-model="model"
     :error-validation-fields="props.errorValidationFields"
-    :hard-disks="props.hardDisks"
-    :cd-dvd-drives="props.cdDvdDrives"
-    :networks="props.networks"
     :is-edit="props.isEdit"
     :is-disabled="isDisabled"
-    @change-boot-order="emits('change-boot-order', $event)"
     @remove-error-by-title="emits('remove-error-by-title', $event)"
   />
   <common-vm-actions-common-customize-hardware-vmoptions-boot-options-old
     v-else
-    v-model:firmware="firmware"
-    v-model:secure-boot="secureBoot"
-    v-model:boot-menu="bootMenu"
-    v-model:boot-delay="bootDelay"
+    v-model="model"
     :error-validation-fields="props.errorValidationFields"
-    :hard-disks="props.hardDisks"
-    :cd-dvd-drives="props.cdDvdDrives"
-    :networks="props.networks"
     :is-edit="props.isEdit"
     :is-disabled="isDisabled"
-    @change-boot-order="emits('change-boot-order', $event)"
     @remove-error-by-title="emits('remove-error-by-title', $event)"
   />
 </template>
 
 <script setup lang="ts">
-import type { UI_I_SendDataBootOptions } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
-import type {
-  UI_I_SendDataNewCdDvdDrive,
-  UI_I_SendDataNewHardDisk,
-  UI_I_SendDataNewNetwork,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateVmData>({ required: true })
 
 const props = withDefaults(
   defineProps<{
     errorValidationFields: UI_I_ErrorValidationField[]
-    hardDisks: UI_I_SendDataNewHardDisk[] | null
-    cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
-    networks: UI_I_SendDataNewNetwork[] | null
     isEdit: boolean
-    bootOptions?: UI_I_SendDataBootOptions
     state?: string | number
   }>(),
   {
-    bootOptions: undefined,
     state: undefined,
   }
 )
 const emits = defineEmits<{
-  (
-    event: 'change-boot-order',
-    value: [
-      UI_I_SendDataNewHardDisk[],
-      UI_I_SendDataNewCdDvdDrive[],
-      UI_I_SendDataNewNetwork[]
-    ]
-  ): void
-  (event: 'send-data', value: UI_I_SendDataBootOptions): void
   (event: 'remove-error-by-title', value: string): void
 }>()
 
@@ -72,39 +41,6 @@ const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const isDisabled = computed<boolean>(() => props.isEdit && props.state !== 1)
-
-const firmware = ref<string>('efi')
-
-const secureBoot = ref<boolean>(true)
-
-const bootMenu = ref<boolean>(true)
-
-const bootDelay = ref<number>(1000)
-
-watch(
-  [firmware, secureBoot, bootMenu, bootDelay],
-  () => {
-    emits('send-data', {
-      firmware: firmware.value,
-      boot_delay_ms: bootDelay.value,
-      boot_menu: bootMenu.value,
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.bootOptions,
-  (newValue) => {
-    if (!newValue || !props.bootOptions) return
-
-    firmware.value = props.bootOptions.firmware
-    bootDelay.value = props.bootOptions.boot_delay_ms
-    bootMenu.value = props.bootOptions.boot_menu
-  },
-  { immediate: true }
-)
 </script>
 
 <style scoped lang="scss"></style>

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptionsNew.vue

@@ -15,67 +15,47 @@
     </template>
     <template #stackChildren>
       <common-vm-actions-common-customize-hardware-vmoptions-boot-options-firmware
-        v-model:firmware="firmware"
+        v-model:firmware="model.options.boot_options.firmware"
         :error-validation-fields="props.errorValidationFields"
         :is-edit="props.isEdit"
         :is-disabled="isDisabled"
         @remove-error-by-title="emits('remove-error-by-title', $event)"
       />
-      <common-vm-actions-common-customize-hardware-vmoptions-boot-options-secure
-        v-if="firmware === 'uefi'"
-        v-model:secure-boot="secureBoot"
-        :is-disabled="isDisabled"
-      />
+      <!--        TODO 700-->
+<!--      <common-vm-actions-common-customize-hardware-vmoptions-boot-options-secure-->
+<!--        v-if="firmware === 'uefi'"-->
+<!--        v-model:secure-boot="secureBoot"-->
+<!--        :is-disabled="isDisabled"-->
+<!--      />-->
       <common-vm-actions-common-customize-hardware-vmoptions-boot-options-menu
-        v-model:boot-menu="bootMenu"
+        v-model:boot-menu="model.options.boot_options.boot_menu"
         :is-disabled="isDisabled"
       />
       <common-vm-actions-common-customize-hardware-vmoptions-boot-options-delay
-        v-model:boot-delay="bootDelay"
+        v-model:boot-delay="model.options.boot_options.boot_delay_ms"
         :is-disabled="isDisabled"
       />
       <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order
-        :hard-disks="props.hardDisks"
-        :cd-dvd-drives="props.cdDvdDrives"
-        :networks="props.networks"
+        v-model="model"
         :is-disabled="isDisabled"
-        @change="emits('change-boot-order', $event)"
       />
     </template>
   </ui-stack-block>
 </template>
 
 <script setup lang="ts">
-import type {
-  UI_I_SendDataNewCdDvdDrive,
-  UI_I_SendDataNewHardDisk,
-  UI_I_SendDataNewNetwork,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 
-const firmware = defineModel<string>('firmware', { required: true })
-const secureBoot = defineModel<boolean>('secureBoot', { required: true })
-const bootMenu = defineModel<boolean>('bootMenu', { required: true })
-const bootDelay = defineModel<number>('bootDelay', { required: true })
+const model = defineModel<UI_I_CreateVmData>({ required: true })
 
 const props = defineProps<{
   errorValidationFields: UI_I_ErrorValidationField[]
-  hardDisks: UI_I_SendDataNewHardDisk[] | null
-  cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
-  networks: UI_I_SendDataNewNetwork[] | null
   isEdit: boolean
   isDisabled: boolean
 }>()
 const emits = defineEmits<{
-  (
-    event: 'change-boot-order',
-    value: [
-      UI_I_SendDataNewHardDisk[],
-      UI_I_SendDataNewCdDvdDrive[],
-      UI_I_SendDataNewNetwork[]
-    ]
-  ): void
   (event: 'remove-error-by-title', value: string): void
 }>()
 

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptionsOld.vue

@@ -12,31 +12,29 @@
       </template>
       <template #stackChildren>
         <common-vm-actions-common-customize-hardware-vmoptions-boot-options-firmware
-          v-model:firmware="firmware"
+          v-model:firmware="model.options.boot_options.firmware"
           :error-validation-fields="props.errorValidationFields"
           :is-edit="props.isEdit"
           :is-disabled="props.isDisabled"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
-        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-secure
-          v-if="firmware === 'uefi'"
-          v-model:secure-boot="secureBoot"
-          :is-disabled="props.isDisabled"
-        />
+<!--        TODO 700-->
+<!--        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-secure-->
+<!--          v-if="firmware === 'uefi'"-->
+<!--          v-model:secure-boot="secureBoot"-->
+<!--          :is-disabled="props.isDisabled"-->
+<!--        />-->
         <common-vm-actions-common-customize-hardware-vmoptions-boot-options-menu
-          v-model:boot-menu="bootMenu"
+          v-model:boot-menu="model.options.boot_options.boot_menu"
           :is-disabled="props.isDisabled"
         />
         <common-vm-actions-common-customize-hardware-vmoptions-boot-options-delay
-          v-model:boot-delay="bootDelay"
+          v-model:boot-delay="model.options.boot_options.boot_delay_ms"
           :is-disabled="props.isDisabled"
         />
         <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order
-          :hard-disks="props.hardDisks"
-          :cd-dvd-drives="props.cdDvdDrives"
-          :networks="props.networks"
+          v-model="model"
           :is-disabled="props.isDisabled"
-          @change="emits('change-boot-order', $event)"
         />
       </template>
     </atoms-stack-block>
@@ -45,25 +43,15 @@
 
 <script setup lang="ts">
 import type { UI_I_SendDataBootOptions } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
-import type {
-  UI_I_SendDataNewCdDvdDrive,
-  UI_I_SendDataNewHardDisk,
-  UI_I_SendDataNewNetwork,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 
-const firmware = defineModel<string>('firmware', { required: true })
-const secureBoot = defineModel<boolean>('secureBoot', { required: true })
-const bootMenu = defineModel<boolean>('bootMenu', { required: true })
-const bootDelay = defineModel<number>('bootDelay', { required: true })
+const model = defineModel<UI_I_CreateVmData>({ required: true })
 
 const props = withDefaults(
   defineProps<{
     errorValidationFields: UI_I_ErrorValidationField[]
-    hardDisks: UI_I_SendDataNewHardDisk[] | null
-    cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
-    networks: UI_I_SendDataNewNetwork[] | null
     isEdit: boolean
     isDisabled: boolean
     bootOptions?: UI_I_SendDataBootOptions
@@ -73,15 +61,6 @@ const props = withDefaults(
   }
 )
 const emits = defineEmits<{
-  (
-    event: 'change-boot-order',
-    value: [
-      UI_I_SendDataNewHardDisk[],
-      UI_I_SendDataNewCdDvdDrive[],
-      UI_I_SendDataNewNetwork[]
-    ]
-  ): void
-  (event: 'send-data', value: UI_I_SendDataBootOptions): void
   (event: 'remove-error-by-title', value: string): void
 }>()
 

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/Order.vue

@@ -4,171 +4,153 @@
     :boot-list="bootList"
     :is-disabled="props.isDisabled"
     @change-order="onChangeOrder"
+    @update:boot-list="onBootListUpdate"
   />
   <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order-old
     v-else
     :boot-list="bootList"
     :is-disabled="props.isDisabled"
     @change-order="onChangeOrder"
+    @update:boot-list="onBootListUpdate"
   />
 </template>
 
 <script setup lang="ts">
 import type { UI_I_BootItem } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/lib/models/interfaces'
-import type {
-  UI_I_SendDataNewCdDvdDrive,
-  UI_I_SendDataNewHardDisk,
-  UI_I_SendDataNewNetwork,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_I_DropEvent } from '~/components/atoms/list/dragDropList/lib/config/events'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateVmData>({ required: true })
 
 const props = defineProps<{
-  hardDisks: UI_I_SendDataNewHardDisk[] | null
-  cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
-  networks: UI_I_SendDataNewNetwork[] | null
   isDisabled: boolean
 }>()
-const emits = defineEmits<{
-  (
-    event: 'change',
-    value: [
-      UI_I_SendDataNewHardDisk[],
-      UI_I_SendDataNewCdDvdDrive[],
-      UI_I_SendDataNewNetwork[]
-    ]
-  ): void
-}>()
 
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const bootList = ref<UI_I_BootItem[]>([])
 
-const hardDisksAndNetworks = computed<
-  [
-    UI_I_SendDataNewHardDisk[] | null,
-    UI_I_SendDataNewCdDvdDrive[] | null,
-    UI_I_SendDataNewNetwork[] | null
-  ]
->(() => [props.hardDisks, props.cdDvdDrives, props.networks])
+// Используем computed для автоматического обновления bootList при изменении модели
+const hardDisksAndNetworks = computed(() => [
+  model.value.disk_devices?.filter((disk) => disk.device_type !== 'cdrom') ||
+    [],
+  model.value.disk_devices?.filter((disk) => disk.device_type === 'cdrom') ||
+    [],
+  model.value.network_devices || [],
+])
+
+// Watcher для обновления bootList при изменении модели
 watch(
   hardDisksAndNetworks,
-  (
-    newValue: [
-      UI_I_SendDataNewHardDisk[] | null,
-      UI_I_SendDataNewCdDvdDrive[] | null,
-      UI_I_SendDataNewNetwork[] | null
-    ]
-  ) => {
-    const hardDisks: UI_I_BootItem[] =
-      newValue[0]?.map((item, index) => {
-        const order = item.boot_order || 0
-        return {
-          order,
-          isChecked: !!order,
-          text: `disk${index}`,
-          iconClassName: 'icon-disk',
-          type: 'disk',
-          name: item.source + index,
-          testId: `select-disk-value-${index + 1}`,
-        }
-      }) || []
-    const cdDvdDrives: UI_I_BootItem[] =
-      newValue[1]?.map((item, index) => {
-        const order = item.boot_order || 0
-        return {
-          order,
-          isChecked: !!order,
-          text: `cdrom${index}`,
-          iconClassName: 'icon-disk',
-          type: 'cdDvd',
-          name: item.source + index,
-          testId: `select-cd-dvd-value-${index + 1}`,
-        }
-      }) || []
-    const networks: UI_I_BootItem[] =
-      newValue[2]?.map((item, index) => {
-        const order = item.boot_order || 0
-        return {
-          order,
-          isChecked: !!order,
-          text: item.mac || 'undefined',
-          iconClassName: 'vsphere-icon-network',
-          type: 'nic',
-          name: item.network + index,
-          testId: `select-nic-value-${index + 1}`,
-        }
-      }) || []
-
-    bootList.value = [...hardDisks, ...cdDvdDrives, ...networks].sort(
-      (a, b) => a.order - b.order
-    )
-  },
-  { deep: true, immediate: true }
-)
-
-const onChangeOrder = (event: UI_I_DropEvent): void => {
-  let order = -1
-  bootList.value = bootList.value
-    .map((item) => {
-      if (item === event.target) {
-        item.order = event.toPosition
-        return item
+  ([hardDisks, cdDvdDrives, networks]) => {
+    const hardDiskItems: UI_I_BootItem[] = hardDisks.map((item, index) => {
+      const order = item.boot_order || 0
+      return {
+        order,
+        isChecked: !!order,
+        text: `disk${index}`,
+        iconClassName: 'icon-disk',
+        type: 'disk' as const,
+        name: `${item.source}_${index}`,
+        testId: `select-disk-value-${index + 1}`,
       }
+    })
 
-      item.order = order + 1 === event.toPosition ? (order += 2) : order++
-
-      return item
+    const cdDvdDriveItems: UI_I_BootItem[] = cdDvdDrives.map((item, index) => {
+      const order = item.boot_order || 0
+      return {
+        order,
+        isChecked: !!order,
+        text: `cdrom${index}`,
+        iconClassName: 'icon-disk',
+        type: 'cdDvd' as const,
+        name: `${item.source}_${hardDisks.length + index}`,
+        testId: `select-cd-dvd-value-${index + 1}`,
+      }
     })
-    .sort((a, b) => a.order - b.order)
-}
 
-watch(
-  bootList,
-  (newValue) => {
-    const networks: UI_I_SendDataNewNetwork[] = []
-    const hardDisks: UI_I_SendDataNewHardDisk[] = []
-    const cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] = []
-    let index = 0
-    newValue.forEach((boot) => {
-      if (boot.type === 'nic') {
-        const network = props.networks?.find(
-          (network, index2) => network.network + index2 === boot.name
-        )
-        if (network) {
-          networks.push({
-            ...network,
-            boot_order: boot.isChecked ? ++index : 0,
-          })
-        }
-      } else if (boot.type === 'disk') {
-        const hardDisk = props.hardDisks?.find(
-          (hardDisk, index2) => hardDisk.source + index2 === boot.name
-        )
-        if (hardDisk) {
-          hardDisks.push({
-            ...hardDisk,
-            boot_order: boot.isChecked ? ++index : 0,
-          })
-        }
-      } else {
-        const cdDvdDrive = props.cdDvdDrives?.find(
-          (cdDvdDrive, index2) => cdDvdDrive.source + index2 === boot.name
-        )
-        if (cdDvdDrive) {
-          cdDvdDrives.push({
-            ...cdDvdDrive,
-            boot_order: boot.isChecked ? ++index : 0,
-          })
-        }
+    const networkItems: UI_I_BootItem[] = networks.map((item, index) => {
+      const order = item.boot_order || 0
+      return {
+        order,
+        isChecked: !!order,
+        text: item.mac || 'undefined',
+        iconClassName: 'vsphere-icon-network',
+        type: 'nic' as const,
+        name: `${item.network}_${index}`,
+        testId: `select-nic-value-${index + 1}`,
       }
     })
 
-    emits('change', [hardDisks, cdDvdDrives, networks])
+    bootList.value = [...hardDiskItems, ...cdDvdDriveItems, ...networkItems]
+      .filter((item) => item.order >= 0)
+      .sort((a, b) => a.order - b.order)
   },
   { deep: true, immediate: true }
 )
+
+// Обработчик изменения порядка через drag & drop
+const onChangeOrder = (event: UI_I_DropEvent): void => {
+  const updatedList = [...bootList.value]
+  const movedItem = updatedList.find((item) => item.name === event.target.name)
+
+  if (!movedItem) return
+
+  // Удаляем элемент из текущей позиции
+  const fromIndex = updatedList.indexOf(movedItem)
+  updatedList.splice(fromIndex, 1)
+
+  // Вставляем элемент в новую позицию
+  updatedList.splice(event.toPosition, 0, movedItem)
+
+  // Обновляем порядок всех элементов
+  updatedList.forEach((item, index) => {
+    item.order = index + 1
+  })
+
+  bootList.value = updatedList
+  updateModelFromBootList(updatedList)
+}
+
+// Обработчик обновления bootList (при изменении чекбоксов)
+const onBootListUpdate = (updatedBootList: UI_I_BootItem[]): void => {
+  bootList.value = updatedBootList
+  updateModelFromBootList(updatedBootList)
+}
+
+// Функция для обновления модели на основе bootList
+const updateModelFromBootList = (bootItems: UI_I_BootItem[]): void => {
+  // Сначала сбрасываем все boot_order
+  model.value.disk_devices?.forEach((disk) => {
+    disk.boot_order = 0
+  })
+  model.value.network_devices?.forEach((network) => {
+    network.boot_order = 0
+  })
+
+  // Затем устанавливаем boot_order только для выбранных элементов
+  let currentOrder = 1
+  bootItems.forEach((bootItem) => {
+    if (!bootItem.isChecked) return
+
+    if (bootItem.type === 'nic') {
+      const [networkName, indexStr] = bootItem.name.split('_')
+      const index = parseInt(indexStr, 10)
+      const network = model.value.network_devices?.[index]
+      if (network && network.network === networkName) {
+        network.boot_order = currentOrder++
+      }
+    } else {
+      const [source, indexStr] = bootItem.name.split('_')
+      const index = parseInt(indexStr, 10)
+      const disk = model.value.disk_devices?.[index]
+      if (disk && disk.source === source) {
+        disk.boot_order = currentOrder++
+      }
+    }
+  })
+}
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/OrderNew.vue

@@ -1,33 +1,34 @@
 <template>
   <ui-stack-block
-      :has-children="false"
-      test-id="boot-options-order-stack-block"
+    :has-children="false"
+    test-id="boot-options-order-stack-block"
   >
     <template #stackBlockKey>
       {{ localization.common.bootOrder }}
     </template>
     <template #stackBlockContent>
       <ui-drag-drop-list
-        :items="props.bootList"
+        :items="localBootList"
         :disabled="props.isDisabled"
         grab-item-key="text"
         @drop="emits('change-order', $event)"
         @grab="onGrab"
       >
         <template
-          v-for="(item, index) in props.bootList"
+          v-for="(item, index) in localBootList"
           :key="index"
           #[`leftSide${index}`]
         >
           <ui-checkbox
-            v-model="item.isChecked"
+            :model-value="item.isChecked"
             :test-id="item.testId"
             :disabled="props.isDisabled"
             size="md"
+            @update:model-value="onCheckboxChange(index, $event)"
           />
         </template>
         <template
-          v-for="(item, index) in props.bootList"
+          v-for="(item, index) in localBootList"
           :key="props.bootList.length + index"
           #[`rightSide${index}`]
         >
@@ -53,14 +54,48 @@ const props = defineProps<{
   bootList: UI_I_BootItem[]
   isDisabled: boolean
 }>()
+
 const emits = defineEmits<{
   (event: 'change-order', value: UI_I_DropEvent): void
+  (event: 'update:boot-list', value: UI_I_BootItem[]): void
 }>()
 
 const grabedItem = ref<any>(null)
+const localBootList = ref<UI_I_BootItem[]>([])
+
+// Синхронизируем с props
+watch(
+  () => props.bootList,
+  (newBootList) => {
+    localBootList.value = newBootList.map((item) => ({ ...item }))
+  },
+  { deep: true, immediate: true }
+)
+
 const onGrab = (item: any): void => {
   grabedItem.value = item
 }
+
+// Обработчик изменения чекбокса
+const onCheckboxChange = (index: number, isChecked: boolean): void => {
+  localBootList.value[index].isChecked = isChecked
+
+  // Сохраняем порядок при изменении чекбокса
+  let currentOrder = 1
+  localBootList.value.forEach((item) => {
+    if (item.isChecked) {
+      item.order = currentOrder++
+    } else {
+      item.order = 0
+    }
+  })
+
+  // Сортируем список
+  localBootList.value.sort((a, b) => a.order - b.order)
+
+  // Отправляем обновленный список родителю
+  emits('update:boot-list', localBootList.value)
+}
 </script>
 
 <style scoped lang="scss">