bfg-common 1.5.845 → 1.5.847

package/assets/localization/local_be.json

@@ -4004,5 +4004,11 @@
     "autostart": "Аўтазапуск",
     "enableAutostart": "Уключыць аўтазапуск",
     "disableAutostart": "Адключыць аўтазапуск"
+  },
+  "temp": {
+    "title": "Віртуальны metro storage кластар",
+    "stepTitle": "Выберыце зыходны хост",
+    "serverAddress": "Адрас сервера",
+    "fqdnOrIpAddress": "FQDN або IP-адрас"
   }
 }

package/assets/localization/local_en.json

@@ -4008,5 +4008,11 @@
     "autostart": "Autostart",
     "enableAutostart": "Enable autostart",
     "disableAutostart": "Disable autostart"
+  },
+  "temp": {
+    "title": "Virtual metro storage cluster",
+    "stepTitle": "Select source host",
+    "serverAddress": "Server Address",
+    "fqdnOrIpAddress": "FQDN or IP address"
   }
 }

package/assets/localization/local_hy.json

@@ -4008,5 +4008,11 @@
     "autostart": "Ավտոմատ մեկնարկ",
     "enableAutostart": "Միացնել ավտոմատ մեկնարկը",
     "disableAutostart": "Անջատել ավտոմատ մեկնարկը"
+  },
+  "temp": {
+    "title": "Վիրտուալ metro storage կլաստեր",
+    "stepTitle": "Ընտրեք աղբյուրի հոստ",
+    "serverAddress": "Սերվերի հասցե",
+    "fqdnOrIpAddress": "FQDN կամ IP հասցե"
   }
 }

package/assets/localization/local_kk.json

@@ -4007,5 +4007,11 @@
     "autostart": "Автожаңғалту",
     "enableAutostart": "Автожаңғалтуды қосу",
     "disableAutostart": "Автожаңғалтуды өшіру"
+  },
+  "temp": {
+    "title": "Виртуалды metro storage кластері",
+    "stepTitle": "Дереккөз хостты таңдаңыз",
+    "serverAddress": "Сервердің мекенжайы",
+    "fqdnOrIpAddress": "FQDN немесе IP-мекенжай"
   }
 }

package/assets/localization/local_ru.json

@@ -4007,5 +4007,11 @@
     "autostart": "Автозапуск",
     "enableAutostart": "Автозапуск вкл",
     "disableAutostart": "Автозапуск выкл"
+  },
+  "temp": {
+    "title": "Виртуальный metro storage кластер",
+    "stepTitle": "Выберите исходный хост",
+    "serverAddress": "Адрес сервера",
+    "fqdnOrIpAddress": "FQDN или IP-адрес"
   }
 }

package/assets/localization/local_zh.json

@@ -4005,5 +4005,11 @@
     "autostart": "自动启动",
     "enableAutostart": "启用自动启动",
     "disableAutostart": "禁用自动启动"
+  },
+  "temp": {
+    "title": "虚拟Metro存储集群",
+    "stepTitle": "选择源主机",
+    "serverAddress": "服务器地址",
+    "fqdnOrIpAddress": "FQDN或IP地址"
   }
 }

package/components/common/layout/theHeader/Old.vue

@@ -29,7 +29,7 @@
           >
         </nuxt-link>
       </div>
-      <form>
+      <form style="width: 100%; height: 100%" @click="onTemp">
         <atoms-input-search />
       </form>
 
@@ -146,6 +146,10 @@ const onUpdateLanguage = (language: string): void => {
 }
 
 const isShowFeedback = ref<boolean>(false)
+
+const onTemp = (): void => {
+  useLocalStorage('temp', true)
+}
 </script>
 
 <style scoped lang="scss">

package/components/common/monitor/advanced/tools/chartOptionsModal/lib/utils/checkSubmit.ts

