bfg-common 1.5.449 → 1.5.451

package/assets/localization/local_be.json

@@ -2134,6 +2134,7 @@
     "loginZabbixAccount": "Увайдзіце на Сервер Zabbix",
     "newView": "Новы выгляд",
     "viewDesc": "Выберыце прагляд, які будзе выкарыстоўвацца кліентам {trademark}",
+    "emptyNameValidationDescription": "Імя не павінна быць пустым",
     "kindValidationDescription": "Няправільны тып запісу",
     "alert": "Трывога",
     "noTargetToScanIsSelected": "Мэта для сканавання не абраная.",

package/assets/localization/local_en.json

@@ -2137,6 +2137,7 @@
     "loginZabbixAccount": "Login to Zabbix Server",
     "newView": "New view",
     "viewDesc": "Select view to be used by {trademark} Client",
+    "emptyNameValidationDescription": "Name should not be empty",
     "kindValidationDescription": "Invalid record kind",
     "alert": "Alert",
     "noTargetToScanIsSelected": "No target to scan is selected.",

package/assets/localization/local_hy.json

@@ -2137,6 +2137,7 @@
     "loginZabbixAccount": "Մուտք գործեք Zabbix Սերվեր",
     "newView": "Նոր տեսարան",
     "viewDesc": "Ընտրեք տեսքը, որը կօգտագործվի {trademark} Client-ի կողմից",
+    "emptyNameValidationDescription": "Անունը դատարկ չպետք է լինի",
     "kindValidationDescription": "Գրառման անվավեր տեսակ",
     "alert": "Անհանգստություն",
     "noTargetToScanIsSelected": "Սկանավորման թիրախը ընտրված չէ:",

package/assets/localization/local_kk.json

@@ -2136,6 +2136,7 @@
     "loginZabbixAccount": "Zabbix Серверіне кіріңіз",
     "newView": "Жаңа көрініс",
     "viewDesc": "{trademark} Client пайдаланатын көріністі таңдаңыз",
+    "emptyNameValidationDescription": "Аты бос болмауы керек",
     "kindValidationDescription": "Жарамсыз жазба түрі",
     "alert": "Ескерту",
     "noTargetToScanIsSelected": "Сканерлеуге арналған мақсат таңдалмаған.",

package/assets/localization/local_ru.json

@@ -2136,6 +2136,7 @@
     "loginZabbixAccount": "Вход на Сервер Zabbix",
     "newView": "Новый вид",
     "viewDesc": "Выберите представление, которое будет использоваться клиентом {trademark}.",
+    "emptyNameValidationDescription": "Имя не должно быть пустым",
     "kindValidationDescription": "Неверный тип записи",
     "alert": "Тревога",
     "noTargetToScanIsSelected": "Цель для сканирования не выбрана.",

package/assets/localization/local_zh.json

@@ -2135,6 +2135,7 @@
     "loginZabbixAccount": "登录Zabbix服务器",
     "newView": "新观点",
     "viewDesc": "选择 {trademark} 客户端要使用的视图",
+    "emptyNameValidationDescription": "名称不能为空",
     "kindValidationDescription": "记录类型无效",
     "alert": "警报",
     "noTargetToScanIsSelected": "未选择要扫描的目标。",

package/assets/scss/clarity/local_ar.json

@@ -2076,6 +2076,7 @@
     "loginZabbixAccount": "تسجيل الدخول إلى خادم Zabbix",
     "newView": "عرض جديد",
     "viewDesc": "حدد العرض الذي سيستخدمه عميل {trademark}",
+    "emptyNameValidationDescription": "الاسم لا يجب أن يكون فارغًا",
     "kindValidationDescription": "نوع السجل غير صالح",
     "alert": "تنبيه",
     "noTargetToScanIsSelected": "لم يتم تحديد أي هدف للفحص.",

package/assets/scss/common/normalize.scss

@@ -32,6 +32,10 @@ html:not(.is-new-view) {
   }
 }
 
