bfg-common 1.5.111 → 1.5.113

package/components/common/wizards/vm/migrate/select/network/table/network/lib/config/advancedTable.ts

@@ -1,91 +1,91 @@
-import type {
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-import type { UI_I_MigrateSelectNetworkAdvancedItem } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/interfaces'
-import { networkAdvancedTableItemKeys } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/config/tableKeys'
-
-const getItems = (
-  localization: UI_I_Localization
-): [string, boolean, string, string][] => {
-  return [
-    [
-      localization.common.sourceNetwork,
-      true,
-      '25%',
-      networkAdvancedTableItemKeys[0],
-    ],
-    [
-      localization.common.macAddress,
-      true,
-      '25%',
-      networkAdvancedTableItemKeys[1],
-    ],
-    [
-      localization.common.networkAdapter,
-      true,
-      '25%',
-      networkAdvancedTableItemKeys[2],
-    ],
-    [
-      localization.common.destinationNetwork,
-      true,
-      '25%',
-      networkAdvancedTableItemKeys[3],
-    ],
-  ]
-}
-
-export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = i === 3 ? 'select' : `col${i}`
-    result.push(constructHeadItem(col, item[0], item[3], false, item[2]))
-  })
-  return result
-}
-
-export const bodyItems = (
-  data: UI_I_MigrateSelectNetworkAdvancedItem[]
-): UI_I_BodyItem[][] => {
-  const bodyItems: UI_I_BodyItem[][] = []
-
-  data?.forEach(
-    (network: UI_I_MigrateSelectNetworkAdvancedItem, key: number) => {
-      const data = {
-        id: `${network.source_network}-select`,
-        sourceNetwork: network.source_network,
-        disabled: false,
-        value: network.destination_network[0]?.text || '',
-        option: network.destination_network,
-      }
-
-      bodyItems.push([
-        {
-          key: 'col0',
-          text: network[networkAdvancedTableItemKeys[0]],
-          id: key,
-        },
-        {
-          key: 'col1',
-          text: network[networkAdvancedTableItemKeys[1]],
-          id: key,
-        },
-        {
-          key: 'col2',
-          text: network[networkAdvancedTableItemKeys[2]],
-          id: key,
-        },
-        {
-          key: 'select',
-          text: network[networkAdvancedTableItemKeys[3]],
-          data,
-          id: key,
-        },
-      ])
-    }
-  )
-  return bodyItems
-}
+import type {
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+import type { UI_I_MigrateSelectNetworkAdvancedItem } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/models/interfaces'
+import { networkAdvancedTableItemKeys } from '~/components/common/wizards/vm/migrate/select/network/table/network/lib/config/tableKeys'
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [
+      localization.common.sourceNetwork,
+      true,
+      '25%',
+      networkAdvancedTableItemKeys[0],
+    ],
+    [
+      localization.common.macAddress,
+      true,
+      '25%',
+      networkAdvancedTableItemKeys[1],
+    ],
+    [
+      localization.common.networkAdapter,
+      true,
+      '25%',
+      networkAdvancedTableItemKeys[2],
+    ],
+    [
+      localization.common.destinationNetwork,
+      true,
+      '25%',
+      networkAdvancedTableItemKeys[3],
+    ],
+  ]
+}
+
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 3 ? 'select' : `col${i}`
+    result.push(constructHeadItem(col, item[0], item[3], false, item[2]))
+  })
+  return result
+}
+
+export const bodyItems = (
+  data: UI_I_MigrateSelectNetworkAdvancedItem[]
+): UI_I_BodyItem[][] => {
+  const bodyItems: UI_I_BodyItem[][] = []
+
+  data?.forEach(
+    (network: UI_I_MigrateSelectNetworkAdvancedItem, key: number) => {
+      const data = {
+        id: `${network.source_network}-select`,
+        sourceNetwork: network.source_network,
+        disabled: false,
+        value: network.destination_network[0]?.text || '',
+        option: network.destination_network,
+      }
+
+      bodyItems.push([
+        {
+          key: 'col0',
+          text: network[networkAdvancedTableItemKeys[0]],
+          id: key,
+        },
+        {
+          key: 'col1',
+          text: network[networkAdvancedTableItemKeys[1]],
+          id: key,
+        },
+        {
+          key: 'col2',
+          text: network[networkAdvancedTableItemKeys[2]],
+          id: key,
+        },
+        {
+          key: 'select',
+          text: network[networkAdvancedTableItemKeys[3]],
+          data,
+          id: key,
+        },
+      ])
+    }
+  )
+  return bodyItems
+}

