bfg-common 1.6.95 → 1.6.97

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/Media.vue

@@ -1,7 +1,7 @@
 <template>
   <component
     :is="currentComponent"
-    v-model:cd-dvd-media="cdDvdMedia"
+    v-model:cd-dvd-media="localCdDvdMedia"
     :index="props.index"
     @browse="emits('browse')"
   />
@@ -24,6 +24,19 @@ const currentComponent = computed(() =>
     ? defineAsyncComponent(() => import('./New.vue'))
     : defineAsyncComponent(() => import('./Old.vue'))
 )
+
+const localCdDvdMedia = ref<string>('')
+
+watch(cdDvdMedia, (newValue) => {
+  localCdDvdMedia.value = newValue.replace(/^([^:]+):\//, '[$1]:/')
+}, { immediate: true })
+
+watch(localCdDvdMedia, (newValue) => {
+  const cleaned = newValue.replace(/^\[([^\]]+)\]:\//, '$1:/')
+  if (cleaned !== cdDvdMedia.value) {
+    cdDvdMedia.value = cleaned
+  }
+})
 </script>
 
 <style scoped></style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/New.vue

@@ -56,6 +56,11 @@ const emits = defineEmits<{
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+onMounted(() => {
+  const cdDvdMediaInputElement = document.getElementById('vm-wizard-dvd-media-input')
+  cdDvdMediaInputElement?.classList.remove('text-ellipsis')
+})
 </script>
 
 <style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/Old.vue

@@ -12,6 +12,7 @@
           <input
             id="vm-wizard-dvd-media-input"
             v-model="cdDvdMedia"
+            :title="cdDvdMedia"
             data-id="vm-wizard-dvd-media-input"
             type="text"
             disabled

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Cpu.vue

@@ -2,6 +2,7 @@
   <component
     :is="currentComponent"
     v-model="model"
+    v-model:vcpus="vcpus"
     v-model:reservation="reservation"
     v-model:reservation-type="reservationType"
     v-model:limit="limit"
@@ -56,7 +57,7 @@ const props = withDefaults(
   }>(),
   {
     state: undefined,
-    nums: null
+    nums: null,
   }
 )
 const emits = defineEmits<{
@@ -74,18 +75,26 @@ const currentComponent = computed(() =>
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const isRunning = computed<boolean>(() => {
+  return props.state === 2
+})
+
 // props.state === 2 => is run
-if (props.state !== 2) {
-  model.value.cpu.max_vcpus = capabilities.value.maxCpus
-}
+// if (props.state !== 2) {
+//   model.value.cpu.max_vcpus = capabilities.value.maxCpus
+// }
 
 const isDisabled = computed<boolean>(() => {
   return props.state === 2
 })
 
-const cpuOptions = computed<UI_I_OptionItem[]>(() =>
-  cpuOptionsFunc(localization.value, 1, model.value.cpu.max_vcpus)
-)
+const cpuOptions = computed<UI_I_OptionItem[]>(() => {
+  const minCpu = isRunning.value ? model.value.cpu.vcpus : 1
+  const maxCpu = model.value.cpu.hotplug
+    ? model.value.cpu.max_vcpus
+    : capabilities.value.maxCpus
+  return cpuOptionsFunc(localization.value, minCpu, maxCpu)
+})
 
 // const enableCpuHotAdd = ref<boolean>(false)
 
@@ -99,7 +108,8 @@ watch(
     if (newValue) {
       model.value.cpu.max_vcpus = Math.max(
         model.value.cpu.vcpus,
-        model.value.cpu.max_vcpus
+        // model.value.cpu.max_vcpus
+        capabilities.value.maxCpus
       )
       return
     }
@@ -138,7 +148,8 @@ const maxCpuOptions = computed<UI_I_OptionItem[]>(() =>
   cpuOptionsFunc(
     localization.value,
     model.value.cpu.vcpus,
-    model.value.cpu.max_vcpus
+    // model.value.cpu.max_vcpus
+    capabilities.value.maxCpus
   )
 )
 // const selectedMaxCpu = ref<number>(1)
@@ -218,6 +229,16 @@ watch(
   { immediate: true }
 )
 
+const vcpus = computed<number>({
+  get() {
+    return model.value.cpu.vcpus
+  },
+  set(newValue) {
+    const valueInt = +newValue
+    model.value.cpu.vcpus = isNaN(valueInt) ? 0 : valueInt
+  },
+})
+
 const reservation = ref<string>('1')
 const reservationType = ref<string>('mhz')
 if (model.value.cpu.reservation_mhz !== 1) {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/New.vue

@@ -24,7 +24,7 @@
       <template #stackBlockContent>
         <div class="flex-align-center flex-space-between">
           <ui-combobox
-            v-model.number="model.cpu.vcpus"
+            v-model.number="vcpus"
             :items="props.cpuOptions"
             :disabled="props.isCpuDisabled"
             :error-text="props.vcpusLocalAndApiErrorsTexts"
@@ -96,6 +96,8 @@
           v-model:reservation-type="reservationType"
           :error-validation-fields="props.errorValidationFields"
           :disabled="props.isDisabled"
+          :max="4_794"
+          :min="0"
           type="mhz"
           component-type="cpu"
           @invalid="emits('reservation-invalid', $event)"
@@ -106,6 +108,7 @@
           v-model:limit-type="limitType"
           :error-validation-fields="props.errorValidationFields"
           :disabled="props.isDisabled"
+          :min="model.cpu.reservation_mhz"
           type="mhz"
           component-type="cpu"
           @invalid="emits('limit-invalid', $event)"
@@ -157,6 +160,7 @@ import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/li
 
 const model = defineModel<UI_I_CreateVmData>({ required: true })
 
+const vcpus = defineModel<string>('vcpus', { required: true })
 const reservation = defineModel<string>('reservation', { required: true })
 const reservationType = defineModel<string>('reservationType', {
   required: true,
@@ -193,7 +197,7 @@ const props = withDefaults(
   }>(),
   {
     vmCpuHelpTextSecond: undefined,
-    nums: null
+    nums: null,
   }
 )
 const emits = defineEmits<{
@@ -238,6 +242,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 .cpu-info-block {
   :deep(.help-text) {
     margin-bottom: 12px;
+    color: var(--stack-block-text-color);
   }
   :deep(.cpu-more-info) {
     font-size: 13px;

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Old.vue

@@ -28,7 +28,7 @@
               <template #elem>
                 <atoms-combobox
                   id="vm-wizard-vcpus-field"
-                  v-model.number="model.cpu.vcpus"
+                  v-model.number="vcpus"
                   :items="props.cpuOptions"
                   :disabled="props.isCpuDisabled"
                   class="input-text-color"
@@ -74,6 +74,8 @@
           v-model:reservation-type="reservationType"
           :error-validation-fields="props.errorValidationFields"
           :disabled="props.isDisabled"
+          :max="4794"
+          :min="0"
           type="mhz"
           component-type="cpu"
           @invalid="emits('reservation-invalid', $event)"
@@ -84,6 +86,7 @@
           v-model:limit-type="limitType"
           :error-validation-fields="props.errorValidationFields"
           :disabled="props.isDisabled"
+          :min="model.cpu.reservation_mhz"
           type="mhz"
           component-type="cpu"
           @invalid="emits('limit-invalid', $event)"
@@ -136,6 +139,7 @@ import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/li
 
 const model = defineModel<UI_I_CreateVmData>({ required: true })
 
+const vcpus = defineModel<string>('vcpus', { required: true })
 const reservation = defineModel<string>('reservation', { required: true })
 const reservationType = defineModel<string>('reservationType', {
   required: true,
@@ -172,7 +176,7 @@ const props = withDefaults(
   }>(),
   {
     vmCpuHelpTextSecond: undefined,
-    nums: null
+    nums: null,
   }
 )
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/coresPerSocket/CoresPerSocket.vue

@@ -43,14 +43,29 @@ const apiError = computed<string>(() => {
   )
 })
 
+// const socketOptions = computed<number[]>(() => {
+//   const result = []
+//   const cpus = props.cpuOptions[1].value
+//   for (let i = 1; i <= cpus; i++) {
+//     const isCommonDivisor = props.selectedCpus.every(
+//       (cpu) => i <= cpu && (cpu % i === 0 || i === 1)
+//     )
+//     if (isCommonDivisor || props.disabled) {
+//       result.push(i)
+//     }
+//   }
+//   return result
+// })
+
+// SC-SELF mm Procurator[QA] 07.04.26 https://mm.aobfg.ru/bfg-jsc/pl/b83uo8msa3fdtmb4bhebw8ebpe
 const socketOptions = computed<number[]>(() => {
   const result = []
-  const cpus = props.cpuOptions[1].value
+  const cpus = props.selectedCpus[0]
   for (let i = 1; i <= cpus; i++) {
-    const isCommonDivisor = props.selectedCpus.every(
-      (cpu) => i <= cpu && (cpu % i === 0 || i === 1)
-    )
-    if (isCommonDivisor || props.disabled) {
+    if (
+      i <= props.selectedCpus[0] &&
+      (props.selectedCpus[0] % i === 0 || i === 1)
+    ) {
       result.push(i)
     }
   }
@@ -60,8 +75,15 @@ watch(
   socketOptions,
   () => {
     // !socketOptions.value.includes(selectedCorePerSocketLocal.value) &&
-    !props.disabled &&
-      (selectedCorePerSocketLocal.value = socketOptions.value.at(-1) || 1)
+
+    // !props.disabled &&
+    //   (selectedCorePerSocketLocal.value = socketOptions.value.at(-1) || 1)
+    const hasSelected = socketOptions.value.some(
+      (value) => value === selectedCorePerSocketLocal.value
+    )
+    if (!hasSelected) {
+      selectedCorePerSocketLocal.value = socketOptions.value.at(-1) || 1
+    }
   },
   { deep: true }
 )

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/shares/Shares.vue

@@ -56,7 +56,8 @@ const apiErrorLocal = computed<string>(() => {
   )
 })
 
-const maxShares = 262_144
+// const maxShares = 262_144
+const maxShares = 10_000 // SC-1268 Так как бэк ругается когда больше 10 000
 const sharesOptions = computed<UI_I_OptionItem[]>(() => {
   return sharesOptionsFunc(localization.value, maxShares)
 })

package/components/common/vm/actions/common/customizeHardware/virtualHardware/limit/Limit.vue

@@ -26,9 +26,10 @@ const props = withDefaults(
   defineProps<{
     limit: string
     limitType: string
+    min: number
     type: 'mb' | 'mhz'
     componentType: string
-    errorValidationFields: UI_I_ErrorValidationField<string>[]
+    errorValidationFields: UI_I_ErrorValidationField[]
     disabled?: boolean
     limitOptions?: UI_I_OptionItem[]
     multiply?: number
@@ -70,7 +71,7 @@ const binaryKeys: [string, string] =
   props.type === 'mb' ? ['mb', 'gb'] : ['mhz', 'ghz']
 
 const limitOptionsLocal = computed<UI_I_OptionItem[]>(
-  () => props.limitOptions || limitOptionsFunc(localization.value, binaryKeys)
+  () => props.limitOptions || limitOptionsFunc(localization.value, binaryKeys, props.min)
 )
 const limitTypeOptions = ref<UI_I_OptionItem[]>(
   limitTypeOptionsFunc(localization.value, binaryKeys)

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

@@ -3,12 +3,15 @@ import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 export const limitOptionsFunc = (
   localization: UI_I_Localization,
-  binaryKeys: [string, string]
+  binaryKeys: [string, string],
+  min: number
 ): UI_I_OptionItem[] => {
-  const min = binaryKeys[0] === 'mb' ? 2 : 1
+  // const min = binaryKeys[0] === 'mb' ? 2 : 1
   return [
     {
-      text: `${localization.common.minimum}: ${min} ${localization.common[binaryKeys[0]]}`,
+      text: `${localization.common.minimum}: ${min} ${
+        localization.common[binaryKeys[0]]
+      }`,
       value: { value: min, type: binaryKeys[0] },
     },
     {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/Memory.vue

@@ -3,6 +3,7 @@
   <div>
     <component
       :is="currentComponent"
+      v-model="model"
       v-model:selected-memory="selectedMemory"
       v-model:memory-type="memoryType"
       v-model:reservation="reservation"
@@ -231,6 +232,17 @@ watch(limit, (newValue) => {
   limit.value !== 'Unlimited' &&
     (limit.value = isNaN(valueInt) ? '0' : '' + valueInt)
 })
+
+watch(
+  () => model.value.memory.hotplug,
+  (newValue) => {
+    if (newValue && limit.value === 'Unlimited') {
+      limit.value = '' + selectedMemory.value
+      limitType.value = memoryType.value
+    }
+  }
+)
+
 const limitType = ref<string>('mb')
 const limitOptions = computed<UI_I_OptionItem[] | undefined>(() => {
   if (model.value.memory.hotplug)

package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/New.vue

@@ -53,6 +53,8 @@
         :error-validation-fields="props.errorValidationFields"
         :multiply="2"
         :disabled="props.isDisabled"
+        :max="model.memory.size_mb"
+        :min="0"
         component-type="memory"
         type="mb"
         class="memory-reservation"
@@ -66,6 +68,7 @@
         :limit-options="props.limitOptions"
         :multiply="2"
         :disabled="isDisabled"
+        :min="model.memory.reservation_mb"
         type="mb"
         component-type="memory"
         class="memory-limit"
@@ -84,7 +87,9 @@
 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>({ required: true })
 const selectedMemory = defineModel<number>('selectedMemory', {
   required: true,
 })
@@ -124,7 +129,7 @@ const props = defineProps<{
   isMemoryDisabled: boolean
   memoryTypeOptions: UI_I_OptionItem[]
   isDisabled: boolean
-  limitOptions: UI_I_OptionItem[]
+  limitOptions: UI_I_OptionItem[] | undefined
   isDisabledMemoryHotPlug: boolean
 }>()
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/Old.vue

@@ -67,6 +67,8 @@
           :error-validation-fields="props.errorValidationFields"
           :multiply="2"
           :disabled="props.isDisabled"
+          :max="model.memory.size_mb"
+          :min="0"
           component-type="memory"
           type="mb"
           class="memory-reservation"
@@ -80,6 +82,7 @@
           :limit-options="props.limitOptions"
           :multiply="2"
           :disabled="isDisabled"
+          :min="model.memory.reservation_mb"
           type="mb"
           component-type="memory"
           class="memory-limit"
@@ -99,7 +102,9 @@
 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>({ required: true })
 const selectedMemory = defineModel<number>('selectedMemory', {
   required: true,
 })
@@ -139,7 +144,7 @@ const props = defineProps<{
   isMemoryDisabled: boolean
   memoryTypeOptions: UI_I_OptionItem[]
   isDisabled: boolean
-  limitOptions: UI_I_OptionItem[]
+  limitOptions: UI_I_OptionItem[] | undefined
   isDisabledMemoryHotPlug: boolean
 }>()
 const emits = defineEmits<{
@@ -149,7 +154,6 @@ const emits = defineEmits<{
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-
 </script>
 
 <style scoped lang="scss"></style>

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

@@ -306,15 +306,17 @@ const isDisabledProvisioning = computed<boolean>(() => {
 const isDisabledSharing = computed<boolean>(() => {
   return isRunning.value && !isNewHardDisk.value
 })
-const isDisabledLimitIops = computed<boolean>(() => {
-  return isRunning.value && !isNewHardDisk.value
-})
+const isDisabledLimitIops = ref<boolean>(false)
+// const isDisabledLimitIops = computed<boolean>(() => {
+//   return isRunning.value && !isNewHardDisk.value
+// })
 const isDisabledMode = computed<boolean>(() => {
   return isRunning.value && !isNewHardDisk.value
 })
 const isDisabledCache = computed<boolean>(() => {
   if (isNewHardDisk.value) return false
-  return props.isEdit || isRunning.value
+  // return props.isEdit || isRunning.value
+  return isRunning.value
 })
 const isDisabledBus = computed<boolean>(() => {
   return !isNewHardDisk.value && isRunning.value

package/components/common/vm/actions/common/customizeHardware/virtualHardware/reservation/New.vue

@@ -106,6 +106,8 @@ const onSelectReservation = (value: number): void => {
 
   .ui-checkbox-label {
     min-height: unset !important;
+    height: max-content;
+    word-break: break-word;
   }
 }
 </style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/reservation/Reservation.vue

@@ -30,6 +30,8 @@ const props = withDefaults(
     type: 'mb' | 'mhz'
     componentType: string
     errorValidationFields: UI_I_ErrorValidationField[]
+    max: number
+    min: number
     disabled?: boolean
     reserveGuestMemory?: boolean
     multiply?: number
@@ -60,21 +62,16 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const binaryKeys: [string, string] =
   props.type === 'mb' ? ['mb', 'gb'] : ['mhz', 'ghz']
 
-const minReservation = props.type === 'mb' ? 2 : 0
-const maxReservation = props.type === 'mb' ? 16384 : 4794
+// const minReservation = props.type === 'mb' ? 2 : 0
+// const maxReservation = props.type === 'mb' ? 16384 : 4794
 const reservationOptions = computed<UI_I_OptionItem[]>(() => {
   const max = $binary.universalFromTo(
-    maxReservation,
+    props.max,
     binaryKeys[0],
     binaryKeys[1],
     5
   )
-  return reservationOptionsFunc(
-    localization.value,
-    minReservation,
-    max,
-    binaryKeys
-  )
+  return reservationOptionsFunc(localization.value, props.min, max, binaryKeys)
 })
 const onSelectReservation = ({
   value,
@@ -127,15 +124,15 @@ const reservationErrorLocalText = computed<string>(() => {
           binaryKeys[0],
           12
         )
-  if (value < minReservation || value > maxReservation) {
+  if (value < props.min || value > props.max) {
     return localization.value.common.reservationMustBe
       .replace(
         '{0}',
-        `${minReservation} ${localization.value.common[binaryKeys[0]]}`
+        `${props.min} ${localization.value.common[binaryKeys[0]]}`
       )
       .replace(
         '{1}',
-        `${maxReservation} ${localization.value.common[binaryKeys[0]]}`
+        `${props.max} ${localization.value.common[binaryKeys[0]]}`
       )
   }
 

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

@@ -135,17 +135,25 @@ const updateModelFromBootList = (bootItems: UI_I_BootItem[]): void => {
     if (!bootItem.isChecked) return
 
     if (bootItem.type === 'nic') {
-      const [networkName, indexStr] = bootItem.name.split('_')
+      // const [networkName, indexStr] = bootItem.name.split('_')
+      const lastIndex = bootItem.name.lastIndexOf('_')
+      const networkName = bootItem.name.slice(0, lastIndex)
+      const indexStr = bootItem.name.slice(lastIndex + 1)
       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 [source, indexStr] = bootItem.name.split('_')
+      const lastIndex = bootItem.name.lastIndexOf('_')
+      const source = bootItem.name.slice(0, lastIndex)
+      const indexStr = bootItem.name.slice(lastIndex + 1)
       const index = parseInt(indexStr, 10)
+
       const disk = model.value.disk_devices?.[index]
-      if (disk && disk.source+'' === source) {
+      if (disk && disk.source + '' === source) {
         disk.boot_order = currentOrder++
       }
     }

package/components/common/vm/actions/common/select/createType/lib/config/items.ts

@@ -19,7 +19,7 @@ export const itemsFunc = (
       disabled: false,
       testId: 'deploy-from-template',
       description: localization.vmWizard.deployFromTemplateDescription2,
-      permissions: 'VirtualMachines.DeployVmFromTemplate'
+      permissions: 'Templates.DeployVmFromTemplate'
     },
     // TODO 700
     // {