+body {
+  overflow: hidden;
+}
+
 * button:focus {
   outline: none;
 }

package/components/common/pages/backups/modals/createBackup/general/General.vue

@@ -73,6 +73,12 @@ const checkNameIsValid = async (name: string): Promise<boolean> => {
       cb: (error): void => {
         const status = error?.statusCode || 200
         switch (status) {
+          case 400: // Empty name
+            showValidationErrors([
+              localization.value.common.emptyNameValidationDescription,
+            ])
+            resolve(false)
+            break
           case 405: // Invalid kind
             showValidationErrors([
               localization.value.common.kindValidationDescription,

package/components/common/pages/backups/modals/restore/name/Name.vue

@@ -74,6 +74,12 @@ const checkNameIsValid = async (name: string): Promise<boolean> => {
       cb: (error): void => {
         const status = error?.statusCode || 200
         switch (status) {
+          case 400: // Empty name
+            showValidationErrors([
+              localization.value.common.emptyNameValidationDescription,
+            ])
+            resolve(false)
+            break
           case 405: // Invalid kind
             showValidationErrors([
               localization.value.common.kindValidationDescription,

package/components/common/vm/actions/common/select/name/Name.vue

@@ -1,182 +1,190 @@
-<template>
-  <common-vm-actions-common-select-name-new
-    v-if="isNewView"
-    v-model:vm-name="vmName"
-    v-model:is-show-help="isShowHelp"
-    :project="props.project"
-    :errors="errors"
-    :data-center="props.dataCenter"
-    @remove-validation-errors="onRemoveValidationErrors"
-    @select-node="onSelectNode"
-  />
-  <common-vm-actions-common-select-name-old
-    v-else
-    v-model:vm-name="vmName"
-    v-model:is-show-help="isShowHelp"
-    :project="props.project"
-    :errors="errors"
-    :data-center="props.dataCenter"
-    @remove-validation-errors="onRemoveValidationErrors"
-    @select-node="onSelectNode"
-  />
-</template>
-
-<script setup lang="ts">
-// import { API_UI_I_Error } from '~/lib/models/store/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    nameFormSubmit: null | Function
-    show: boolean
-    project: UI_T_Project
-    dataCenter?: UI_I_TreeNode // для сферы
-    existName?: string
-  }>(),
-  {
-    dataCenter: undefined,
-    existName: undefined,
-  }
-)
-const emits = defineEmits<{
-  (event: 'submit', value: [string, UI_I_TreeNode | null]): void
-  (event: 'loading', value: boolean): void
-  (
-    event: 'check-name',
-    value: [[string, UI_I_TreeNode | null], (error: any) => void]
-  ): void
-  (event: 'has-errors', value: boolean): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-// TODO 100
-const vmName = ref<string>(props.existName || '')
-
-const selectedNode = ref<UI_I_TreeNode | null>(null)
-const onSelectNode = (node: UI_I_TreeNode): void => {
-  selectedNode.value = node
-}
-
-watch(
-  () => props.nameFormSubmit,
-  (newValue) => {
-    newValue && submit(newValue)
-  }
-)
-
-const isParentDatacenter = (node: UI_I_TreeNode | null): boolean => {
-  if (!node) return false
-
-  if (node.parent?.type === 'datacenter') return true
-  if (node.parent?.type === 'folder') return isParentDatacenter(node.parent)
-  return false
-}
-const submit = async (cb: Function): Promise<void> => {
-  const name = vmName.value
-
-  if (name !== '') {
-    const isNameValid = await checkNameIsValid(name)
-    if (!isNameValid) {
-      cb(false)
-      return
-    }
-  }
-
-  if (props.project === 'sphere') {
-    // const isDatacenterFolder = isParentDatacenter(selectedNode.value)
-
-    if (
-      // selectedNode.value?.type !== 'datacenter' &&
-      // selectedNode.value?.type === 'folder' &&
-      // !isDatacenterFolder
-      // TODO рефакторинг, здесь сейчас проверяем является ли выбранный элемент датацентром или папкой(вм)
-      ![3, 7].includes(selectedNode.value?.kind)
-    ) {
-      showValidationErrors([
-        localization.value.common.enterValidLocationVirtualMachine,
-      ])
-      cb(false)
-      return
-    }
-  }
-
-  onRemoveValidationErrors()
-  emits('submit', [name, selectedNode.value])
-  cb(true)
-}
-const checkNameIsValid = async (name: string): Promise<boolean> => {
-  emits('loading', true)
-
-  return new Promise((resolve) => {
-    emits('check-name', [
-      [name, selectedNode.value],
-      (error) => {
-        emits('loading', false)
-
-        const status = error?.statusCode || 200
-        switch (status) {
-          case 405: // Invalid kind
-            showValidationErrors([
-              localization.value.common.kindValidationDescription,
-            ])
-            resolve(false)
-            break
-          case 406: // Invalid name
-            showValidationErrors([
-              localization.value.common.vmNameValidationDescription,
-            ])
-            resolve(false)
-            break
-          case 409: // Name exist
-            showValidationErrors([
-              localization.value.common.vmNameExistInSelectedLocation,
-            ])
-            resolve(false)
-            break
-        }
-
-        resolve(true)
-      },
-    ])
-  })
-}
-
-const errors = ref<string[]>([])
-const showValidationErrors = (data: string[]): void => {
-  errors.value = data
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
-watch(
-  errors,
-  (newValue) => {
-    emits('has-errors', !newValue.length)
-  },
-  { immediate: true, deep: true }
-)
-
-watch(
-  () => props.show,
-  (newValue) => {
-    if (!newValue) return
-
-    const input = document.getElementById('virtual-machine-name')
-    if (!input) return
-
-    setTimeout(() => {
-      input.focus()
-    }, 0)
-  }
-)
-
-const isShowHelp = ref<boolean>(false)
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-vm-actions-common-select-name-new
+    v-if="isNewView"
+    v-model:vm-name="vmName"
+    v-model:is-show-help="isShowHelp"
+    :project="props.project"
+    :errors="errors"
+    :data-center="props.dataCenter"
+    @remove-validation-errors="onRemoveValidationErrors"
+    @select-node="onSelectNode"
+  />
+  <common-vm-actions-common-select-name-old
+    v-else
+    v-model:vm-name="vmName"
+    v-model:is-show-help="isShowHelp"
+    :project="props.project"
+    :errors="errors"
+    :data-center="props.dataCenter"
+    @remove-validation-errors="onRemoveValidationErrors"
+    @select-node="onSelectNode"
+  />
+</template>
+
+<script setup lang="ts">
+// import { API_UI_I_Error } from '~/lib/models/store/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    nameFormSubmit: null | Function
+    show: boolean
+    project: UI_T_Project
+    validateEmptyName?: boolean
+    dataCenter?: UI_I_TreeNode // для сферы
+    existName?: string
+  }>(),
+  {
+    validateEmptyName: false,
+    dataCenter: undefined,
+    existName: undefined,
+  }
+)
+const emits = defineEmits<{
+  (event: 'submit', value: [string, UI_I_TreeNode | null]): void
+  (event: 'loading', value: boolean): void
+  (
+    event: 'check-name',
+    value: [[string, UI_I_TreeNode | null], (error: any) => void]
+  ): void
+  (event: 'has-errors', value: boolean): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+// TODO 100
+const vmName = ref<string>(props.existName || '')
+
+const selectedNode = ref<UI_I_TreeNode | null>(null)
+const onSelectNode = (node: UI_I_TreeNode): void => {
+  selectedNode.value = node
+}
+
+watch(
+  () => props.nameFormSubmit,
+  (newValue) => {
+    newValue && submit(newValue)
+  }
+)
+
+const isParentDatacenter = (node: UI_I_TreeNode | null): boolean => {
+  if (!node) return false
+
+  if (node.parent?.type === 'datacenter') return true
+  if (node.parent?.type === 'folder') return isParentDatacenter(node.parent)
+  return false
+}
+const submit = async (cb: Function): Promise<void> => {
+  const name = vmName.value
+
+  if (name !== '' || props.validateEmptyName) {
+    const isNameValid = await checkNameIsValid(name)
+    if (!isNameValid) {
+      cb(false)
+      return
+    }
+  }
+
+  if (props.project === 'sphere') {
+    // const isDatacenterFolder = isParentDatacenter(selectedNode.value)
+
+    if (
+      // selectedNode.value?.type !== 'datacenter' &&
+      // selectedNode.value?.type === 'folder' &&
+      // !isDatacenterFolder
+      // TODO рефакторинг, здесь сейчас проверяем является ли выбранный элемент датацентром или папкой(вм)
+      ![3, 7].includes(selectedNode.value?.kind)
+    ) {
+      showValidationErrors([
+        localization.value.common.enterValidLocationVirtualMachine,
+      ])
+      cb(false)
+      return
+    }
+  }
+
+  onRemoveValidationErrors()
+  emits('submit', [name, selectedNode.value])
+  cb(true)
+}
+const checkNameIsValid = async (name: string): Promise<boolean> => {
+  emits('loading', true)
+
+  return new Promise((resolve) => {
+    emits('check-name', [
+      [name, selectedNode.value],
+      (error) => {
+        emits('loading', false)
+
+        const status = error?.statusCode || 200
+        switch (status) {
+          case 400: // Empty name
+            showValidationErrors([
+              localization.value.common.emptyNameValidationDescription,
+            ])
+            resolve(false)
+            break
+          case 405: // Invalid kind
+            showValidationErrors([
+              localization.value.common.kindValidationDescription,
+            ])
+            resolve(false)
+            break
+          case 406: // Invalid name
+            showValidationErrors([
+              localization.value.common.vmNameValidationDescription,
+            ])
+            resolve(false)
+            break
+          case 409: // Name exist
+            showValidationErrors([
+              localization.value.common.vmNameExistInSelectedLocation,
+            ])
+            resolve(false)
+            break
+        }
+
+        resolve(true)
+      },
+    ])
+  })
+}
+
+const errors = ref<string[]>([])
+const showValidationErrors = (data: string[]): void => {
+  errors.value = data
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
+}
+watch(
+  errors,
+  (newValue) => {
+    emits('has-errors', !newValue.length)
+  },
+  { immediate: true, deep: true }
+)
+
+watch(
+  () => props.show,
+  (newValue) => {
+    if (!newValue) return
+
+    const input = document.getElementById('virtual-machine-name')
+    if (!input) return
+
+    setTimeout(() => {
+      input.focus()
+    }, 0)
+  }
+)
+
+const isShowHelp = ref<boolean>(false)
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/vmt/actions/add/Old.vue

@@ -28,6 +28,7 @@
             :show="selectedStep.id === props.dynamicSteps.selectName"
             :name-form-submit="props.nameFormSubmit"
             :project="props.project"
+            validate-empty-name
             @submit="emits('change-name', ...$event)"
             @check-name="emits('check-name', $event)"
           />

package/components/common/wizards/vm/migrate/select/priority/lib/config/typeOptions.ts

@@ -12,12 +12,12 @@ export const vmMigrateSelectPriorityTypesFunc = (
       disabled: vmState !== 2,
       description: localization.migrateVm.liveMigrationDesc,
     },
-    {
-      label: localization.migrateVm.ramSuspendMigration,
-      value: 'ram-suspend',
-      disabled: vmState !== 2,
-      description: localization.migrateVm.ramSuspendMigrationDesc,
-    },
+    // {
+    //   label: localization.migrateVm.ramSuspendMigration,
+    //   value: 'ram-suspend',
+    //   disabled: vmState !== 2,
+    //   description: localization.migrateVm.ramSuspendMigrationDesc,
+    // },
     {
       label: localization.migrateVm.offlineMigration,
       value: 'offline',

package/package.json

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