bfg-common 1.4.105 → 1.4.106

package/components/common/wizards/vmNew/migrate/Migrate.vue

@@ -123,7 +123,7 @@ const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 const form = ref<UI_I_MigrateFormLocal>({
   migrate_type: props.project === 'procurator' ? 'storage' : 'resource',
   disk_format: 0,
-  storage: '',
+  storage: null,
 })
 
 const validationFunc = async (

package/components/common/wizards/vmNew/migrate/lib/models/interfaces.ts

@@ -8,7 +8,7 @@ import type { UI_T_VmMigrateType } from '~/components/common/wizards/vmNew/migra
 export interface UI_I_MigrateFormLocal {
   migrate_type: UI_T_VmMigrateType
   disk_format: number
-  storage: string
+  storage: any
 }
 
 export interface UI_I_ChangeStepsSchemes {

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

@@ -33,7 +33,6 @@
       :datastore="props.datastore"
       :connected-storage-id="connectedStorageId"
       :is-hide-select-disk-format="isHideSelectDiskFormat"
-      @update-selected-datastore="selectStorageDataLocal.storage = $event"
     >
       <template v-if="isShowSelectedPerDisks" #buttonConfirm>
         <button
@@ -56,7 +55,7 @@
     />
 
     <common-wizards-vm-common-validation-compatibility
-      :loading="!selectStorageDataLocal.storage"
+      :loading="!model.storage"
       :status="'Success'"
       text="compatibilityChecksSucceeded"
     />
@@ -70,10 +69,7 @@ import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/model
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
-import type {
-  UI_I_SelectStorageDataLocal,
-  UI_I_SelectStorageReadyData,
-} from '~/components/common/wizards/vm/migrate/select/storage/lib/models/interfaces'
+import type { UI_I_SelectStorageReadyData } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/interfaces'
 import type { UI_I_MigrateFormLocal } from '~/components/common/wizards/vmNew/migrate/lib/models/interfaces'
 import { vmMigrateSelectStorageTabsFunc } from '~/components/common/wizards/vm/migrate/select/storage/lib/config/tabsPannel'
 
@@ -98,10 +94,6 @@ const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
   vmMigrateSelectStorageTabsFunc(localization.value)
 )
 
-const selectStorageDataLocal = ref<UI_I_SelectStorageDataLocal>({
-  vmDiskFormat: 0,
-  storage: null,
-})
 const isShowSelectedPerDisks = ref<boolean>(false)
 
 const selectedPerDiskKeys = ref<number[]>([])
@@ -141,12 +133,12 @@ const onApplyChanges = (): void => {
     )!
 
     if (selectedDisk) {
-      const { storage } = selectStorageDataLocal.value
+      const { storage, disk_format } = model.value
 
       // ;({ name: disk.storage, id: disk.extra.datastore_id } = storage)
       disk.storage = storage.name
       disk.extra.datastore_id = storage.id
-      disk.disk_format = model.value.disk_format
+      disk.disk_format = disk_format
     }
   })
 
