bfg-common 1.5.574 → 1.5.575

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

@@ -15,47 +15,67 @@
     </template>
     <template #stackChildren>
       <common-vm-actions-common-customize-hardware-vmoptions-boot-options-firmware
-        v-model:firmware="model.options.boot_options.firmware"
+        v-model:firmware="firmware"
         :error-validation-fields="props.errorValidationFields"
         :is-edit="props.isEdit"
         :is-disabled="isDisabled"
         @remove-error-by-title="emits('remove-error-by-title', $event)"
       />
-      <!--        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-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="model.options.boot_options.boot_menu"
+        v-model:boot-menu="bootMenu"
         :is-disabled="isDisabled"
       />
       <common-vm-actions-common-customize-hardware-vmoptions-boot-options-delay
-        v-model:boot-delay="model.options.boot_options.boot_delay_ms"
+        v-model:boot-delay="bootDelay"
         :is-disabled="isDisabled"
       />
       <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order
-        v-model="model"
+        :hard-disks="props.hardDisks"
+        :cd-dvd-drives="props.cdDvdDrives"
+        :networks="props.networks"
         :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 model = defineModel<UI_I_CreateVmData>({ required: true })
+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 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,29 +12,31 @@
       </template>
       <template #stackChildren>
         <common-vm-actions-common-customize-hardware-vmoptions-boot-options-firmware
-          v-model:firmware="model.options.boot_options.firmware"
+          v-model:firmware="firmware"
           :error-validation-fields="props.errorValidationFields"
           :is-edit="props.isEdit"
           :is-disabled="props.isDisabled"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
-<!--        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-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="model.options.boot_options.boot_menu"
+          v-model:boot-menu="bootMenu"
           :is-disabled="props.isDisabled"
         />
         <common-vm-actions-common-customize-hardware-vmoptions-boot-options-delay
-          v-model:boot-delay="model.options.boot_options.boot_delay_ms"
+          v-model:boot-delay="bootDelay"
           :is-disabled="props.isDisabled"
         />
         <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order
-          v-model="model"
+          :hard-disks="props.hardDisks"
+          :cd-dvd-drives="props.cdDvdDrives"
+          :networks="props.networks"
           :is-disabled="props.isDisabled"
+          @change="emits('change-boot-order', $event)"
         />
       </template>
     </atoms-stack-block>
@@ -43,15 +45,25 @@
 
 <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 model = defineModel<UI_I_CreateVmData>({ required: true })
+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 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
@@ -61,6 +73,15 @@ 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/delay/Delay.vue

