bfg-common 1.5.548 → 1.5.550

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

@@ -1,174 +1,156 @@
-<template>
-  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order-new
-    v-if="isNewView"
-    :boot-list="bootList"
-    :is-disabled="props.isDisabled"
-    @change-order="onChangeOrder"
-  />
-  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order-old
-    v-else
-    :boot-list="bootList"
-    :is-disabled="props.isDisabled"
-    @change-order="onChangeOrder"
-  />
-</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'
-
-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])
-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
-      }
-
-      item.order = order + 1 === event.toPosition ? (order += 2) : order++
-
-      return item
-    })
-    .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,
-          })
-        }
-      }
-    })
-
-    emits('change', [hardDisks, cdDvdDrives, networks])
-  },
-  { deep: true, immediate: true }
-)
-</script>
-
-<style scoped lang="scss">
-</style>
+<template>
+  <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order-new
+    v-if="isNewView"
+    :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_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<{
+  isDisabled: boolean
+}>()
+
+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 при изменении модели
+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)
+  },
+  { 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>

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

@@ -1,74 +1,109 @@
-<template>
-  <ui-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"
-        :disabled="props.isDisabled"
-        grab-item-key="text"
-        @drop="emits('change-order', $event)"
-        @grab="onGrab"
-      >
-        <template
-          v-for="(item, index) in props.bootList"
-          :key="index"
-          #[`leftSide${index}`]
-        >
-          <ui-checkbox
-            v-model="item.isChecked"
-            :test-id="item.testId"
-            :disabled="props.isDisabled"
-            size="md"
-          />
-        </template>
-        <template
-          v-for="(item, index) in props.bootList"
-          :key="props.bootList.length + index"
-          #[`rightSide${index}`]
-        >
-          <div :class="['device-icon', item.iconClassName]" />
-          <span class="device-name">{{ item.text }}</span>
-        </template>
-        <template #icon v-if="grabedItem">
-          <div :class="['device-icon', grabedItem.iconClassName]" />
-        </template>
-      </ui-drag-drop-list>
-    </template>
-  </ui-stack-block>
-</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_Localization } from '~/lib/models/interfaces'
-import type { UI_I_DropEvent } from '~/components/atoms/list/dragDropList/lib/config/events'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  bootList: UI_I_BootItem[]
-  isDisabled: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'change-order', value: UI_I_DropEvent): void
-}>()
-
-const grabedItem = ref<any>(null)
-const onGrab = (item: any): void => {
-  grabedItem.value = item
-}
-</script>
-
-<style scoped lang="scss">
-.device-icon {
-  width: 20px;
-  height: 20px;
-}
-.device-name {
-  margin-left: -4px;
-}
-</style>
+<template>
+  <ui-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="localBootList"
+        :disabled="props.isDisabled"
+        grab-item-key="text"
+        @drop="emits('change-order', $event)"
+        @grab="onGrab"
+      >
+        <template
+          v-for="(item, index) in localBootList"
+          :key="index"
+          #[`leftSide${index}`]
+        >
+          <ui-checkbox
+            :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 localBootList"
+          :key="props.bootList.length + index"
+          #[`rightSide${index}`]
+        >
+          <div :class="['device-icon', item.iconClassName]" />
+          <span class="device-name">{{ item.text }}</span>
+        </template>
+        <template #icon v-if="grabedItem">
+          <div :class="['device-icon', grabedItem.iconClassName]" />
+        </template>
+      </ui-drag-drop-list>
+    </template>
+  </ui-stack-block>
+</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_Localization } from '~/lib/models/interfaces'
+import type { UI_I_DropEvent } from '~/components/atoms/list/dragDropList/lib/config/events'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+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">
+.device-icon {
+  width: 20px;
+  height: 20px;
+}
+.device-name {
+  margin-left: -4px;
+}
+</style>