@@ -1,7 +1,7 @@
 import type { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces'
 import {
   allowedHostCpuFieldNotObject,
-  allowedHostNetworkFieldNotObject,
+  // allowedHostNetworkFieldNotObject,
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/config'
 
 export const checkIsDisabledSubmit = (

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

@@ -59,8 +59,8 @@
           )"
           :key="props.hardDisksIndex[key]"
         >
-          <!--          TODO 111-->
-          <!--          v-model:vm-storage-policy="item.vm_storage_policy"-->
+<!--          TODO 111-->
+<!--          v-model:vm-storage-policy="item.vm_storage_policy"-->
           <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk
             v-model:size="item.size"
             v-model:provision-type="item.provision_type"

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

@@ -37,8 +37,8 @@
           )"
           :key="props.hardDisksIndex[key]"
         >
-          <!--          TODO 111-->
-          <!--          v-model:vm-storage-policy="item.vm_storage_policy"-->
+<!--          TODO 111-->
+<!--          v-model:vm-storage-policy="item.vm_storage_policy"-->
           <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk
             v-model:size="item.size"
             v-model:provision-type="item.provision_type"

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/sa/Sa.vue

@@ -1,170 +1,170 @@
-<template>
-  <div class="">
-    <atoms-stack-block :has-children="false">
-      <template #stackBlockKey>
-        {{ localization.common.schedulingAffinity }}
-      </template>
-      <template #stackBlockContent>
-        <div class="flex-space-between">
-          <div class="flex-align-center">
-            <atoms-tooltip-error
-              :has-error="!!errorText"
-              selector="#sa-edit-setting-input"
-              @remove="onRemoveValidationError"
-            >
-              <template #elem>
-                <input
-                  id="sa-edit-setting-input"
-                  v-model="schedulingAffinity"
-                  data-id="sa-edit-setting-input"
-                  type="text"
-                  class="edit-setting-input"
-                  @blur="onBlur"
-                />
-              </template>
-              <template #content>{{ errorText }}</template>
-            </atoms-tooltip-error>
-          </div>
-
-          <div id="sa-help-icon">
-            <atoms-the-icon
-              fill="#0072a3"
-              width="24px"
-              height="24px"
-              name="info-circle"
-              data-id="show-sa-help-icon"
-              @click.stop="isShowSaHelp = !isShowSaHelp"
-            />
-            <Teleport to="body">
-              <atoms-tooltip-signpost
-                v-if="isShowSaHelp"
-                elem-id="sa-help-icon"
-                @hide="isShowSaHelp = false"
-              >
-                <h3 class="sa-help-title">
-                  {{ localization.mainNavigation.help }}
-                </h3>
-
-                <p class="sa-help-text">
-                  {{ localization.common.schedulingAffinityHelpDescription1 }}
-                </p>
-                <p class="sa-help-text">
-                  {{ localization.common.schedulingAffinityHelpDescription2 }}
-                </p>
-                <p class="sa-help-text">
-                  {{ localization.common.schedulingAffinityHelpDescription3 }}
-                </p>
-                <p class="sa-help-text">
-                  <strong
-                    >{{ localization.common.hyperthreadingStatus }}:
-                  </strong>
-                  {{ localization.common.inactive }}
-                </p>
-                <!--                <p class="sa-help-text">-->
-                <!--                  <strong>{{ localization.common.availableCpus }}: </strong>-->
-                <!--                  8({{ localization.common.physicalCpus }})-->
-                <!--                </p>-->
-                <div
-                  v-for="item in numsLocal"
-                  :key="item.label"
-                  class="sa-help-text"
-                >
-                  <strong>{{ item.label }} </strong>
-                  <p>{{ item.value }}</p>
-                </div>
-              </atoms-tooltip-signpost>
-            </Teleport>
-          </div>
-        </div>
-      </template>
-    </atoms-stack-block>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { validateAffinityInput } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/sa/lib/utils/validation'
-import { groupConsecutiveNumbers } from '~/lib/utils/nums'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const schedulingAffinity = defineModel<string>({
-  required: true,
-})
-
-const props = defineProps<{
-  nums: any // для прокуратора
-}>()
-const emits = defineEmits<{
-  (event: 'invalid', value: boolean): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const isShowSaHelp = ref<boolean>(false)
-
-const numsLocal = computed<any>(() => {
-  const cpuTopology = []
-  for (const key in props.nums.cpu) {
-    cpuTopology.push({
-      label: `CPU NUMA ${+key + 1}`,
-      value:
-        'cores: ' +
-        groupConsecutiveNumbers(props.nums.cpu[key]) +
-        '; memory: ' +
-        props.nums.ram[key],
-    })
-  }
-  return cpuTopology
-})
-
-const errorText = ref<string>('')
-const onBlur = (): void => {
-  const cpuNums = []
-  for (const key in props.nums.cpu) {
-    cpuNums.push(...props.nums.cpu[key])
-  }
-  const validation = validateAffinityInput(
-    schedulingAffinity.value,
-    localization.value,
-    cpuNums
-  )
-
-  errorText.value = ''
-
-  if (!validation.isValid) {
-    errorText.value = validation.error
-  }
-}
-
-const isInvalid = computed<boolean>(() => !!errorText.value)
-watch(
-  isInvalid,
-  (newValue) => {
-    emits('invalid', newValue)
-  },
-  { immediate: true }
-)
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', 'cpu.temp') // TODO
-}
-</script>
-
-<style scoped lang="scss">
-h3.sa-help-title {
-  margin-top: 7px;
-  font-size: 22px;
-  color: #565656;
-}
-p.sa-help-text {
-  width: 310px;
-  margin-top: 24px;
-  font-size: 14px;
-  color: #565656;
-}
-p.sa-help-text strong {
-  font-size: 14px;
-  font-weight: bold;
-  color: #565656;
-}
-</style>
+<template>
+  <div class="">
+    <atoms-stack-block :has-children="false">
+      <template #stackBlockKey>
+        {{ localization.common.schedulingAffinity }}
+      </template>
+      <template #stackBlockContent>
+        <div class="flex-space-between">
+          <div class="flex-align-center">
+            <atoms-tooltip-error
+              :has-error="!!errorText"
+              selector="#sa-edit-setting-input"
+              @remove="onRemoveValidationError"
+            >
+              <template #elem>
+                <input
+                  id="sa-edit-setting-input"
+                  v-model="schedulingAffinity"
+                  data-id="sa-edit-setting-input"
+                  type="text"
+                  class="edit-setting-input"
+                  @blur="onBlur"
+                />
+              </template>
+              <template #content>{{ errorText }}</template>
+            </atoms-tooltip-error>
+          </div>
+
+          <div id="sa-help-icon">
+            <atoms-the-icon
+              fill="#0072a3"
+              width="24px"
+              height="24px"
+              name="info-circle"
+              data-id="show-sa-help-icon"
+              @click.stop="isShowSaHelp = !isShowSaHelp"
+            />
+            <Teleport to="body">
+              <atoms-tooltip-signpost
+                v-if="isShowSaHelp"
+                elem-id="sa-help-icon"
+                @hide="isShowSaHelp = false"
+              >
+                <h3 class="sa-help-title">
+                  {{ localization.mainNavigation.help }}
+                </h3>
+
+                <p class="sa-help-text">
+                  {{ localization.common.schedulingAffinityHelpDescription1 }}
+                </p>
+                <p class="sa-help-text">
+                  {{ localization.common.schedulingAffinityHelpDescription2 }}
+                </p>
+                <p class="sa-help-text">
+                  {{ localization.common.schedulingAffinityHelpDescription3 }}
+                </p>
+                <p class="sa-help-text">
+                  <strong
+                    >{{ localization.common.hyperthreadingStatus }}:
+                  </strong>
+                  {{ localization.common.inactive }}
+                </p>
+                <!--                <p class="sa-help-text">-->
+                <!--                  <strong>{{ localization.common.availableCpus }}: </strong>-->
+                <!--                  8({{ localization.common.physicalCpus }})-->
+                <!--                </p>-->
+                <div
+                  v-for="item in numsLocal"
+                  :key="item.label"
+                  class="sa-help-text"
+                >
+                  <strong>{{ item.label }} </strong>
+                  <p>{{ item.value }}</p>
+                </div>
+              </atoms-tooltip-signpost>
+            </Teleport>
+          </div>
+        </div>
+      </template>
+    </atoms-stack-block>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { validateAffinityInput } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/sa/lib/utils/validation'
+import { groupConsecutiveNumbers } from '~/lib/utils/nums'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const schedulingAffinity = defineModel<string>({
+  required: true,
+})
+
+const props = defineProps<{
+  nums: any // для прокуратора
+}>()
+const emits = defineEmits<{
+  (event: 'invalid', value: boolean): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const isShowSaHelp = ref<boolean>(false)
+
+const numsLocal = computed<any>(() => {
+  const cpuTopology = []
+  for (const key in props.nums.cpu) {
+    cpuTopology.push({
+      label: `CPU NUMA ${+key + 1}`,
+      value:
+        'cores: ' +
+        groupConsecutiveNumbers(props.nums.cpu[key]) +
+        '; memory: ' +
+        props.nums.ram[key],
+    })
+  }
+  return cpuTopology
+})
+
+const errorText = ref<string>('')
+const onBlur = (): void => {
+  const cpuNums = []
+  for (const key in props.nums.cpu) {
+    cpuNums.push(...props.nums.cpu[key])
+  }
+  const validation = validateAffinityInput(
+    schedulingAffinity.value,
+    localization.value,
+    cpuNums
+  )
+
+  errorText.value = ''
+
+  if (!validation.isValid) {
+    errorText.value = validation.error
+  }
+}
+
+const isInvalid = computed<boolean>(() => !!errorText.value)
+watch(
+  isInvalid,
+  (newValue) => {
+    emits('invalid', newValue)
+  },
+  { immediate: true }
+)
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', 'cpu.temp') // TODO
+}
+</script>
+
+<style scoped lang="scss">
+h3.sa-help-title {
+  margin-top: 7px;
+  font-size: 22px;
+  color: #565656;
+}
+p.sa-help-text {
+  width: 310px;
+  margin-top: 24px;
+  font-size: 14px;
+  color: #565656;
+}
+p.sa-help-text strong {
+  font-size: 14px;
+  font-weight: bold;
+  color: #565656;
+}
+</style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/sa/lib/utils/validation.ts

@@ -1,266 +1,266 @@
-// import type { UI_I_Localization } from '~/lib/models/interfaces'
-//
-// export const validateAffinityInput = (
-//   inputValue: string,
-//   localization: UI_I_Localization,
-//   availableCPUs = 8
-// ): any => {
-//   // Очищаем строку от пробелов
-//   const cleanedInput = inputValue.trim()
-//
-//   // Если строка пустая - привязка очищается (валидно)
-//   if (cleanedInput === '') {
-//     return {
-//       isValid: true,
-//       processors: [],
-//       error: null,
-//     }
-//   }
-//
-//   // Разделяем по запятым
-//   const parts = cleanedInput.split(',')
-//   const processors = new Set()
-//   const errors = []
-//
-//   // Регулярное выражение для проверки формата
-//   const singleRegex = /^\s*\d+\s*$/
-//   const rangeRegex = /^\s*(\d+)\s*-\s*(\d+)\s*$/
-//
-//   for (let i = 0; i < parts.length; i++) {
-//     const part = parts[i].trim()
-//
-//     if (part === '') {
-//       errors.push(localization.vmWizard.emptyElement.replace('{0}', `${i + 1}`))
-//       continue
-//     }
-//
-//     // Проверяем, является ли часть одиночным числом
-//     if (singleRegex.test(part)) {
-//       const cpuNum = parseInt(part, 10)
-//
-//       if (cpuNum < 0 || cpuNum >= availableCPUs) {
-//         errors.push(
-//           localization.vmWizard.cpuOutOfRange
-//             .replace('{0}', `${cpuNum}`)
-//             .replace('{1}', `${availableCPUs - 1}`)
-//         )
-//         continue
-//       }
-//
-//       if (processors.has(cpuNum)) {
-//         errors.push(
-//           localization.vmWizard.cpuDuplicate.replace('{0}', `${cpuNum}`)
-//         )
-//         continue
-//       }
-//
-//       processors.add(cpuNum)
-//     }
-//     // Проверяем, является ли часть диапазоном
-//     else if (rangeRegex.test(part)) {
-//       const match = part.match(rangeRegex)
-//       const start = parseInt(match[1], 10)
-//       const end = parseInt(match[2], 10)
-//
-//       if (start > end) {
-//         errors.push(
-//           localization.vmWizard.invalidRange.replace('{0}', `${part}`)
-//         )
-//         continue
-//       }
-//
-//       if (start < 0 || start >= availableCPUs) {
-//         errors.push(
-//           localization.vmWizard.rangeStartOutOfRange
-//             .replace('{0}', `${start}`)
-//             .replace('{1}', `${availableCPUs - 1}`)
-//         )
-//         continue
-//       }
-//
-//       if (end < 0 || end >= availableCPUs) {
-//         errors.push(
-//           localization.vmWizard.rangeEndOutOfRange
-//             .replace('{0}', `${end}`)
-//             .replace('{1}', `${availableCPUs - 1}`)
-//         )
-//         continue
-//       }
-//
-//       // Добавляем все процессоры из диапазона
-//       for (let cpu = start; cpu <= end; cpu++) {
-//         if (processors.has(cpu)) {
-//           errors.push(
-//             localization.vmWizard.rangeDuplicate.replace('{0}', `${cpu}`)
-//           )
-//         } else {
-//           processors.add(cpu)
-//         }
-//       }
-//     }
-//     // Неизвестный формат
-//     else {
-//       errors.push(localization.vmWizard.invalidFormat.replace('{0}', `${part}`))
-//     }
-//   }
-//
-//   return {
-//     processors, // TODO remove this one
-//     isValid: errors.length === 0,
-//     error: errors.length > 0 ? errors.join('; ') : null,
-//   }
-// }
-
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import {groupConsecutiveNumbers} from "~/lib/utils/nums";
-
-export const validateAffinityInput = (
-  inputValue: string,
-  localization: UI_I_Localization,
-  availableCPUs: number[] = []
-): any => {
-  const cleanedInput = inputValue?.trim() || ''
-
-  if (cleanedInput === '') {
-    return {
-      isValid: true,
-      processors: [],
-      error: null,
-    }
-  }
-
-  const availableCPUSet = new Set(availableCPUs)
-  // const maxAvailableCPU = availableCPUs.length > 0
-  //     ? Math.max(...availableCPUs)
-  //     : 0
-
-  const parts = cleanedInput.split(',')
-  const processors = new Set()
-  const errors = []
-
-  const singleRegex = /^\s*\d+\s*$/
-  const rangeRegex = /^\s*(\d+)\s*-\s*(\d+)\s*$/
-
-  for (let i = 0; i < parts.length; i++) {
-    const part = parts[i].trim()
-
-    if (part === '') {
-      errors.push(localization.vmWizard.emptyElement.replace('{0}', `${i + 1}`))
-      continue
-    }
-
-    if (singleRegex.test(part)) {
-      const cpuNum = parseInt(part, 10)
-
-      if (!availableCPUSet.has(cpuNum)) {
-        const availableList =
-          availableCPUs.length > 0
-            ? groupConsecutiveNumbers(availableCPUs.sort((a, b) => a - b))
-            : 'нет доступных'
-
-        errors.push(
-          localization.vmWizard.cpuOutOfRange
-            .replace('{0}', `${cpuNum}`)
-            .replace('{1}', availableList)
-        )
-        continue
-      }
-
-      if (processors.has(cpuNum)) {
-        errors.push(
-          localization.vmWizard.cpuDuplicate.replace('{0}', `${cpuNum}`)
-        )
-        continue
-      }
-
-      processors.add(cpuNum)
-    }
-    // Проверяем, является ли часть диапазоном
-    else if (rangeRegex.test(part)) {
-      const match = part.match(rangeRegex)
-      const start = parseInt(match[1], 10)
-      const end = parseInt(match[2], 10)
-
-      if (start > end) {
-        errors.push(
-          localization.vmWizard.invalidRange.replace('{0}', `${part}`)
-        )
-        continue
-      }
-
-      // Проверяем доступность начала диапазона
-      if (!availableCPUSet.has(start)) {
-        const availableList =
-          availableCPUs.length > 0
-            ? availableCPUs.sort((a, b) => a - b).join(', ')
-            : 'нет доступных'
-
-        errors.push(
-          localization.vmWizard.rangeStartOutOfRange
-            .replace('{0}', `${start}`)
-            .replace('{1}', availableList)
-        )
-        continue
-      }
-
-      // Проверяем доступность конца диапазона
-      if (!availableCPUSet.has(end)) {
-        const availableList =
-          availableCPUs.length > 0
-            ? availableCPUs.sort((a, b) => a - b).join(', ')
-            : 'нет доступных'
-
-        errors.push(
-          localization.vmWizard.rangeEndOutOfRange
-            .replace('{0}', `${end}`)
-            .replace('{1}', availableList)
-        )
-        continue
-      }
-
-      // Проверяем все процессоры в диапазоне
-      let hasInvalidInRange = false
-      for (let cpu = start; cpu <= end; cpu++) {
-        if (!availableCPUSet.has(cpu)) {
-          const availableList =
-            availableCPUs.length > 0
-              ? availableCPUs.sort((a, b) => a - b).join(', ')
-              : 'нет доступных'
-
-          errors.push(
-            localization.vmWizard.cpuOutOfRange
-              .replace('{0}', `${cpu}`)
-              .replace('{1}', availableList)
-          )
-          hasInvalidInRange = true
-        }
-      }
-
-      // Если в диапазоне есть недоступные CPU, пропускаем добавление
-      if (hasInvalidInRange) {
-        continue
-      }
-
-      // Добавляем все процессоры из диапазона
-      for (let cpu = start; cpu <= end; cpu++) {
-        if (processors.has(cpu)) {
-          errors.push(
-            localization.vmWizard.rangeDuplicate.replace('{0}', `${cpu}`)
-          )
-        } else {
-          processors.add(cpu)
-        }
-      }
-    }
-    // Неизвестный формат
-    else {
-      errors.push(localization.vmWizard.invalidFormat.replace('{0}', `${part}`))
-    }
-  }
-
-  return {
-    processors: Array.from(processors), // Конвертируем Set в массив
-    isValid: errors.length === 0,
-    error: errors.length > 0 ? errors.join('; ') : null,
-  }
-}
+// import type { UI_I_Localization } from '~/lib/models/interfaces'
+//
+// export const validateAffinityInput = (
+//   inputValue: string,
+//   localization: UI_I_Localization,
+//   availableCPUs = 8
+// ): any => {
+//   // Очищаем строку от пробелов
+//   const cleanedInput = inputValue.trim()
+//
+//   // Если строка пустая - привязка очищается (валидно)
+//   if (cleanedInput === '') {
+//     return {
+//       isValid: true,
+//       processors: [],
+//       error: null,
+//     }
+//   }
+//
+//   // Разделяем по запятым
+//   const parts = cleanedInput.split(',')
+//   const processors = new Set()
+//   const errors = []
+//
+//   // Регулярное выражение для проверки формата
+//   const singleRegex = /^\s*\d+\s*$/
+//   const rangeRegex = /^\s*(\d+)\s*-\s*(\d+)\s*$/
+//
+//   for (let i = 0; i < parts.length; i++) {
+//     const part = parts[i].trim()
+//
+//     if (part === '') {
+//       errors.push(localization.vmWizard.emptyElement.replace('{0}', `${i + 1}`))
+//       continue
+//     }
+//
+//     // Проверяем, является ли часть одиночным числом
+//     if (singleRegex.test(part)) {
+//       const cpuNum = parseInt(part, 10)
+//
+//       if (cpuNum < 0 || cpuNum >= availableCPUs) {
+//         errors.push(
+//           localization.vmWizard.cpuOutOfRange
+//             .replace('{0}', `${cpuNum}`)
+//             .replace('{1}', `${availableCPUs - 1}`)
+//         )
+//         continue
+//       }
+//
+//       if (processors.has(cpuNum)) {
+//         errors.push(
+//           localization.vmWizard.cpuDuplicate.replace('{0}', `${cpuNum}`)
+//         )
+//         continue
+//       }
+//
+//       processors.add(cpuNum)
+//     }
+//     // Проверяем, является ли часть диапазоном
+//     else if (rangeRegex.test(part)) {
+//       const match = part.match(rangeRegex)
+//       const start = parseInt(match[1], 10)
+//       const end = parseInt(match[2], 10)
+//
+//       if (start > end) {
+//         errors.push(
+//           localization.vmWizard.invalidRange.replace('{0}', `${part}`)
+//         )
+//         continue
+//       }
+//
+//       if (start < 0 || start >= availableCPUs) {
+//         errors.push(
+//           localization.vmWizard.rangeStartOutOfRange
+//             .replace('{0}', `${start}`)
+//             .replace('{1}', `${availableCPUs - 1}`)
+//         )
+//         continue
+//       }
+//
+//       if (end < 0 || end >= availableCPUs) {
+//         errors.push(
+//           localization.vmWizard.rangeEndOutOfRange
+//             .replace('{0}', `${end}`)
+//             .replace('{1}', `${availableCPUs - 1}`)
+//         )
+//         continue
+//       }
+//
+//       // Добавляем все процессоры из диапазона
+//       for (let cpu = start; cpu <= end; cpu++) {
+//         if (processors.has(cpu)) {
+//           errors.push(
+//             localization.vmWizard.rangeDuplicate.replace('{0}', `${cpu}`)
+//           )
+//         } else {
+//           processors.add(cpu)
+//         }
+//       }
+//     }
+//     // Неизвестный формат
+//     else {
+//       errors.push(localization.vmWizard.invalidFormat.replace('{0}', `${part}`))
+//     }
+//   }
+//
+//   return {
+//     processors, // TODO remove this one
+//     isValid: errors.length === 0,
+//     error: errors.length > 0 ? errors.join('; ') : null,
+//   }
+// }
+
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import {groupConsecutiveNumbers} from "~/lib/utils/nums";
+
+export const validateAffinityInput = (
+  inputValue: string,
+  localization: UI_I_Localization,
+  availableCPUs: number[] = []
+): any => {
+  const cleanedInput = inputValue?.trim() || ''
+
+  if (cleanedInput === '') {
+    return {
+      isValid: true,
+      processors: [],
+      error: null,
+    }
+  }
+
+  const availableCPUSet = new Set(availableCPUs)
+  // const maxAvailableCPU = availableCPUs.length > 0
+  //     ? Math.max(...availableCPUs)
+  //     : 0
+
+  const parts = cleanedInput.split(',')
+  const processors = new Set()
+  const errors = []
+
+  const singleRegex = /^\s*\d+\s*$/
+  const rangeRegex = /^\s*(\d+)\s*-\s*(\d+)\s*$/
+
+  for (let i = 0; i < parts.length; i++) {
+    const part = parts[i].trim()
+
+    if (part === '') {
+      errors.push(localization.vmWizard.emptyElement.replace('{0}', `${i + 1}`))
+      continue
+    }
+
+    if (singleRegex.test(part)) {
+      const cpuNum = parseInt(part, 10)
+
+      if (!availableCPUSet.has(cpuNum)) {
+        const availableList =
+          availableCPUs.length > 0
+            ? groupConsecutiveNumbers(availableCPUs.sort((a, b) => a - b))
+            : 'нет доступных'
+
+        errors.push(
+          localization.vmWizard.cpuOutOfRange
+            .replace('{0}', `${cpuNum}`)
+            .replace('{1}', availableList)
+        )
+        continue
+      }
+
+      if (processors.has(cpuNum)) {
+        errors.push(
+          localization.vmWizard.cpuDuplicate.replace('{0}', `${cpuNum}`)
+        )
+        continue
+      }
+
+      processors.add(cpuNum)
+    }
+    // Проверяем, является ли часть диапазоном
+    else if (rangeRegex.test(part)) {
+      const match = part.match(rangeRegex)
+      const start = parseInt(match[1], 10)
+      const end = parseInt(match[2], 10)
+
+      if (start > end) {
+        errors.push(
+          localization.vmWizard.invalidRange.replace('{0}', `${part}`)
+        )
+        continue
+      }
+
+      // Проверяем доступность начала диапазона
+      if (!availableCPUSet.has(start)) {
+        const availableList =
+          availableCPUs.length > 0
+            ? availableCPUs.sort((a, b) => a - b).join(', ')
+            : 'нет доступных'
+
+        errors.push(
+          localization.vmWizard.rangeStartOutOfRange
+            .replace('{0}', `${start}`)
+            .replace('{1}', availableList)
+        )
+        continue
+      }
+
+      // Проверяем доступность конца диапазона
+      if (!availableCPUSet.has(end)) {
+        const availableList =
+          availableCPUs.length > 0
+            ? availableCPUs.sort((a, b) => a - b).join(', ')
+            : 'нет доступных'
+
+        errors.push(
+          localization.vmWizard.rangeEndOutOfRange
+            .replace('{0}', `${end}`)
+            .replace('{1}', availableList)
+        )
+        continue
+      }
+
+      // Проверяем все процессоры в диапазоне
+      let hasInvalidInRange = false
+      for (let cpu = start; cpu <= end; cpu++) {
+        if (!availableCPUSet.has(cpu)) {
+          const availableList =
+            availableCPUs.length > 0
+              ? availableCPUs.sort((a, b) => a - b).join(', ')
+              : 'нет доступных'
+
+          errors.push(
+            localization.vmWizard.cpuOutOfRange
+              .replace('{0}', `${cpu}`)
+              .replace('{1}', availableList)
+          )
+          hasInvalidInRange = true
+        }
+      }
+
+      // Если в диапазоне есть недоступные CPU, пропускаем добавление
+      if (hasInvalidInRange) {
+        continue
+      }
+
+      // Добавляем все процессоры из диапазона
+      for (let cpu = start; cpu <= end; cpu++) {
+        if (processors.has(cpu)) {
+          errors.push(
+            localization.vmWizard.rangeDuplicate.replace('{0}', `${cpu}`)
+          )
+        } else {
+          processors.add(cpu)
+        }
+      }
+    }
+    // Неизвестный формат
+    else {
+      errors.push(localization.vmWizard.invalidFormat.replace('{0}', `${part}`))
+    }
+  }
+
+  return {
+    processors: Array.from(processors), // Конвертируем Set в массив
+    isValid: errors.length === 0,
+    error: errors.length > 0 ? errors.join('; ') : null,
+  }
+}

package/components/common/vm/actions/editSettings/EditSettings.vue

@@ -90,7 +90,7 @@ const props = withDefaults(
     mediatedDevices: undefined,
     capabilities: undefined,
     isVmt: undefined,
-    nums: []
+    nums: null
   }
 )
 

