bfg-common 1.2.198 → 1.2.200

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

@@ -55,7 +55,7 @@ import { UI_T_Project } from '~/models/types'
 import { UI_I_TreeNode } from '~/components/common/recursionTree/models/interfaces'
 
 const props = defineProps<{
-  nameFormSubmit: null | Function
+  nameFormSubmit: number
   show: boolean
   project: UI_T_Project
   dataCenter?: UI_I_TreeNode // для сферы
@@ -80,8 +80,8 @@ const onSelectNode = (node: UI_I_TreeNode): void => {
 
 watch(
   () => props.nameFormSubmit,
-  (newValue) => {
-    newValue && submit(newValue)
+  () => {
+    submit()
   }
 )
 
@@ -92,15 +92,12 @@ const isParentDatacenter = (node: UI_I_TreeNode | null): boolean => {
   if (node.parent?.type === 'folder') return isParentDatacenter(node.parent)
   return false
 }
-const submit = async (cb: Function): Promise<void> => {
+const submit = async (): Promise<void> => {
   const name = vmName.value
 
   if (name !== '') {
     const isNameValid = await checkNameIsValid(name)
-    if (!isNameValid) {
-      cb(false)
-      return
-    }
+    if (!isNameValid) return
   }
 
   if (props.project === 'sphere') {
@@ -114,14 +111,12 @@ const submit = async (cb: Function): Promise<void> => {
       showValidationErrors([
         localization.value.enterValidLocationVirtualMachine,
       ])
-      cb(false)
       return
     }
   }
 
   onRemoveValidationErrors()
   emits('submit', [name, selectedNode.value])
-  cb(true)
 }
 const checkNameIsValid = async (name: string): Promise<boolean> => {
   emits('loading', true)

package/components/common/vm/actions/common/select/storage/Storage.vue

@@ -61,7 +61,7 @@ import {
 import * as table from '~/components/common/vm/actions/common/select/storage/config/config'
 
 const props = defineProps<{
-  storageSubmit: null | Function
+  storageSubmit: number
   datastore: UI_I_DatastoreTableItem[]
   storage: UI_I_DatastoreTableItem
   hideCompatibility?: boolean
@@ -136,19 +136,17 @@ watch(
 
 watch(
   () => props.storageSubmit,
-  (newValue) => {
-    newValue && submit(newValue)
+  () => {
+    submit()
   }
 )
-const submit = (cb: Function): void => {
+const submit = (): void => {
   if (!selectedStorage.value) {
     showValidationErrors([localization.value.selectValidDestinationStorage])
-    cb(false)
     return
   }
 
   emits('submit', selectedStorage.value)
-  cb(true)
 }
 
 const errors = ref<string[]>([])

package/components/common/vm/actions/common/select/storage/config/config.ts

@@ -1,154 +1,154 @@
-import { UI_I_DatastoreTableItem } from '~/models/store/storage/interfaces'
-import type {
-  UI_I_ColumnKey,
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/models/interfaces'
-import type { UI_I_Localization } from '~/models/interfaces'
-import { UI_T_StorageColumnKeys } from '~/components/common/vm/actions/common/select/storage/models/types'
-import {
-  constructColumnKey,
-  constructHeadItem,
-} from '~/components/atoms/table/dataGrid/utils/constructDataTable'
-import {
-  datastoreIconByState,
-  datastoreLocalizationByState,
-} from '~/components/common/config/states'
-
-export const storageTableKeys: UI_T_StorageColumnKeys = [
-  'name',
-  'state',
-  'capacity_mb',
-  'provisioned_mb',
-  'free_mb',
-  'used_mb',
-  'type_text',
-  'thin_provisioning',
-  'access_mode',
-  'hardware_acceleration',
-  'drive_type',
-  'device',
-  'storage_io_control',
-]
-
-const getItems = (
-  localization: UI_I_Localization
-): [string, boolean, string, string][] => {
-  return [
-    [localization.name, true, '96px', storageTableKeys[0]],
-    [localization.state, true, '138px', storageTableKeys[1]],
-    [localization.capacity, true, '110px', storageTableKeys[2]],
-    [localization.provisioned, true, '128px', storageTableKeys[3]],
-    [localization.free, true, '110px', storageTableKeys[4]],
-    [localization.used, true, '110px', storageTableKeys[5]],
-    [localization.type, true, '110px', storageTableKeys[6]],
-    [localization.thinProvisioning, true, '132px', storageTableKeys[7]],
-    [localization.access, true, '110px', storageTableKeys[8]],
-    [localization.hardwareAcceleration, true, '134px', storageTableKeys[9]],
-    [localization.driverType, true, '110px', storageTableKeys[10]],
-    [localization.device, true, '110px', storageTableKeys[11]],
-    [localization.storageIoControl, true, '110px', storageTableKeys[12]],
-  ]
-}
-
-export const columnKeys = (
-  localization: UI_I_Localization
-): UI_I_ColumnKey[] => {
-  const result: UI_I_ColumnKey[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 0 ? 'icon' : `col${i}`
-    result.push(constructColumnKey(col, item[0], item[1]))
-  })
-  return result
-}
-
-export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 0 ? 'icon' : `col${i}`
-    result.push(constructHeadItem(col, item[0], item[3], true, item[2]))
-  })
-  return result
-}
-
-export const bodyItems = (
-  data: UI_I_DatastoreTableItem[],
-  localization: UI_I_Localization
-): UI_I_BodyItem[][] => {
-  const bodyItems: UI_I_BodyItem[][] = []
-  const { $binary } = useNuxtApp()
-
-  data.forEach((storage: UI_I_DatastoreTableItem, key: number) => {
-    const state =
-      localization[datastoreLocalizationByState[storage[storageTableKeys[1]]]]
-    bodyItems.push([
-      {
-        key: 'icon',
-        text: storage[storageTableKeys[0]].toString(),
-        data: `vsphere-icon-${datastoreIconByState[storage.state]}`,
-        id: key,
-      },
-      {
-        key: 'col1',
-        text: state,
-        id: key,
-      },
-      {
-        key: 'col2',
-        text: $binary.round(storage.capacity[storageTableKeys[2]]),
-        id: key,
-      },
-      {
-        key: 'col3',
-        text: $binary.round(storage.capacity[storageTableKeys[3]].toString()),
-        id: key,
-      },
-      {
-        key: 'col4',
-        text: $binary.round(storage.capacity[storageTableKeys[4]].toString()),
-        id: key,
-      },
-      {
-        key: 'col5',
-        text: $binary.round(storage.capacity[storageTableKeys[5]].toString()),
-        id: key,
-      },
-      {
-        key: 'col6',
-        text: storage[storageTableKeys[6]].toString(),
-        id: key,
-      },
-      {
-        key: 'col7',
-        text: storage[storageTableKeys[7]] ? localization.yes : localization.no,
-        id: key,
-      },
-      {
-        key: 'col8',
-        text: storage[storageTableKeys[8]].toString(),
-        id: key,
-      },
-      {
-        key: 'col9',
-        text: storage[storageTableKeys[9]].toString(),
-        id: key,
-      },
-      {
-        key: 'col10',
-        text: storage[storageTableKeys[10]].toString(),
-        id: key,
-      },
-      {
-        key: 'col11',
-        text: storage[storageTableKeys[11]].toString(),
-        id: key,
-      },
-      {
-        key: 'col12',
-        text: storage[storageTableKeys[12]].toString(),
-        id: key,
-      },
-    ])
-  })
-  return bodyItems
-}
+import { UI_I_DatastoreTableItem } from '~/models/store/storage/interfaces'
+import type {
+  UI_I_ColumnKey,
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/models/interfaces'
+import type { UI_I_Localization } from '~/models/interfaces'
+import { UI_T_StorageColumnKeys } from '~/components/common/vm/actions/common/select/storage/models/types'
+import {
+  constructColumnKey,
+  constructHeadItem,
+} from '~/components/atoms/table/dataGrid/utils/constructDataTable'
+import {
+  datastoreIconByState,
+  datastoreLocalizationByState,
+} from '~/components/common/config/states'
+
+export const storageTableKeys: UI_T_StorageColumnKeys = [
+  'name',
+  'state',
+  'capacity_mb',
+  'provisioned_mb',
+  'free_mb',
+  'used_mb',
+  'type_text',
+  'thin_provisioning',
+  'access_mode',
+  'hardware_acceleration',
+  'drive_type',
+  'device',
+  'storage_io_control',
+]
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [localization.name, true, '96px', storageTableKeys[0]],
+    [localization.state, true, '138px', storageTableKeys[1]],
+    [localization.capacity, true, '110px', storageTableKeys[2]],
+    [localization.provisioned, true, '128px', storageTableKeys[3]],
+    [localization.free, true, '110px', storageTableKeys[4]],
+    [localization.used, true, '110px', storageTableKeys[5]],
+    [localization.type, true, '110px', storageTableKeys[6]],
+    [localization.thinProvisioning, true, '132px', storageTableKeys[7]],
+    [localization.access, true, '110px', storageTableKeys[8]],
+    [localization.hardwareAcceleration, true, '134px', storageTableKeys[9]],
+    [localization.driverType, true, '110px', storageTableKeys[10]],
+    [localization.device, true, '110px', storageTableKeys[11]],
+    [localization.storageIoControl, true, '110px', storageTableKeys[12]],
+  ]
+}
+
+export const columnKeys = (
+  localization: UI_I_Localization
+): UI_I_ColumnKey[] => {
+  const result: UI_I_ColumnKey[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 0 ? 'icon' : `col${i}`
+    result.push(constructColumnKey(col, item[0], item[1]))
+  })
+  return result
+}
+
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 0 ? 'icon' : `col${i}`
+    result.push(constructHeadItem(col, item[0], item[3], true, item[2]))
+  })
+  return result
+}
+
+export const bodyItems = (
+  data: UI_I_DatastoreTableItem[],
+  localization: UI_I_Localization
+): UI_I_BodyItem[][] => {
+  const bodyItems: UI_I_BodyItem[][] = []
+  const { $binary } = useNuxtApp()
+
+  data.forEach((storage: UI_I_DatastoreTableItem, key: number) => {
+    const state =
+      localization[datastoreLocalizationByState[storage[storageTableKeys[1]]]]
+    bodyItems.push([
+      {
+        key: 'icon',
+        text: storage[storageTableKeys[0]].toString(),
+        data: `vsphere-icon-${datastoreIconByState[storage.state]}`,
+        id: key,
+      },
+      {
+        key: 'col1',
+        text: state,
+        id: key,
+      },
+      {
+        key: 'col2',
+        text: $binary.round(storage.capacity[storageTableKeys[2]]),
+        id: key,
+      },
+      {
+        key: 'col3',
+        text: $binary.round(storage.capacity[storageTableKeys[3]].toString()),
+        id: key,
+      },
+      {
+        key: 'col4',
+        text: $binary.round(storage.capacity[storageTableKeys[4]].toString()),
+        id: key,
+      },
+      {
+        key: 'col5',
+        text: $binary.round(storage.capacity[storageTableKeys[5]].toString()),
+        id: key,
+      },
+      {
+        key: 'col6',
+        text: storage[storageTableKeys[6]].toString(),
+        id: key,
+      },
+      {
+        key: 'col7',
+        text: storage[storageTableKeys[7]] ? localization.yes : localization.no,
+        id: key,
+      },
+      {
+        key: 'col8',
+        text: storage[storageTableKeys[8]].toString(),
+        id: key,
+      },
+      {
+        key: 'col9',
+        text: storage[storageTableKeys[9]].toString(),
+        id: key,
+      },
+      {
+        key: 'col10',
+        text: storage[storageTableKeys[10]].toString(),
+        id: key,
+      },
+      {
+        key: 'col11',
+        text: storage[storageTableKeys[11]].toString(),
+        id: key,
+      },
+      {
+        key: 'col12',
+        text: storage[storageTableKeys[12]].toString(),
+        id: key,
+      },
+    ])
+  })
+  return bodyItems
+}

package/components/common/vm/utils/powerActions.ts

@@ -1,55 +1,55 @@
-import type { API_UI_T_VmState } from '~/models/store/types'
-import type { UI_I_VmPowerActions } from '~/components/common/vm/models/interfaces'
-
-export const getPowerActionsByState = (
-  state: API_UI_T_VmState
-): UI_I_VmPowerActions => {
-  const powerActions = {
-    hard_stop: false,
-    power_off: false,
-    power_on: false,
-    reset: false,
-    restart_guest: false,
-    shutdown_guest: false,
-    suspend: false,
-  }
-  switch (state) {
-    case 0: // Unknown
-      powerActions.power_on = true
-      powerActions.hard_stop = true
-      break
-    case 1: // Powered off
-      powerActions.power_on = true
-      break
-    case 2: // Powered on
-      powerActions.power_off = true
-      powerActions.suspend = true
-      powerActions.reset = true
-      powerActions.hard_stop = true
-      powerActions.shutdown_guest = true
-      powerActions.restart_guest = true
-      break
-    case 3: // Suspended
-    case 4: // Error
-    case 5: // Warning
-      powerActions.power_on = true
-      powerActions.hard_stop = true
-      break
-    case 6: // Pending
-      powerActions.hard_stop = true
-      break
-    case 7: // Paused
-      powerActions.power_on = true
-      powerActions.hard_stop = true
-      break
-    case 8: // Blocked
-    case 9: // Shutting down
-    case 10: // Shut off
-      powerActions.hard_stop = true
-      break
-    default:
-      powerActions.hard_stop = true
-  }
-
-  return powerActions
-}
+import type { API_UI_T_VmState } from '~/models/store/types'
+import type { UI_I_VmPowerActions } from '~/components/common/vm/models/interfaces'
+
+export const getPowerActionsByState = (
+  state: API_UI_T_VmState
+): UI_I_VmPowerActions => {
+  const powerActions = {
+    hard_stop: false,
+    power_off: false,
+    power_on: false,
+    reset: false,
+    restart_guest: false,
+    shutdown_guest: false,
+    suspend: false,
+  }
+  switch (state) {
+    case 0: // Unknown
+      powerActions.power_on = true
+      powerActions.hard_stop = true
+      break
+    case 1: // Powered off
+      powerActions.power_on = true
+      break
+    case 2: // Powered on
+      powerActions.power_off = true
+      powerActions.suspend = true
+      powerActions.reset = true
+      powerActions.hard_stop = true
+      powerActions.shutdown_guest = true
+      powerActions.restart_guest = true
+      break
+    case 3: // Suspended
+    case 4: // Error
+    case 5: // Warning
+      powerActions.power_on = true
+      powerActions.hard_stop = true
+      break
+    case 6: // Pending
+      powerActions.hard_stop = true
+      break
+    case 7: // Paused
+      powerActions.power_on = true
+      powerActions.hard_stop = true
+      break
+    case 8: // Blocked
+    case 9: // Shutting down
+    case 10: // Shut off
+      powerActions.hard_stop = true
+      break
+    default:
+      powerActions.hard_stop = true
+  }
+
+  return powerActions
+}

package/components/common/wizards/datastore/add/nfs/kerberosAuthentication/KerberosAuthentication.vue

@@ -1,54 +1,54 @@
-<template>
-  <div class="kerberos-auth">
-    <atoms-alert
-      v-show="isShowAlert"
-      test-id="kerberos-authentication"
-      status="alert-warning"
-      :items="[localization.kerberosAuthenticationAlert]"
-      @remove="isShowAlert = false"
-    />
-
-    <div class="kerberos-auth__inner">
-      <div v-for="item in kerberosTypes" :key="item.value" class="radio">
-        <input
-          :id="item.label"
-          v-model="kerberosType"
-          type="radio"
-          :value="item.value"
-        />
-        <label :for="item.label">
-          {{ item.label }}
-        </label>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_Localization } from '~/models/interfaces'
-import { UI_I_RadioOption } from '~/components/common/select/radio/models/interfaces'
-import { UI_T_KerberosAuthentication } from '~/components/common/wizards/datastore/add/models/types'
-import { kerberosOptionsFunc } from '~/components/common/wizards/datastore/add/nfs/kerberosAuthentication/config/radioOptions'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const kerberosType = ref<UI_T_KerberosAuthentication>('dont-use')
-const isShowAlert = ref<boolean>(true)
-
-const kerberosTypes = readonly<UI_I_RadioOption[]>(
-  kerberosOptionsFunc(localization.value)
-)
-</script>
-
-<style lang="scss" scoped>
-.kerberos-auth {
-  &__inner {
-    margin-top: 12px;
-  }
-}
-
-input[type='radio']:focus:checked + label::before,
-input[type='radio']:focus + label::before {
-  box-shadow: inset 0 0 0 0.25rem #0094d2;
-}
-</style>
+<template>
+  <div class="kerberos-auth">
+    <atoms-alert
+      v-show="isShowAlert"
+      test-id="kerberos-authentication"
+      status="alert-warning"
+      :items="[localization.kerberosAuthenticationAlert]"
+      @remove="isShowAlert = false"
+    />
+
+    <div class="kerberos-auth__inner">
+      <div v-for="item in kerberosTypes" :key="item.value" class="radio">
+        <input
+          :id="item.label"
+          v-model="kerberosType"
+          type="radio"
+          :value="item.value"
+        />
+        <label :for="item.label">
+          {{ item.label }}
+        </label>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UI_I_Localization } from '~/models/interfaces'
+import { UI_I_RadioOption } from '~/components/common/select/radio/models/interfaces'
+import { UI_T_KerberosAuthentication } from '~/components/common/wizards/datastore/add/models/types'
+import { kerberosOptionsFunc } from '~/components/common/wizards/datastore/add/nfs/kerberosAuthentication/config/radioOptions'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const kerberosType = ref<UI_T_KerberosAuthentication>('dont-use')
+const isShowAlert = ref<boolean>(true)
+
+const kerberosTypes = readonly<UI_I_RadioOption[]>(
+  kerberosOptionsFunc(localization.value)
+)
+</script>
+
+<style lang="scss" scoped>
+.kerberos-auth {
+  &__inner {
+    margin-top: 12px;
+  }
+}
+
+input[type='radio']:focus:checked + label::before,
+input[type='radio']:focus + label::before {
+  box-shadow: inset 0 0 0 0.25rem #0094d2;
+}
+</style>

