bfg-common 1.1.62 → 1.1.64

package/components/common/vm/actions/add/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDrive.vue

@@ -209,7 +209,7 @@ watch(
       io: 'native',
       limit_iops: 0,
       discard: 'unmap',
-      boot_order: -1,
+      boot_order: props.cdDvdDrive.boot_order,
       detach: props.type === 'removed',
       remove: props.type === 'removed' && deleteFilesFromDatastore.value, // Проверяем если удалили диск и указали Delete files from datastore
     })

package/components/common/vm/actions/add/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue

@@ -382,7 +382,7 @@ watch(
       limit_iops: limitIopsLocal,
       discard: discard.value,
       capacity: sizeInMb.value,
-      boot_order: -1,
+      boot_order: props.hardDisk.boot_order,
       detach: props.type === 'removed',
       remove: props.type === 'removed' && deleteFilesFromDatastore.value, // Проверяем если удалили диск и указали Delete files from datastore
     })

package/components/common/vm/actions/add/customizeHardware/virtualHardware/newNetwork/NewNetwork.vue

@@ -208,7 +208,7 @@ watch(
       target: '',
       model: adapterType.value,
       mac: macAddress.value,
-      boot_order: -1,
+      boot_order: props.network.boot_order,
     })
   },
   { immediate: true }

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

