bfg-common 1.5.572 → 1.5.574

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

@@ -1,9 +1,9 @@
 <template>
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-network-new
     v-if="isNewView"
-    v-model:selected-location="selectedLocation"
-    v-model:adapter-type="adapterType"
-    v-model:mac-address="macAddress"
+    v-model:selected-location="networkValue"
+    v-model:adapter-type="model"
+    v-model:mac-address="mac"
     v-model:mac-address-type="macAddressType"
     v-model:new-network-invalid="newNetworkInvalid"
     :index="props.index"
@@ -26,9 +26,9 @@
   />
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-network-old
     v-else
-    v-model:selected-location="selectedLocation"
-    v-model:adapter-type="adapterType"
-    v-model:mac-address="macAddress"
+    v-model:selected-location="networkValue"
+    v-model:adapter-type="model"
+    v-model:mac-address="mac"
     v-model:mac-address-type="macAddressType"
     v-model:new-network-invalid="newNetworkInvalid"
     :index="props.index"
@@ -56,23 +56,38 @@ import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_SendDataNewNetwork } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_T_NetworkType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
 import type {
   UI_I_Localization,
   UI_I_HTMLSelectElement,
 } from '~/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
+
+const network = defineModel<UI_I_CreateVmData['network_devices'][0]['network']>(
+  'network',
+  { required: true }
+)
+
+const mac = defineModel<UI_I_CreateVmData['network_devices'][0]['mac']>('mac', {
+  required: true,
+})
+const model = defineModel<UI_I_CreateVmData['network_devices'][0]['model']>(
+  'model',
+  {
+    required: true,
+  }
+)
 
 const props = withDefaults(
   defineProps<{
     project: UI_T_Project
     index: number
     type: UI_T_NetworkType
-    network: UI_I_SendDataNewNetwork
     networksTable: UI_I_NetworkTableItem[]
     errorValidationFields: UI_I_ErrorValidationField[]
     isEdit: boolean
+    networkValueProp: 'network' | 'net_bridge'
     state?: string | number
   }>(),
   {
@@ -80,18 +95,27 @@ const props = withDefaults(
   }
 )
 const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataNewNetwork): void
   (event: 'invalid', value: boolean): void
   (event: 'remove'): void
   (event: 'remove-error-by-title', value: string): void
   (event: 'get-networks-table', value: UI_I_TablePayload): void
 }>()
 
