bfg-common 1.5.573 → 1.5.575

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/location/Location.vue

@@ -1,154 +1,154 @@
-<template>
-  <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location-new
-    v-if="isNewView"
-    v-model:selected-location="selectedLocation"
-    :index="props.index"
-    :datastore="props.datastore"
-    :is-datastore-loading="props.isDatastoreLoading"
-    :get-datastore-table-func="props.getDatastoreTableFunc"
-    :api-error="apiError"
-    :location-options="locationOptions"
-    :storage-modal-is-show="storageModalIsShow"
-    :storage-submit="storageSubmit"
-    @change-location="onChangeLocation"
-    @change-storage="onChangeStorage"
-    @hide-storage-modal="onHideStorageModal"
-    @submit-storage-modal="onSubmitStorageModal"
-    @remove-validation-error="onRemoveValidationError"
-  />
-  <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location-old
-    v-else
-    v-model:selected-location="selectedLocation"
-    :index="props.index"
-    :datastore="props.datastore"
-    :is-datastore-loading="props.isDatastoreLoading"
-    :get-datastore-table-func="props.getDatastoreTableFunc"
-    :api-error="apiError"
-    :location-options="locationOptions"
-    :storage-modal-is-show="storageModalIsShow"
-    :storage-submit="storageSubmit"
-    @change-location="onChangeLocation"
-    @change-storage="onChangeStorage"
-    @hide-storage-modal="onHideStorageModal"
-    @submit-storage-modal="onSubmitStorageModal"
-    @remove-validation-error="onRemoveValidationError"
-  />
-</template>
-
-<script setup lang="ts">
-import type {
-  UI_I_HTMLSelectElement,
-  UI_I_Localization,
-} from '~/lib/models/interfaces'
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-const props = defineProps<{
-  location: UI_I_DatastoreTableItem | null
-  index: number
-  errorValidationFields: UI_I_ErrorValidationField[]
-  datastore: UI_I_DatastoreTableItem[]
-  isDatastoreLoading: boolean
-  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-}>()
-const emits = defineEmits<{
-  (event: 'change', value: UI_I_DatastoreTableItem): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectedLocation = ref<string>(props.location?.id || '')
-
-const storages = ref<UI_I_DatastoreTableItem[]>([])
-const addStorage = (storage: UI_I_DatastoreTableItem): void => {
-  const hasStorage = storages.value.some((item) => item.id === storage.id)
-  if (hasStorage) {
-    return
-  }
-
-  storages.value.push(storage)
-}
-const locationOptions = ref<UI_I_OptionItem[]>([])
-
-watch(
-  () => props.location,
-  (newValue) => {
-    if (locationOptions.value.length || !newValue) {
-      return
-    }
-
-    locationOptions.value = [
-      {
-        text: localization.value.common.storeWithVirtualMachine,
-        value: newValue.id,
-      },
-      { text: `${localization.value.common.browse}...`, value: -1 },
-    ]
-    selectedLocation.value = newValue.id
-    storages.value.push(newValue)
-    addStorage(newValue)
-  },
-  { immediate: true }
-)
-
-const storageSubmit = ref<null | Function>(null)
-const onSubmitStorageModal = (): void => {
-  storageSubmit.value = (_isValid: boolean): void => {
-    storageSubmit.value = null
-  }
-}
-const storageModalIsShow = ref<boolean>(false)
-const onHideStorageModal = (): void => {
-  storageModalIsShow.value = false
-  if (selectedLocation.value === -1)
-    selectedLocation.value = locationOptions.value[0].value
-}
-const onChangeStorage = (storage: UI_I_DatastoreTableItem): void => {
-  locationOptions.value = [
-    locationOptions.value[0],
-    { text: storage.name, value: storage.id },
-    // @ts-ignore
-    locationOptions.value.at(-1),
-  ]
-
-  selectedLocation.value = storage.id
-  emits('change', storage)
-  addStorage(storage)
-  onHideStorageModal()
-}
-const onChangeLocation = (event: UI_I_HTMLSelectElement): void => {
-  const value = +event.target.value
-  if (value === -1) {
-    storageModalIsShow.value = true
-    return
-  }
-
-  selectedLocation.value = event.target.value
-  const storage = storages.value.find((item) => item.id === event.target.value)
-  storage && emits('change', storage)
-}
-
-const typeError = computed<string>(
-  () => `disk_devices[${props.index}].location`
-)
-
-const apiError = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find(
-      (message) => message.field === typeError.value
-    )?.error_message || ''
-  )
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', typeError.value)
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location-new
+    v-if="isNewView"
+    v-model:selected-location="selectedLocation"
+    :index="props.index"
+    :datastore="props.datastore"
+    :is-datastore-loading="props.isDatastoreLoading"
+    :get-datastore-table-func="props.getDatastoreTableFunc"
+    :api-error="apiError"
+    :location-options="locationOptions"
+    :storage-modal-is-show="storageModalIsShow"
+    :storage-submit="storageSubmit"
+    @change-location="onChangeLocation"
+    @change-storage="onChangeStorage"
+    @hide-storage-modal="onHideStorageModal"
+    @submit-storage-modal="onSubmitStorageModal"
+    @remove-validation-error="onRemoveValidationError"
+  />
+  <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location-old
+    v-else
+    v-model:selected-location="selectedLocation"
+    :index="props.index"
+    :datastore="props.datastore"
+    :is-datastore-loading="props.isDatastoreLoading"
+    :get-datastore-table-func="props.getDatastoreTableFunc"
+    :api-error="apiError"
+    :location-options="locationOptions"
+    :storage-modal-is-show="storageModalIsShow"
+    :storage-submit="storageSubmit"
+    @change-location="onChangeLocation"
+    @change-storage="onChangeStorage"
+    @hide-storage-modal="onHideStorageModal"
+    @submit-storage-modal="onSubmitStorageModal"
+    @remove-validation-error="onRemoveValidationError"
+  />
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_HTMLSelectElement,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const props = defineProps<{
+  location: UI_I_DatastoreTableItem | null
+  index: number
+  errorValidationFields: UI_I_ErrorValidationField[]
+  datastore: UI_I_DatastoreTableItem[]
+  isDatastoreLoading: boolean
+  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+}>()
+const emits = defineEmits<{
+  (event: 'change', value: UI_I_DatastoreTableItem): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectedLocation = ref<string>(props.location?.id || '')
+
+const storages = ref<UI_I_DatastoreTableItem[]>([])
+const addStorage = (storage: UI_I_DatastoreTableItem): void => {
+  const hasStorage = storages.value.some((item) => item.id === storage.id)
+  if (hasStorage) {
+    return
+  }
+
+  storages.value.push(storage)
+}
+const locationOptions = ref<UI_I_OptionItem[]>([])
+
+watch(
+  () => props.location,
+  (newValue) => {
+    if (locationOptions.value.length || !newValue) {
+      return
+    }
+
+    locationOptions.value = [
+      {
+        text: localization.value.common.storeWithVirtualMachine,
+        value: newValue.id,
+      },
+      { text: `${localization.value.common.browse}...`, value: -1 },
+    ]
+    selectedLocation.value = newValue.id
+    storages.value.push(newValue)
+    addStorage(newValue)
+  },
+  { immediate: true }
+)
+
+const storageSubmit = ref<null | Function>(null)
+const onSubmitStorageModal = (): void => {
+  storageSubmit.value = (_isValid: boolean): void => {
+    storageSubmit.value = null
+  }
+}
+const storageModalIsShow = ref<boolean>(false)
+const onHideStorageModal = (): void => {
+  storageModalIsShow.value = false
+  if (selectedLocation.value === -1)
+    selectedLocation.value = locationOptions.value[0].value
+}
+const onChangeStorage = (storage: UI_I_DatastoreTableItem): void => {
+  locationOptions.value = [
+    locationOptions.value[0],
+    { text: storage.name, value: storage.id },
+    // @ts-ignore
+    locationOptions.value.at(-1),
+  ]
+
+  selectedLocation.value = storage.id
+  emits('change', storage)
+  addStorage(storage)
+  onHideStorageModal()
+}
+const onChangeLocation = (event: UI_I_HTMLSelectElement): void => {
+  const value = +event.target.value
+  if (value === -1) {
+    storageModalIsShow.value = true
+    return
+  }
+
+  selectedLocation.value = event.target.value
+  const storage = storages.value.find((item) => item.id === event.target.value)
+  storage && emits('change', storage)
+}
+
+const typeError = computed<string>(
+  () => `disk_devices[${props.index}].location`
+)
+
+const apiError = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find(
+      (message) => message.field === typeError.value
+    )?.error_message || ''
+  )
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', typeError.value)
+}
+</script>
+
+<style scoped lang="scss"></style>

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="netBridge"
-    v-model:adapter-type="model"
-    v-model:mac-address="mac"
+    v-model:selected-location="selectedLocation"
+    v-model:adapter-type="adapterType"
+    v-model:mac-address="macAddress"
     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="netBridge"
