bfg-common 1.2.115 → 1.2.117

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/actions/utils.ts

@@ -36,18 +36,55 @@ export const constructDiskDevicesFunc = (
     | UI_I_CreateVmDataCdDvdDevice
   )[] =
     virtualHardwareHardDisks?.map((hardDisk: UI_I_SendDataNewHardDisk) => {
+      // let result:
+      //   | UI_I_CreateVmDataNewDiskDevice
+      //   | UI_I_CreateVmDataExistDiskDevice = {
+      //   create: true,
+      //   size: hardDisk.size,
+      //   bus: hardDisk.bus || '',
+      //   storage_id: hardDisk.storage?.id || '',
+      //   provision_type: hardDisk.provision_type || '',
+      //   disk_mode: hardDisk.disk_mode || '',
+      //   boot_order: hardDisk.boot_order || 0,
+      // }
+      // TODO refactoring
       let result:
-        | UI_I_CreateVmDataNewDiskDevice
-        | UI_I_CreateVmDataExistDiskDevice = {
-        create: true,
-        size: hardDisk.size,
-        bus: hardDisk.bus || '',
-        storage_id: hardDisk.storage?.id || '',
-        provision_type: hardDisk.provision_type || '',
-        disk_mode: hardDisk.disk_mode || '',
-        boot_order: hardDisk.boot_order || 0,
+        any = {
+        size: hardDisk.size ?? 0,
+        source: hardDisk.source ?? '',
+        storage_id: hardDisk.storage_id ?? '',
+        device_type: hardDisk.device_type ?? '',
+        bus: hardDisk.bus ?? '',
+        target: hardDisk.target ?? '',
+        boot_order: hardDisk.boot_order ?? 0,
+        provision_type: hardDisk.provision_type ?? '',
+        disk_mode: hardDisk.disk_mode ?? '',
+        sharing: hardDisk.sharing ?? false,
+        read_only: hardDisk.read_only ?? false,
+        shares: hardDisk.shares ?? 0,
+        cache: hardDisk.cache ?? '',
+        io: hardDisk.io ?? '',
+        limit_iops: hardDisk.limit_iops ?? 0,
+        discard: hardDisk.discard ?? '',
+        attach: hardDisk.attach ?? false,
+        detach: hardDisk.detach ?? false,
+        remove: hardDisk.remove ?? false,
+        create: hardDisk.create ?? true,
       }
       if (!hardDisk.create) {
+      //   result = {
+      //     create: false,
+      //     // source: hardDisk.source,
+      //     size: hardDisk.size,
+      //     bus: hardDisk.bus || '',
+      //     // device_type: hardDisk.device_type || '',
+      //     storage_id: hardDisk.storage?.id || '',
+      //     provision_type: hardDisk.provision_type || '',
+      //     disk_mode: hardDisk.disk_mode || '',
+      //     boot_order: hardDisk.boot_order || 0,
+      //   }
+      // }
+        // TODO refactoring
         result = {
           create: false,
           // source: hardDisk.source,
@@ -58,6 +95,17 @@ export const constructDiskDevicesFunc = (
           provision_type: hardDisk.provision_type || '',
           disk_mode: hardDisk.disk_mode || '',
           boot_order: hardDisk.boot_order || 0,
+          target: hardDisk.target ?? '',
+          sharing: hardDisk.sharing ?? false,
+          read_only: hardDisk.read_only ?? false,
+          shares: hardDisk.shares ?? 0,
+          cache: hardDisk.cache ?? '',
+          io: hardDisk.io ?? '',
+          limit_iops: hardDisk.limit_iops ?? 0,
+          discard: hardDisk.discard ?? '',
+          attach: hardDisk.attach ?? false,
+          detach: hardDisk.detach ?? false,
+          remove: hardDisk.remove ?? false,
         }
       }
       return result

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/composables/useLocal.ts

@@ -1,38 +1,38 @@
-import localRu from '~/assets/localization/local_ru.json'
-import localEn from '~/assets/localization/local_en.json'
-import localHy from '~/assets/localization/local_hy.json'
-import localZh from '~/assets/localization/local_zh.json'
-import localKk from '~/assets/localization/local_kk.json'
-import localBe from '~/assets/localization/local_be.json'
-const locals = {
-  localRu,
-  localEn,
-  localHy,
-  localZh,
-  localKk,
-  localBe,
-}
-export const useLocal = () => {
-  const config = useRuntimeConfig()
-
-  const code: string = config?.public?.LOCALIZATION_CODE?.toLowerCase() || 'ru'
-
-  document.getElementsByTagName('html')[0].setAttribute('lang', code)
-
-  switch (code) {
-    case 'ru':
-      return locals.localRu
-    case 'en':
-      return locals.localEn
-    case 'hy':
-      return locals.localHy
-    case 'zh':
-      return locals.localZh
-    case 'kk':
-      return locals.localKk
-    case 'be':
-      return locals.localBe
-    default:
-      return locals.localRu
-  }
-}
+import localRu from '~/assets/localization/local_ru.json'
+import localEn from '~/assets/localization/local_en.json'
+import localHy from '~/assets/localization/local_hy.json'
+import localZh from '~/assets/localization/local_zh.json'
+import localKk from '~/assets/localization/local_kk.json'
+import localBe from '~/assets/localization/local_be.json'
+const locals = {
+  localRu,
+  localEn,
+  localHy,
+  localZh,
+  localKk,
+  localBe,
+}
+export const useLocal = () => {
+  const config = useRuntimeConfig()
+
+  const code: string = config?.public?.LOCALIZATION_CODE?.toLowerCase() || 'ru'
+
+  document.getElementsByTagName('html')[0].setAttribute('lang', code)
+
+  switch (code) {
+    case 'ru':
+      return locals.localRu
+    case 'en':
+      return locals.localEn
+    case 'hy':
+      return locals.localHy
+    case 'zh':
+      return locals.localZh
+    case 'kk':
+      return locals.localKk
+    case 'be':
+      return locals.localBe
+    default:
+      return locals.localRu
+  }
+}