+const networkValue = defineModel<
+    UI_I_CreateVmData['network_devices'][0][props.networkValueProp]
+>('networkValue', { required: true })
+watch(networkValue, (newValue) => {
+  const selectedOption = locationOptions.value.find(
+      (option) => option.value === newValue
+  )
+  if (selectedOption) {
+    network.value = selectedOption.text
+  }
+})
+
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const valueProp = props.project === 'sphere' ? 'network' : 'net_bridge'
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const isRunning = computed<boolean>(() => {
@@ -102,7 +126,7 @@ const isRemovable = computed<boolean>(() => {
   return (
     !props.isEdit ||
     !isRunning.value ||
-    (isRunning.value && adapterType.value === 'virtio')
+    (isRunning.value && model.value === 'virtio')
   )
 })
 
@@ -118,9 +142,15 @@ const label = computed<string>(() => {
 // }
 
 const selectedLocationOld = ref<string>('')
-const selectedLocation = ref<string>('')
 const locationOptions = ref<UI_I_OptionItem[]>([])
 
+if (networkValue.value) {
+  locationOptions.value = [
+    { text: network.value, value: networkValue.value },
+    { text: `${localization.value.common.browse}...`, value: '' },
+  ]
+}
+
 const getNetworks = (): void => {
   // if (props.networksTable.length) return // Из-за этого кода был баг. Открыть визард вм -> создать сеть -> открыть визард вм и в списке сетей нету новой сети
 
@@ -149,9 +179,8 @@ watch(
 watch(
   () => props.networksTable,
   (newValue) => {
-    const isExistValue = newValue.some(
-      (network) => network[valueProp] === selectedLocation.value
-    )
+    if (!newValue.length && props.type !== 'new') return
+
     if (!newValue.length) {
       locationOptions.value = [
         {
@@ -159,29 +188,33 @@ watch(
           value: 'noAvailableNetworks',
         },
       ]
-      selectedLocation.value = 'noAvailableNetworks'
+      networkValue.value = 'noAvailableNetworks'
       newNetworkInvalid.value = true
       return
     }
     newNetworkInvalid.value = false
 
+    const isExistValue = newValue.some(
+      (networkLocal) => networkLocal[props.networkValueProp] === networkValue.value
+    )
+
     if (props.type === 'edit' || isExistValue) return
 
-    selectedLocationOld.value = newValue[0][valueProp] || ''
-    selectedLocation.value = newValue[0][valueProp] || ''
+    selectedLocationOld.value = newValue[0][props.networkValueProp] || ''
+    networkValue.value = newValue[0][props.networkValueProp] || ''
 
     locationOptions.value = [
-      { text: newValue[0].name, value: newValue[0][valueProp] },
+      { text: newValue[0].name, value: newValue[0][props.networkValueProp] },
       { text: `${localization.value.common.browse}...`, value: '' },
     ]
   },
-  { immediate: true }
+  { immediate: true, deep: true }
 )
 
 const locationModalIsShow = ref<boolean>(false)
 const onHideLocationModal = (): void => {
   locationModalIsShow.value = false
-  selectedLocation.value = selectedLocationOld.value
+  networkValue.value = selectedLocationOld.value
 }
 const changeLocation = (event: UI_I_HTMLSelectElement): void => {
   const value = event.target.value
@@ -191,17 +224,16 @@ const changeLocation = (event: UI_I_HTMLSelectElement): void => {
   }
 
   selectedLocationOld.value = value
-  selectedLocation.value = value
-  // netBridge.value = value
+  networkValue.value = value
 }
-const onSelectLocation = (network: UI_I_NetworkTableItem): void => {
+const onSelectLocation = (networkLocal: UI_I_NetworkTableItem): void => {
   locationModalIsShow.value = false
 
-  selectedLocationOld.value = network[valueProp]
-  selectedLocation.value = network[valueProp]
+  selectedLocationOld.value = networkLocal[props.networkValueProp]
+  networkValue.value = networkLocal[props.networkValueProp]
 
   const hasNetwork = locationOptions.value.some(
-    (option) => option.value === network[valueProp]
+    (option) => option.value === networkLocal[props.networkValueProp]
   )
   if (hasNetwork) {
     return
@@ -209,87 +241,17 @@ const onSelectLocation = (network: UI_I_NetworkTableItem): void => {
 
   locationOptions.value = [
     ...locationOptions.value.slice(0, -1),
-    { text: network.name, value: network[valueProp] },
+    { text: networkLocal.name, value: networkLocal[props.networkValueProp] },
     locationOptions.value[locationOptions.value.length - 1],
   ]
 }
-
-// const adapterType = ref<string>('rtl8139')
-const adapterType = ref<string>('virtio') // Семён попросил
-
-const target = ref<string>('')
-
-const macAddress = ref<string>('')
 const macAddressType = ref<string>('automatic')
 
-let cashNetwork = {
-  network: '',
-  mac: '',
-}
-if (props.network.mac) {
-  cashNetwork.network = props.network[valueProp]
-  cashNetwork.mac = props.network.mac
-}
-watch(selectedLocation, (newValue) => {
-  if (newValue !== cashNetwork.network) {
-    macAddressType.value = 'automatic'
-    macAddress.value = ''
-  } else {
-    macAddressType.value = cashNetwork.mac ? 'manual' : 'automatic'
-    setTimeout(() => {
-      macAddress.value = cashNetwork.mac
-    },0)
-  }
-})
-
-watch(
-  [selectedLocation, adapterType, macAddress, macAddressType, locationOptions],
-  () => {
-    const option = locationOptions.value.find(
-      (option) => option.value === selectedLocation.value
-    )
-    if (!option) return
-
-    emits('send-data', {
-      network: option.text,
-      // net_bridge: props.project === 'procurator' ? option.value : '',
-      net_bridge: option.value,
-      target: target.value,
-      model: adapterType.value,
-      mac: macAddress.value,
-      boot_order: props.network.boot_order,
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.network,
-  (newValue) => {
-    // if (props.type !== 'edit') return
-    if (props.type !== 'edit' && props.type !== 'clone') return
-
-    locationOptions.value = [
-      { text: newValue.network, value: newValue[valueProp] },
-      { text: `${localization.value.common.browse}...`, value: '' },
-    ]
-    selectedLocation.value = newValue[valueProp]
-
-    adapterType.value = newValue.model
-    target.value = newValue.target
-    // Сбрасываем mac address при клонировании
-    macAddress.value = props.type === 'clone' ? '' : newValue.mac
-    macAddressType.value = props.type === 'clone' ? 'automatic' : 'manual'
-  },
-  { immediate: true }
-)
-
 watch(
   isRunning,
   (newValue) => {
     if (newValue && props.type === 'new') {
-      adapterType.value = 'virtio'
+      model.value = 'virtio'
     }
   },
   { immediate: true }

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbController.vue

@@ -1,14 +1,14 @@
 <template>
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller-new
     v-if="isNewView"
-    v-model:selected-usb-controller="selectedUsbController"
+    v-model="model"
     :is-edit="props.isEdit"
     :selected-usb-controller-text="selectedUsbControllerText"
     :usb-controller-options="usbControllerOptions"
   />
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller-old
     v-else
-    v-model:selected-usb-controller="selectedUsbController"
+    v-model="model"
     :is-edit="props.isEdit"
     :selected-usb-controller-text="selectedUsbControllerText"
     :usb-controller-options="usbControllerOptions"
@@ -17,42 +17,31 @@
 
 <script setup lang="ts">
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import { usbControllerOptionsConfig } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/lib/config/options'
 
+const model = defineModel<UI_I_CreateVmData['usb_controllers'][0]['type']>({ required: true })
+
 const props = withDefaults(
   defineProps<{
-    usbController: string
     isEdit: boolean
     state?: string | number
   }>(),
   {
-    usbController: 'usb2',
     state: undefined,
   }
 )
-const emits = defineEmits<{
-  (event: 'send-data', value: string): void
-}>()
 
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const usbControllerOptions = ref<UI_I_OptionItem[]>(usbControllerOptionsConfig)
-const selectedUsbController = ref<string>(props.usbController)
 const selectedUsbControllerText = computed<string>(
   () =>
     usbControllerOptions.value.find(
-      (option) => option.value === selectedUsbController.value
+      (option) => option.value === model.value
     )?.text || ''
 )
-
-watch(
-  selectedUsbController,
-  (newValue) => {
-    emits('send-data', newValue)
-  },
-  { immediate: true }
-)
 </script>
 
 <style scoped lang="scss"></style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbControllerNew.vue

@@ -21,7 +21,7 @@
       <ui-select
         v-else
         id="usb-controller-select"
-        v-model="selectedUsbController"
+        v-model="model"
         :items="props.usbControllerOptions"
         :disabled="props.isEdit"
         width="auto"
@@ -33,10 +33,13 @@
 </template>
 
 <script setup lang="ts">
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 
-const selectedUsbController = defineModel<string>('selectedUsbController')
+const model = defineModel<UI_I_CreateVmData['usb_controllers'][0]['type']>({
+  required: true,
+})
 
 const props = defineProps<{
   isEdit: boolean

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbControllerOld.vue

@@ -20,7 +20,7 @@
         <div v-else class="select">
           <select
             id="usb-controller-select"
-            v-model="selectedUsbController"
+            v-model="model"
             :disabled="props.isEdit"
             data-id="usb-controller-select"
             @click.stop
@@ -40,10 +40,13 @@
 </template>
 
 <script setup lang="ts">
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 
-const selectedUsbController = defineModel<string>('selectedUsbController')
+const model = defineModel<UI_I_CreateVmData['usb_controllers'][0]['type']>({
+  required: true,
+})
 
 const props = defineProps<{
   isEdit: boolean

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCard.vue

@@ -1,9 +1,8 @@
 <template>
   <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-new
     v-if="isNewView"
+    v-model="model"
     v-model:invalid="invalid"
-    v-model:number-displays="numberDisplays"
-    v-model:video-card-model="videoCardModel"
     :is-edit="props.isEdit"
     :error-validation-fields="props.errorValidationFields"
     :video-card-model-name="videoCardModelName"
@@ -18,9 +17,8 @@
   />
   <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-old
     v-else
+    v-model="model"
     v-model:invalid="invalid"
-    v-model:number-displays="numberDisplays"
-    v-model:video-card-model="videoCardModel"
     :is-edit="props.isEdit"
     :error-validation-fields="props.errorValidationFields"
     :video-card-model-name="videoCardModelName"
@@ -40,9 +38,12 @@ import type { UI_I_SendDataVideoCard } from '~/components/common/vm/actions/comm
 import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import { videoCardModelOptionsConfigFunc } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/model/lib/config/options'
 import { numberDisplaysOptionsFunc } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/lib/config/options'
 
+const model = defineModel<UI_I_CreateVmData['video_card']>({ required: true })
+
 const props = withDefaults(
   defineProps<{
     isEdit: boolean
@@ -56,7 +57,6 @@ const props = withDefaults(
   }
 )
 const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataVideoCard): void
   (event: 'invalid', value: boolean): void
   (event: 'remove-error-by-title', value: string): void
 }>()
@@ -68,32 +68,30 @@ const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const isDisabled = computed<boolean>(() => props.isEdit && props.state !== 1)
 const isDisabledNumberDisplays = computed<boolean>(
-  () => videoCardModel.value === 'none'
+  () => model.value.adapter === 'none'
 )
 watch(isDisabled, (newValue) => {
   if (!newValue) {
     return
   }
 
-  numberDisplays.value = '1'
+  model.value.displays = 1
 })
 
-const videoCardModel = ref<string>('qxl')
 const videoCardModelOptions = computed<UI_I_OptionItem[]>(() =>
   videoCardModelOptionsConfigFunc(localization.value)
 )
 const videoCardModelName = computed<string>(
   () =>
     videoCardModelOptions.value.find(
-      (videoCard) => videoCard.value === videoCardModel.value
+      (videoCard) => videoCard.value === model.value.adapter
     )?.text || ''
 )
 
-const numberDisplays = ref<string>('1')
 const numberDisplaysOptions = computed<UI_I_OptionItem[]>(() => {
   const result = numberDisplaysOptionsFunc()
-  if (videoCardModel.value === 'none') {
-    result.unshift({ text: '0', value: '0' })
+  if (model.value.adapter === 'none') {
+    result.unshift({ text: '0', value: 0 })
   }
   return result
 })
@@ -110,37 +108,17 @@ watch(
 
 // const graphics = ref(false)
 
-const changeNumberDisplays = (model: any): void => {
-  if (model === 'none') {
-    numberDisplays.value = '0'
-  } else if (numberDisplays.value === '0') {
-    numberDisplays.value = '1'
+const changeNumberDisplays = (modelLocal: string): void => {
+  if (modelLocal === 'none') {
+    model.value.displays = 0
+  } else if (model.value.displays === 0) {
+    model.value.displays = 1
   }
 }
 watch(
-  // [numberDisplays, totalVideoMemory, videoCardModel],
-  [numberDisplays, videoCardModel],
-  ([_newValue1, newValue2]) => {
-    changeNumberDisplays(newValue2)
-
-    emits('send-data', {
-      adapter: videoCardModel.value,
-      displays: +numberDisplays.value,
-      // memory_mb: totalVideoMemory.value,
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.videoCard,
+  () => model.value.adapter,
   (newValue) => {
-    if (!newValue) return
-
-    videoCardModel.value = newValue.adapter
-    numberDisplays.value = '' + newValue.displays
-    // totalVideoMemory.value = newValue.memory_mb
+    changeNumberDisplays(newValue)
   },
   { immediate: true }
 )

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardNew.vue

@@ -26,7 +26,7 @@
     <template #stackBlockContent>
       <ui-select
         id="vm-wizard-video-card"
-        v-model="videoCardModel"
+        v-model="model.adapter"
         :items="props.videoCardModelOptions"
         :disabled="props.isEdit && props.state !== 1"
         :error-text="props.errorText"
@@ -38,7 +38,7 @@
     </template>
     <template #stackChildren>
       <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-number-displays
-        v-model:number-displays="numberDisplays"
+        v-model:number-displays="model.displays"
         :number-displays-options="props.numberDisplaysOptions"
         :disabled="props.isDisabled || props.isDisabledNumberDisplays"
         :error-validation-fields="props.errorValidationFields"
@@ -56,7 +56,7 @@
       <!--          v-models:graphics="graphics"-->
       <!--        />-->
       <!--      <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-model-->
-      <!--        v-model:video-card-model="videoCardModel"-->
+      <!--        v-model:video-card-model="model.adapter"-->
       <!--        :disabled="props.isDisabled"-->
       <!--      />-->
     </template>
@@ -67,13 +67,14 @@
 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 type {UI_I_CreateVmData} from "~/components/common/vm/actions/common/lib/models/interfaces";
+
+const model = defineModel<UI_I_CreateVmData['video_card']>({ required: true })
 
 const invalid = defineModel<boolean>('invalid', { required: true })
-const numberDisplays = defineModel<string>('numberDisplays', { required: true })
 // const totalVideoMemory = defineModel<number>('totalVideoMemory', {
 //   required: true,
 // })
-const videoCardModel = defineModel<string>('videoCardModel', { required: true })
 
 const props = withDefaults(
   defineProps<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardOld.vue

@@ -30,7 +30,7 @@
             <div class="select">
               <select
                 id="vm-wizard-video-card"
-                v-model="videoCardModel"
+                v-model="model.adapter"
                 :disabled="props.isEdit && props.state !== 1"
                 data-id="vm-wizard-video-card-select"
                 class="vm-wizard-video-card input-text-color"
@@ -51,7 +51,7 @@
       </template>
       <template #stackChildren>
         <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-number-displays
-          v-model:number-displays="numberDisplays"
+          v-model:number-displays="model.displays"
           :number-displays-options="props.numberDisplaysOptions"
           :disabled="props.isDisabled || props.isDisabledNumberDisplays"
           :error-validation-fields="props.errorValidationFields"
@@ -69,7 +69,7 @@
         <!--          v-models:graphics="graphics"-->
         <!--        />-->
         <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-model-->
-        <!--          v-model:video-card-model="videoCardModel"-->
+        <!--          v-model:video-card-model="model.adapter"-->
         <!--          :disabled="props.isDisabled"-->
         <!--        />-->
       </template>
@@ -81,13 +81,14 @@
 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 type {UI_I_CreateVmData} from "~/components/common/vm/actions/common/lib/models/interfaces";
+
+const model = defineModel<UI_I_CreateVmData['video_card']>({ required: true })
 
 const invalid = defineModel<boolean>('invalid', { required: true })
-const numberDisplays = defineModel<string>('numberDisplays', { required: true })
 // const totalVideoMemory = defineModel<number>('totalVideoMemory', {
 //   required: true,
 // })
-const videoCardModel = defineModel<string>('videoCardModel', { required: true })
 
 const props = withDefaults(
   defineProps<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/lib/config/options.ts

@@ -1,10 +1,10 @@
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 export const numberDisplaysOptionsFunc = (): UI_I_OptionItem[] => [
-    { text: '1', value: '1' },
-    { text: '2', value: '2' },
-    { text: '3', value: '3' },
-    { text: '4', value: '4' },
+    { text: '1', value: 1 },
+    { text: '2', value: 2 },
+    { text: '3', value: 3 },
+    { text: '4', value: 4 },
     // { text: '5', value: '5' },
     // { text: '6', value: '6' },
     // { text: '7', value: '7' },