@@ -1,32 +1,32 @@
-<template>
-  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-delay-new
-    v-if="isNewView"
-    v-model:boot-delay="bootDelay"
-    :boot-delay-options="bootDelayOptions"
-    :is-disabled="props.isDisabled"
-  />
-  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-delay-old
-    v-else
-    v-model:boot-delay="bootDelay"
-    :boot-delay-options="bootDelayOptions"
-    :is-disabled="props.isDisabled"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import { bootDelayOptionsConfig } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/delay/lib/config/config'
-
-const bootDelay = defineModel<number>('bootDelay', { required: true })
-
-const props = defineProps<{
-  isDisabled: boolean
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const bootDelayOptions = ref<UI_I_OptionItem[]>(bootDelayOptionsConfig)
-</script>
-
-<style scoped></style>
+<template>
+  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-delay-new
+    v-if="isNewView"
+    v-model:boot-delay="bootDelay"
+    :boot-delay-options="bootDelayOptions"
+    :is-disabled="props.isDisabled"
+  />
+  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-delay-old
+    v-else
+    v-model:boot-delay="bootDelay"
+    :boot-delay-options="bootDelayOptions"
+    :is-disabled="props.isDisabled"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import { bootDelayOptionsConfig } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/delay/lib/config/config'
+
+const bootDelay = defineModel<number>('bootDelay', { required: true })
+
+const props = defineProps<{
+  isDisabled: boolean
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const bootDelayOptions = ref<UI_I_OptionItem[]>(bootDelayOptionsConfig)
+</script>
+
+<style scoped></style>

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/firmware/Firmware.vue

@@ -1,60 +1,60 @@
-<template>
-  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-firmware-new
-    v-if="isNewView"
-    v-model:firmware="firmware"
-    :firmware-options="firmwareOptions"
-    :error-text="apiError"
-    :is-disabled="isDisabled"
-    @remove-error="onRemoveValidationError"
-  />
-  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-firmware-old
-    v-else
-    v-model:firmware="firmware"
-    :firmware-options="firmwareOptions"
-    :error-text="apiError"
-    :is-disabled="isDisabled"
-    @remove-error="onRemoveValidationError"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import { firmwareOptionsFunc } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/firmware/lib/config/config'
-
-const firmware = defineModel<string>('firmware', { required: true })
-
-const props = defineProps<{
-  errorValidationFields: UI_I_ErrorValidationField[]
-  isEdit: boolean
-  isDisabled: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const firmwareOptions = ref<UI_I_OptionItem[]>(
-  firmwareOptionsFunc(localization.value)
-)
-
-const typeError = 'options.boot_options.firmware'
-
-const apiError = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find((message) => message.field === typeError)
-      ?.error_message || ''
-  )
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', typeError)
-}
-</script>
-
-<style scoped></style>
+<template>
+  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-firmware-new
+    v-if="isNewView"
+    v-model:firmware="firmware"
+    :firmware-options="firmwareOptions"
+    :error-text="apiError"
+    :is-disabled="isDisabled"
+    @remove-error="onRemoveValidationError"
+  />
+  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-firmware-old
+    v-else
+    v-model:firmware="firmware"
+    :firmware-options="firmwareOptions"
+    :error-text="apiError"
+    :is-disabled="isDisabled"
+    @remove-error="onRemoveValidationError"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import { firmwareOptionsFunc } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/firmware/lib/config/config'
+
+const firmware = defineModel<string>('firmware', { required: true })
+
+const props = defineProps<{
+  errorValidationFields: UI_I_ErrorValidationField[]
+  isEdit: boolean
+  isDisabled: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const firmwareOptions = ref<UI_I_OptionItem[]>(
+  firmwareOptionsFunc(localization.value)
+)
+
+const typeError = 'options.boot_options.firmware'
+
+const apiError = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find((message) => message.field === typeError)
+      ?.error_message || ''
+  )
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', typeError)
+}
+</script>
+
+<style scoped></style>

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

@@ -4,153 +4,171 @@
     :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[]>([])
 
-// Используем 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 при изменении модели
+const hardDisksAndNetworks = computed<
+  [
+    UI_I_SendDataNewHardDisk[] | null,
+    UI_I_SendDataNewCdDvdDrive[] | null,
+    UI_I_SendDataNewNetwork[] | null
+  ]
+>(() => [props.hardDisks, props.cdDvdDrives, props.networks])
 watch(
   hardDisksAndNetworks,
-  ([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}`,
-      }
-    })
-
-    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}`,
-      }
-    })
-
-    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}`,
-      }
-    })
-
-    bootList.value = [...hardDiskItems, ...cdDvdDriveItems, ...networkItems]
-      .filter((item) => item.order >= 0)
-      .sort((a, b) => a.order - b.order)
+  (
+    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 }
 )
 
-// Обработчик изменения порядка через 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
-  })
+  let order = -1
+  bootList.value = bootList.value
+    .map((item) => {
+      if (item === event.target) {
+        item.order = event.toPosition
+        return item
+      }
 
-  bootList.value = updatedList
-  updateModelFromBootList(updatedList)
-}
+      item.order = order + 1 === event.toPosition ? (order += 2) : order++
 
-// Обработчик обновления bootList (при изменении чекбоксов)
-const onBootListUpdate = (updatedBootList: UI_I_BootItem[]): void => {
-  bootList.value = updatedBootList
-  updateModelFromBootList(updatedBootList)
+      return item
+    })
+    .sort((a, b) => a.order - b.order)
 }
 
-// Функция для обновления модели на основе 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++
+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,
+          })
+        }
       }
-    }
-  })
-}
+    })
+
+    emits('change', [hardDisks, cdDvdDrives, networks])
+  },
+  { deep: true, immediate: true }
+)
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+</style>