package/components/common/wizards/vm/migrate/select/priority/Priority.vue

@@ -1,43 +1,43 @@
-<template>
-  <div class="select-priority">
-    <atoms-alert
-      v-show="errors.length"
-      status="alert-danger"
-      :items="errors"
-      test-id="name-alert"
-      class="mb-1"
-      hide-close-icon
-    />
-    <common-select-radio-group
-      v-model="selectedPriorityTypeLocal"
-      :options="vmMigrationPriorityTypes"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
-import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/lib/models/types'
-import { vmMigrateSelectPriorityTypesFunc } from '~/components/common/wizards/vm/migrate/select/priority/lib/config/typeOptions'
-
-const selectedPriorityTypeLocal = defineModel<UI_T_SelectVMotionPriority>()
-
-const props = defineProps<{
-  vmState: number
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const vmMigrationPriorityTypes = computed<UI_I_RadioOption[]>(() =>
-  vmMigrateSelectPriorityTypesFunc(localization.value, props.vmState)
-)
-
-const errors = computed<string[]>(() => {
-  return props.vmState !== 1 && props.vmState !== 2
-    ? [localization.value.migrateVm.strategyMigrationErrorDesc]
-    : []
-})
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div class="select-priority">
+    <atoms-alert
+      v-show="errors.length"
+      :items="errors"
+      status="alert-danger"
+      test-id="name-alert"
+      class="mb-1"
+      hide-close-icon
+    />
+    <common-select-radio-group
+      v-model="selectedPriorityTypeLocal"
+      :options="vmMigrationPriorityTypes"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
+import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/lib/models/types'
+import { vmMigrateSelectPriorityTypesFunc } from '~/components/common/wizards/vm/migrate/select/priority/lib/config/typeOptions'
+
+const selectedPriorityTypeLocal = defineModel<UI_T_SelectVMotionPriority>()
+
+const props = defineProps<{
+  vmState: number
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const vmMigrationPriorityTypes = computed<UI_I_RadioOption[]>(() =>
+  vmMigrateSelectPriorityTypesFunc(localization.value, props.vmState)
+)
+
+const errors = computed<string[]>(() => {
+  return props.vmState !== 1 && props.vmState !== 2
+    ? [localization.value.migrateVm.strategyMigrationErrorDesc]
+    : []
+})
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/wizards/vm/migrate/select/storage/Storage.vue

@@ -2,9 +2,9 @@
   <div class="select-storage">
     <atoms-alert
       v-show="props.alertMessages?.length"
+      :items="props.alertMessages"
       test-id="select-storage-alert"
       status="alert-danger"
-      :items="props.alertMessages"
       @remove="onHideAlert"
     />
 
@@ -19,8 +19,8 @@
     <atoms-tabs
       v-else
       v-model="model.configure.type"
-      test-id="migrate-select-storage-tabs"
       :items="selectStorageTabs"
+      test-id="migrate-select-storage-tabs"
       size="small"
       class="select-storage__tabs"
       @change="onChangeMigrateMode"

package/components/common/wizards/vm/migrate/select/storage/configure/batch/Batch.vue

@@ -27,9 +27,9 @@
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_MigrateFormLocal } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
 import { virtualDiskFormatOptionsFunc } from '~/components/common/wizards/vm/migrate/select/storage/configure/batch/config/virtualDiskFormat'
 
 const props = defineProps<{
@@ -42,7 +42,7 @@ const model = defineModel<UI_I_MigrateFormLocal>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const virtualDiskFormatOptions = computed<UI_I_OptionItem[]>(() =>
+const virtualDiskFormatOptions = computed<UI_I_SelectInputItem[]>(() =>
   virtualDiskFormatOptionsFunc()
 )
 </script>

package/components/common/wizards/vm/migrate/select/storage/configure/batch/table/Table.vue

@@ -5,12 +5,12 @@
       v-model:column-keys="columnKeys"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
-      type="radio"
-      test-id="datastore-table"
       :head-items="headItems"
       :body-items="bodyItems"
       :total-items="bodyItems.length"
       :total-pages="1"
+      type="radio"
+      test-id="datastore-table"
       server-off
       hide-page-size
       class="table-wrap__container"

package/components/common/wizards/vm/migrate/select/storage/configure/disk/Disk.vue

@@ -3,9 +3,9 @@
     <div class="btn-group">
       <button
         id="vm-migrate-configure"
+        :disabled="!selectedDisksFromTable.length"
         data-id="vm-migrate-configure-button"
         class="btn btn-link btn-sm"
-        :disabled="!selectedDisksFromTable.length"
         @click="onConfigure"
       >
         {{ localization.inventoryTabs.configure }}

package/components/common/wizards/vm/migrate/select/storage/configure/disk/table/Table.vue

@@ -5,13 +5,13 @@
       v-model:column-keys="columnKeys"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
-      type="checkbox"
-      class="data-table"
-      test-id="disk-table"
       :head-items="headItems"
       :body-items="bodyItems"
       :total-items="bodyItems.length"
       :total-pages="1"
+      type="checkbox"
+      class="data-table"
+      test-id="disk-table"
       server-off
       hide-page-size
       @sorting="sorting"

package/components/common/wizards/vm/migrate/select/storage/lib/config/tabsPannel.ts

@@ -1,5 +1,6 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+
 export const vmMigrateSelectStorageTabsFunc = (
   localization: UI_I_Localization
 ): UI_I_CollapseNavItem[] => {

package/components/common/wizards/vm/migrate/select/targetServer/lib/config/tabsPannel.ts

@@ -1,5 +1,6 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+
 export const vmMigrateSelectTargetServerTabsFunc = (
   localization: UI_I_Localization
 ): UI_I_CollapseNavItem[] => {

package/components/common/wizards/vm/migrate/select/targetServer/lib/models/types.ts

@@ -1 +1 @@
-export type T_SelectTargetServerTab = 'new-server' | 'saved-servers'
+export type UI_T_SelectTargetServerTab = 'new-server' | 'saved-servers'

package/components/common/wizards/vm/migrate/select/targetServer/saved/Saved.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="saved-servers">
     <atoms-alert
+      :items="arrayErrorMessages"
       test-id="vm-migrate-saved-servers-alert"
       status="alert-info"
-      :items="arrayErrorMessages"
       hide-close-icon
     />
   </div>

package/components/common/wizards/vm/migrate/select/targetServer/targetServer.vue

@@ -2,8 +2,8 @@
   <div class="target-server">
     <atoms-tabs
       v-model="activeTab"
-      test-id="migrate-select-target-server-tabs"
       :items="selectStorageTabs"
+      test-id="migrate-select-target-server-tabs"
       size="small"
       class="target-server__tabs"
     />
@@ -26,7 +26,7 @@ import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
 import type { UI_I_ConnectEsxiServerForm } from '~/components/common/wizards/vm/migrate/select/targetServer/new/lib/models/interfaces'
-import type { T_SelectTargetServerTab } from '~/components/common/wizards/vm/migrate/select/targetServer/lib/models/types'
+import type { UI_T_SelectTargetServerTab } from '~/components/common/wizards/vm/migrate/select/targetServer/lib/models/types'
 import { vmMigrateSelectTargetServerTabsFunc } from '~/components/common/wizards/vm/migrate/select/targetServer/lib/config/tabsPannel'
 
 const props = defineProps<{
@@ -36,7 +36,7 @@ const modelTargetServer = defineModel<UI_I_ConnectEsxiServerForm>()
 const modelConnectServer = defineModel<boolean>('connectServer')
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const activeTab = ref<T_SelectTargetServerTab>('new-server')
+const activeTab = ref<UI_T_SelectTargetServerTab>('new-server')
 const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
   vmMigrateSelectTargetServerTabsFunc(localization.value)
 )

package/composables/productNameLocal.ts

@@ -1,30 +1,30 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_LanguageKey } from '~/lib/models/types'
-
-export function productNameLocal(
-  localization: UI_I_Localization
-): UI_I_Localization {
-  const config = useRuntimeConfig()
-
-  const productName =
-    config.public.LOCALIZATION_CODE === 'ru'
-      ? config.public.PRODUCT_NAME_RU
-      : config.public.PRODUCT_NAME_EN
-
-  return replaceProductNameRecursion(localization, productName)
-}
-
-const replaceProductNameRecursion = (
-  localization: UI_I_Localization,
-  productName: any
-): UI_I_Localization => {
-  for (const key of Object.keys(localization)) {
-    let item = localization[key as UI_T_LanguageKey]
-
-    for (const key2 of Object.keys(item)) {
-      item[key2] = item[key2].replaceAll('{productName}', productName)
-    }
-  }
-
-  return localization
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_LanguageKey } from '~/lib/models/types'
+
+export function productNameLocal(
+  localization: UI_I_Localization
+): UI_I_Localization {
+  const config = useRuntimeConfig()
+
+  const productName =
+    config.public.LOCALIZATION_CODE === 'ru'
+      ? config.public.PRODUCT_NAME_RU
+      : config.public.PRODUCT_NAME_EN
+
+  return replaceProductNameRecursion(localization, productName)
+}
+
+const replaceProductNameRecursion = (
+  localization: UI_I_Localization,
+  productName: any
+): UI_I_Localization => {
+  for (const key of Object.keys(localization)) {
+    let item = localization[key as UI_T_LanguageKey]
+
+    for (const key2 of Object.keys(item)) {
+      item[key2] = item[key2].replaceAll('{productName}', productName)
+    }
+  }
+
+  return localization
+}

package/composables/useAppVersion.ts

@@ -1,21 +1,21 @@
-import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
-
-export function useAppVersion(): UI_I_UseAppVersionReturnType {
-  const config = useRuntimeConfig()
-  const version = config.public.APP_VERSION as string
-
-  // const regexHasDot = /\./
-  // const regexHasDotAndB = /\.\d*b$/
-  // const regexHasDotAndD = /\..*d/
-
-  // const isBeta = regexHasDotAndB.test(version)
-  // const isDev =
-  //   regexHasDotAndD.test(version) ||
-  //   (!regexHasDot.test(version) && version.length < 8)
-
-  return {
-    version,
-    // isBeta,
-    // isDev,
-  }
-}
+import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
+
+export function useAppVersion(): UI_I_UseAppVersionReturnType {
+  const config = useRuntimeConfig()
+  const version = config.public.APP_VERSION as string
+
+  // const regexHasDot = /\./
+  // const regexHasDotAndB = /\.\d*b$/
+  // const regexHasDotAndD = /\..*d/
+
+  // const isBeta = regexHasDotAndB.test(version)
+  // const isDev =
+  //   regexHasDotAndD.test(version) ||
+  //   (!regexHasDot.test(version) && version.length < 8)
+
+  return {
+    version,
+    // isBeta,
+    // isDev,
+  }
+}

package/lib/models/store/host/interfaces.ts

@@ -1,4 +1,4 @@
-import { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
+import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
 
 interface API_UI_I_ConfigureAllPciDevicesItemGeneralInfo {
   class_id: string

package/lib/models/store/network/interfaces.ts

@@ -1,4 +1,4 @@
-import { API_UI_I_Node } from '~/lib/models/store/interfaces'
+import type { API_UI_I_Node } from '~/lib/models/store/interfaces'
 
 export interface API_UI_I_NetworkTableItem extends API_UI_I_Node {
   vlan: string

package/lib/models/store/storage/interfaces.ts

@@ -1,4 +1,4 @@
-import { API_UI_I_Node } from '~/lib/models/store/interfaces'
+import type { API_UI_I_Node } from '~/lib/models/store/interfaces'
 
 export interface API_UI_I_DatastoreTableItemCapacity {
   capacity_mb: number

package/lib/models/store/vm/interfaces.ts

@@ -1,6 +1,6 @@
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import {
+import type {
   UI_I_SendDataNewCdDvdDrive,
   UI_I_SendDataNewHardDisk,
   UI_I_SendDataNewNetwork,

package/package.json

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