@@ -165,13 +157,13 @@ const isHideSelectDiskFormat = computed<boolean>(() => {
 })
 
 const checkValidityBlock = (): boolean => {
-  if (!selectStorageDataLocal.value.storage) {
+  if (!model.value.storage) {
     return false
   }
 
   const isActivePerDiskTab = activeTab.value === 'configure-disk'
   emits('next-step', {
-    ...selectStorageDataLocal.value,
+    ...model.value,
     tab: activeTab.value,
     // ...(isActivePerDiskTab && { configureDisks: props.configurePerDisks }),
     configureDisks: isActivePerDiskTab

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

@@ -1,7 +1,5 @@
 <template>
   <div class="configure-batch-mode">
-    {{ model.disk_format }}
-
     <common-select-input
       v-if="!isHideSelectDiskFormat"
       v-model="model.disk_format"
@@ -11,10 +9,10 @@
     />
 
     <common-wizards-vm-new-migrate-select-storage-configure-batch-table
+      v-model="model.storage"
       :get-datastore-table-func="props.getDatastoreTableFunc"
       :datastore="props.datastore"
       :connected-storage-id="props.connectedStorageId"
-      @update-selected-datastore="emits('update-selected-datastore', $event)"
     />
 
     <div
@@ -47,10 +45,6 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const virtualDiskFormatOptions = computed<UI_I_OptionItem[]>(() =>
   virtualDiskFormatOptionsFunc()
 )
-
-const emits = defineEmits<{
-  (event: 'update-selected-datastore', value: UI_I_TablePayload): void
-}>()
 </script>
 
 <style lang="scss" scoped>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="table-wrap">
     <atoms-table-data-grid
-      v-model:selected-row="selectedStorageKey"
+      v-model:selected-row="selectedStorageKeyLocal"
       v-model:column-keys="columnKeys"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
@@ -14,7 +14,7 @@
       server-off
       hide-page-size
       @sorting="sorting"
-      @change="changeStorage"
+      @change="selectStorageFromTable"
     >
       <template #icon="{ item }">
         <span :class="['datagrid-cell-icon', item.data]" />
@@ -45,13 +45,19 @@ const props = defineProps<{
   datastore: UI_I_DatastoreTableItem[]
   connectedStorageId: string | null
 }>()
-
-const emits = defineEmits<{
-  (event: 'update-selected-datastore', value: UI_I_TablePayload): void
-}>()
+const modelStorageLocal = defineModel<UI_I_DatastoreTableItem>({
+  required: true,
+})
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const selectedStorageKeyLocal = ref<number | null>(null)
+const sort = ref<string | null>(null)
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+
 const headItems = ref<UI_I_HeadItem[]>(table.headItems(localization.value))
 const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
 watch(localization, () => {
@@ -61,22 +67,15 @@ watch(localization, () => {
 const bodyItems = computed<UI_I_BodyItem[][]>(() => {
   return table.bodyItems(props.datastore || [], localization.value)
 })
-
-const sort = ref<string | null>(null)
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-
 const sorting = (data: [string, boolean]): void => {
   const [column, status] = data
   const direction = status ? 'asc' : 'desc'
   sort.value = `${column}.${direction}`
 
-  getStorage()
+  InitStorageData()
 }
 
-const getStorage = async (): Promise<void> => {
+const InitStorageData = async (): Promise<void> => {
   const payload: UI_I_TablePayload = {
     pagination: pagination.value,
     sortBy: sort.value,
@@ -85,31 +84,33 @@ const getStorage = async (): Promise<void> => {
   }
 
   props.getDatastoreTableFunc(payload).then(() => {
-    // selectedStorageKey.value = null
-    // setStorageFromProps()
+    // selectedStorageKeyLocal.value = null
+    // defineDefaultSelectedStorage()
   })
 }
-getStorage()
+InitStorageData()
 
-const selectedStorageKey = ref<number | null>(null)
-const changeStorage = (index: number): void => {
+const selectStorageFromTable = (index: number): void => {
   if (!props.datastore) return
-  emits('update-selected-datastore', props.datastore[index])
-  selectedStorageKey.value = index
+
+  modelStorageLocal.value = props.datastore[index]
+  selectedStorageKeyLocal.value = index
 }
 
-const setStorageFromProps = (): void => {
-  if (!props.connectedStorageId) return
-  props.datastore.forEach((item, index) => {
-    if (item.id === props.connectedStorageId) changeStorage(index)
-  })
+const defineDefaultSelectedStorage = (): void => {
+  props.datastore.forEach(
+    (datastore: UI_I_DatastoreTableItem, index: number) => {
+      if (datastore.id === props.connectedStorageId)
+        selectStorageFromTable(index)
+    }
+  )
 }
 
 watch(
   () => props.connectedStorageId,
-  (newValue) => {
+  (newValue: string) => {
     if (!props.datastore.length || !newValue) return
-    setStorageFromProps()
+    defineDefaultSelectedStorage()
   }
 )
 </script>

package/package.json

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

package/components/common/wizards/vmNew/migrate/select/storage/table/datastore/lib/config/config.ts

@@ -1,179 +0,0 @@
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type {
-  UI_I_ColumnKey,
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_StorageColumnKeys } from '~/components/common/vm/actions/common/select/storage/lib/models/types'
-import {
-  constructColumnKey,
-  constructHeadItem,
-} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-import {
-  datastoreIconByState,
-  datastoreLocalizationByState,
-} from '~/components/common/lib/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.common.name, true, '96px', storageTableKeys[0]],
-    [localization.inventorySummary.state, true, '138px', storageTableKeys[1]],
-    [localization.common.capacity, true, '110px', storageTableKeys[2]],
-    [localization.common.provisioned, true, '128px', storageTableKeys[3]],
-    [localization.common.free, true, '110px', storageTableKeys[4]],
-    [localization.common.used, true, '110px', storageTableKeys[5]],
-    [localization.common.type, true, '110px', storageTableKeys[6]],
-    [localization.common.thinProvisioning, true, '132px', storageTableKeys[7]],
-    [localization.common.access, true, '110px', storageTableKeys[8]],
-    [localization.common.hardwareAcceleration, true, '134px', storageTableKeys[9]],
-    [localization.common.driverType, true, '110px', storageTableKeys[10]],
-    [localization.common.device, true, '110px', storageTableKeys[11]],
-    [localization.common.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], `show-column-${item[3]}`)
-    )
-  })
-  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],
-        undefined,
-        item[3]
-      )
-    )
-  })
-  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.common[datastoreLocalizationByState[storage[storageTableKeys[1]]]]
-    bodyItems.push([
-      {
-        key: 'icon',
-        text: storage[storageTableKeys[0]].toString(),
-        data: `vsphere-icon-${datastoreIconByState[storage.state]}`,
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col1',
-        text: state,
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col2',
-        text: $binary.round(storage.capacity[storageTableKeys[2]]),
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col3',
-        text: $binary.round(storage.capacity[storageTableKeys[3]].toString()),
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col4',
-        text: $binary.round(storage.capacity[storageTableKeys[4]].toString()),
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col5',
-        text: $binary.round(storage.capacity[storageTableKeys[5]].toString()),
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col6',
-        text: storage[storageTableKeys[6]].toString(),
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col7',
-        text: storage[storageTableKeys[7]] ? localization.common.yes : localization.common.no,
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col8',
-        text: storage[storageTableKeys[8]].toString(),
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col9',
-        text: storage[storageTableKeys[9]].toString(),
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col10',
-        text: storage[storageTableKeys[10]].toString(),
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col11',
-        text: storage[storageTableKeys[11]].toString(),
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-      {
-        key: 'col12',
-        text: storage[storageTableKeys[12]].toString(),
-        id: key,
-        testId: storage[storageTableKeys[0]].toString()
-      },
-    ])
-  })
-  return bodyItems
-}

package/components/common/wizards/vmNew/migrate/select/storage/table/datastore/lib/models/types.ts

@@ -1,15 +0,0 @@
-export type 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',
-]