@@ -1,195 +1,203 @@
-<template>
-  <div class="boot-orders">
-    <atoms-stack-block :has-children="false">
-      <template #stackBlockKey>
-        {{ localization.bootOrder }}
-      </template>
-      <template #stackBlockContent>
-        <atoms-list-drag-drop-list
-          :items="bootList"
-          grab-item-key="text"
-          @drop="onChangeOrder"
-        >
-          <template
-            v-for="(item, index) in bootList"
-            :key="index"
-            #[`leftSide${index}`]
-          >
-            <input
-              v-model="item.isChecked"
-              :id="`boot-order-${index}`"
-              type="checkbox"
-            />
-          </template>
-          <template
-            v-for="(item, index) in bootList"
-            :key="index + 5"
-            #[`rightSide${index}`]
-          >
-            <div :class="['device-icon', item.iconClassName]" />
-            <span>{{ item.text }}</span>
-          </template>
-        </atoms-list-drag-drop-list>
-      </template>
-    </atoms-stack-block>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_BootItem } from '~/components/common/vm/actions/add/customizeHardware/vmoptions/bootOptions/order/models/interfaces'
-import {
-  UI_I_SendDataNewCdDvdDrive,
-  UI_I_SendDataNewHardDisk,
-  UI_I_SendDataNewNetwork,
-} from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
-import { UI_I_Localization } from '~/models/interfaces'
-import { UI_I_DropEvent } from '~/components/atoms/list/dragDropList/config/events'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  hardDisks: UI_I_SendDataNewHardDisk[] | null
-  cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
-  networks: UI_I_SendDataNewNetwork[] | null
-}>()
-const emits = defineEmits<{
-  (
-    event: 'change',
-    value: [
-      UI_I_SendDataNewHardDisk[],
-      UI_I_SendDataNewCdDvdDrive[],
-      UI_I_SendDataNewNetwork[]
-    ]
-  ): void
-}>()
-
-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) => {
-        return {
-          isChecked: true,
-          order: item.boot_order || 0,
-          text: `disk${index}`,
-          iconClassName: 'icon-disk',
-          type: 'disk',
-          name: item.source + index,
-        }
-      }) || []
-    const cdDvdDrives: UI_I_BootItem[] =
-      newValue[1]?.map((item, index) => {
-        return {
-          isChecked: true,
-          order: item.boot_order || 0,
-          text: `cdrom${index}`,
-          iconClassName: 'icon-disk',
-          type: 'cdDvd',
-          name: item.source + index,
-        }
-      }) || []
-    const networks: UI_I_BootItem[] =
-      newValue[2]?.map((item, index) => {
-        return {
-          isChecked: true,
-          order: item.boot_order || 0,
-          text: `nic${index}`,
-          iconClassName: 'vsphere-icon-network',
-          type: 'nic',
-          name: item.network + index,
-        }
-      }) || []
-
-    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 boots = newValue.filter((item) => item.isChecked).map((item) => item)
-
-    const networks: UI_I_SendDataNewNetwork[] = []
-    const hardDisks: UI_I_SendDataNewHardDisk[] = []
-    const cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] = []
-    boots.forEach((boot, index) => {
-      if (boot.type === 'nic') {
-        const network = props.networks?.find(
-          (network, index2) => network.network + index2 === boot.name
-        )
-        if (network) {
-          networks.push({
-            ...network,
-            boot_order: index + 1,
-          })
-        }
-      } else if (boot.type === 'disk') {
-        const hardDisk = props.hardDisks?.find(
-          (hardDisk, index2) => hardDisk.source + index2 === boot.name
-        )
-        if (hardDisk) {
-          hardDisks.push({
-            ...hardDisk,
-            boot_order: index + 1,
-          })
-        }
-      } else {
-        const cdDvdDrive = props.cdDvdDrives?.find(
-          (cdDvdDrive, index2) => cdDvdDrive.source + index2 === boot.name
-        )
-        if (cdDvdDrive) {
-          cdDvdDrives.push({
-            ...cdDvdDrive,
-            boot_order: index + 1,
-          })
-        }
-      }
-    })
-
-    emits('change', [hardDisks, cdDvdDrives, networks])
-  },
-  { deep: true, immediate: true }
-)
-</script>
-
-<style scoped lang="scss">
-.boot-orders {
-  .device-icon {
-    margin-right: 6px;
-  }
-}
-</style>
+<template>
+  <div class="boot-orders">
+    <atoms-stack-block :has-children="false">
+      <template #stackBlockKey>
+        {{ localization.bootOrder }}
+      </template>
+      <template #stackBlockContent>
+        <atoms-list-drag-drop-list
+          :items="bootList"
+          grab-item-key="text"
+          @drop="onChangeOrder"
+        >
+          <template
+            v-for="(item, index) in bootList"
+            :key="index"
+            #[`leftSide${index}`]
+          >
+            <input
+              v-model="item.isChecked"
+              :id="`boot-order-${index}`"
+              type="checkbox"
+            />
+          </template>
+          <template
+            v-for="(item, index) in bootList"
+            :key="index + 5"
+            #[`rightSide${index}`]
+          >
+            <div :class="['device-icon', item.iconClassName]" />
+            <span>{{ item.text }}</span>
+          </template>
+        </atoms-list-drag-drop-list>
+      </template>
+    </atoms-stack-block>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_BootItem } from '~/components/common/vm/actions/add/customizeHardware/vmoptions/bootOptions/order/models/interfaces'
+import {
+  UI_I_SendDataNewCdDvdDrive,
+  UI_I_SendDataNewHardDisk,
+  UI_I_SendDataNewNetwork,
+} from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
+import { UI_I_Localization } from '~/models/interfaces'
+import { UI_I_DropEvent } from '~/components/atoms/list/dragDropList/config/events'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const props = defineProps<{
+  hardDisks: UI_I_SendDataNewHardDisk[] | null
+  cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
+  networks: UI_I_SendDataNewNetwork[] | null
+}>()
+const emits = defineEmits<{
+  (
+    event: 'change',
+    value: [
+      UI_I_SendDataNewHardDisk[],
+      UI_I_SendDataNewCdDvdDrive[],
+      UI_I_SendDataNewNetwork[]
+    ]
+  ): void
+}>()
+
+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,
+        }
+      }) || []
+    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,
+        }
+      }) || []
+    const networks: UI_I_BootItem[] =
+      newValue[2]?.map((item, index) => {
+        const order = item.boot_order || 0
+        return {
+          order,
+          isChecked: !!order,
+          text: `nic${index} ${item.mac || undefined} mac`,
+          iconClassName: 'vsphere-icon-network',
+          type: 'nic',
+          name: item.network + index,
+        }
+      }) || []
+
+    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 boots = newValue.filter((item) => item.isChecked).map((item) => item)
+    // const boots = newValue.map((item) => {
+    //   if (!item.isChecked) item.boot_order = 0
+    //   return item
+    // })
+
+    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">
+.boot-orders {
+  .device-icon {
+    margin-right: 6px;
+  }
+}
+</style>

package/package.json

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