-    v-model:adapter-type="model"
-    v-model:mac-address="mac"
+    v-model:selected-location="selectedLocation"
+    v-model:adapter-type="adapterType"
+    v-model:mac-address="macAddress"
     v-model:mac-address-type="macAddressType"
     v-model:new-network-invalid="newNetworkInvalid"
     :index="props.index"
@@ -56,45 +56,20 @@ 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 netBridge = defineModel<
-  UI_I_CreateVmData['network_devices'][0]['net_bridge']
->('netBridge', { required: true })
-watch(netBridge, (newValue) => {
-  const selectedOption = locationOptions.value.find(
-    (option) => option.value === newValue
-  )
-  if (selectedOption) {
-    network.value = selectedOption.text
-  }
-})
-
-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
@@ -105,6 +80,7 @@ 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
@@ -126,7 +102,7 @@ const isRemovable = computed<boolean>(() => {
   return (
     !props.isEdit ||
     !isRunning.value ||
-    (isRunning.value && model.value === 'virtio')
+    (isRunning.value && adapterType.value === 'virtio')
   )
 })
 
@@ -142,15 +118,9 @@ const label = computed<string>(() => {
 // }
 
 const selectedLocationOld = ref<string>('')
+const selectedLocation = ref<string>('')
 const locationOptions = ref<UI_I_OptionItem[]>([])
 
-if (netBridge.value) {
-  locationOptions.value = [
-    { text: network.value, value: netBridge.value },
-    { text: `${localization.value.common.browse}...`, value: '' },
-  ]
-}
-
 const getNetworks = (): void => {
   // if (props.networksTable.length) return // Из-за этого кода был баг. Открыть визард вм -> создать сеть -> открыть визард вм и в списке сетей нету новой сети
 
@@ -179,8 +149,9 @@ watch(
 watch(
   () => props.networksTable,
   (newValue) => {
-    if (!newValue.length && props.type !== 'new') return
-
+    const isExistValue = newValue.some(
+      (network) => network[valueProp] === selectedLocation.value
+    )
     if (!newValue.length) {
       locationOptions.value = [
         {
@@ -188,33 +159,29 @@ watch(
           value: 'noAvailableNetworks',
         },
       ]
-      netBridge.value = 'noAvailableNetworks'
+      selectedLocation.value = 'noAvailableNetworks'
       newNetworkInvalid.value = true
       return
     }
     newNetworkInvalid.value = false
 
-    const isExistValue = newValue.some(
-      (networkLocal) => networkLocal[valueProp] === netBridge.value
-    )
-
     if (props.type === 'edit' || isExistValue) return
 
     selectedLocationOld.value = newValue[0][valueProp] || ''
-    netBridge.value = newValue[0][valueProp] || ''
+    selectedLocation.value = newValue[0][valueProp] || ''
 
     locationOptions.value = [
       { text: newValue[0].name, value: newValue[0][valueProp] },
       { text: `${localization.value.common.browse}...`, value: '' },
     ]
   },
-  { immediate: true, deep: true }
+  { immediate: true }
 )
 
 const locationModalIsShow = ref<boolean>(false)
 const onHideLocationModal = (): void => {
   locationModalIsShow.value = false
-  netBridge.value = selectedLocationOld.value
+  selectedLocation.value = selectedLocationOld.value
 }
 const changeLocation = (event: UI_I_HTMLSelectElement): void => {
   const value = event.target.value
@@ -224,16 +191,17 @@ const changeLocation = (event: UI_I_HTMLSelectElement): void => {
   }
 
   selectedLocationOld.value = value
-  netBridge.value = value
+  selectedLocation.value = value
+  // netBridge.value = value
 }
-const onSelectLocation = (networkLocal: UI_I_NetworkTableItem): void => {
+const onSelectLocation = (network: UI_I_NetworkTableItem): void => {
   locationModalIsShow.value = false
 
-  selectedLocationOld.value = networkLocal[valueProp]
-  netBridge.value = networkLocal[valueProp]
+  selectedLocationOld.value = network[valueProp]
+  selectedLocation.value = network[valueProp]
 
   const hasNetwork = locationOptions.value.some(
-    (option) => option.value === networkLocal[valueProp]
+    (option) => option.value === network[valueProp]
   )
   if (hasNetwork) {
     return
@@ -241,17 +209,87 @@ const onSelectLocation = (networkLocal: UI_I_NetworkTableItem): void => {
 
   locationOptions.value = [
     ...locationOptions.value.slice(0, -1),
-    { text: networkLocal.name, value: networkLocal[valueProp] },
+    { text: network.name, value: network[valueProp] },
     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') {
-      model.value = 'virtio'
+      adapterType.value = 'virtio'
     }
   },
   { immediate: true }