package/lib/utils/nums.ts

@@ -1,27 +1,27 @@
-export const groupConsecutiveNumbers = (numbers: number[]): string => {
-  if (!numbers || numbers.length === 0) {
-    return ''
-  }
-
-  const sorted = [...new Set(numbers)].sort((a, b) => a - b)
-
-  const result = sorted.reduce((acc, num, index, arr) => {
-    if (index === 0) {
-      acc.push([num])
-    } else if (num === arr[index - 1] + 1) {
-      acc[acc.length - 1].push(num)
-    } else {
-      acc.push([num])
-    }
-    return acc
-  }, [])
-
-  return result
-    .map((range) => {
-      if (range.length === 1) {
-        return range[0].toString()
-      }
-      return `${range[0]}-${range[range.length - 1]}`
-    })
-    .join(', ')
-}
+export const groupConsecutiveNumbers = (numbers: number[]): string => {
+  if (!numbers || numbers.length === 0) {
+    return ''
+  }
+
+  const sorted = [...new Set(numbers)].sort((a, b) => a - b)
+
+  const result = sorted.reduce((acc, num, index, arr) => {
+    if (index === 0) {
+      acc.push([num])
+    } else if (num === arr[index - 1] + 1) {
+      acc[acc.length - 1].push(num)
+    } else {
+      acc.push([num])
+    }
+    return acc
+  }, [])
+
+  return result
+    .map((range) => {
+      if (range.length === 1) {
+        return range[0].toString()
+      }
+      return `${range[0]}-${range[range.length - 1]}`
+    })
+    .join(', ')
+}

package/package.json

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