package/components/layout/theHeader/utils/localization.ts

@@ -1,32 +1,32 @@
-import type { UI_T_LangValue } from '~/models/types'
-
-export const defineBrowserLangFunc = (): Exclude<UI_T_LangValue, 'BROWSER'> => {
-  const browserLanguage: string = navigator.language
-
-  let lang: Exclude<UI_T_LangValue, 'BROWSER'>
-
-  switch (browserLanguage.substring(0, 2)) {
-    case 'en':
-      lang = 'en_US'
-      break
-    case 'ru':
-      lang = 'ru_RU'
-      break
-    case 'hy':
-      lang = 'hy_AM'
-      break
-    case 'zh':
-      lang = 'zh_CHS'
-      break
-    case 'kk':
-      lang = 'kk_KZ'
-      break
-    case 'be':
-      lang = 'be_BY'
-      break
-    default:
-      lang = 'en_US'
-      break
-  }
-  return lang
-}
+import type { UI_T_LangValue } from '~/models/types'
+
+export const defineBrowserLangFunc = (): Exclude<UI_T_LangValue, 'BROWSER'> => {
+  const browserLanguage: string = navigator.language
+
+  let lang: Exclude<UI_T_LangValue, 'BROWSER'>
+
+  switch (browserLanguage.substring(0, 2)) {
+    case 'en':
+      lang = 'en_US'
+      break
+    case 'ru':
+      lang = 'ru_RU'
+      break
+    case 'hy':
+      lang = 'hy_AM'
+      break
+    case 'zh':
+      lang = 'zh_CHS'
+      break
+    case 'kk':
+      lang = 'kk_KZ'
+      break
+    case 'be':
+      lang = 'be_BY'
+      break
+    default:
+      lang = 'en_US'
+      break
+  }
+  return lang
+}