bfg-common 1.4.158 → 1.4.159

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

@@ -8,12 +8,12 @@
         :disabled="!selectedDisksFromTable.length"
         @click="onConfigure"
       >
-        {{ localization.common.configure }}
+        {{ localization.inventoryTabs.configure }}
       </button>
     </div>
 
-    <common-wizards-vm-migrate-select-storage-table-disk
-      v-model:selected-per-disk="selectedPerDiskKeysLocal"
+    <common-wizards-vm-migrate-select-storage-configure-disk-table
+      v-model="selectedPerDiskKeysLocal"
       :configure-per-disks="props.configurePerDisks"
     />
   </div>
@@ -21,23 +21,22 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
+import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/configure/disk/table/lib/models/interfaces'
 import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
 
 const props = defineProps<{
-  modelValue: boolean
-  selectedPerDiskKeys: number[]
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
-  activeTab: UI_T_VmMigrateSelectStorageTab
 }>()
+const modelShowSelectedPerDisk = defineModel<boolean>({ required: true })
+const modelActiveTab = defineModel<UI_T_VmMigrateSelectStorageTab>('activeTab')
+const selectedPerDiskKeysLocal = defineModel<number[]>('selectedPerDiskKeys', {
+  required: true,
+})
 const emits = defineEmits<{
-  (event: 'update:model-value', value: boolean): void
-  (event: 'update:selected-per-disk-keys', value: number[]): void
   (
     event: 'update-selected-per-disks',
     value: UI_I_StorageConfigurePerDiskItem[]
   ): void
-  (event: 'update:active-tab', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -54,27 +53,9 @@ const selectedDisksFromTable = computed<UI_I_StorageConfigurePerDiskItem[]>(
 
 const onConfigure = (): void => {
   emits('update-selected-per-disks', selectedDisksFromTable.value)
-  emits('update:model-value', true)
-  activeTabValue.value = 'batch-configure'
+  modelShowSelectedPerDisk.value = true
+  modelActiveTab.value = 'batch-configure'
 }
-
-const selectedPerDiskKeysLocal = computed<number[]>({
-  get(): number[] {
-    return props.selectedPerDiskKeys
-  },
-  set(newValue: number[]) {
-    emits('update:selected-per-disk-keys', newValue)
-  },
-})
-
-const activeTabValue = computed<UI_T_VmMigrateSelectStorageTab>({
-  get() {
-    return props.activeTab
-  },
-  set(newValue: string) {
-    emits('update:active-tab', newValue)
-  },
-})
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/vm/migrate/select/storage/{table/disk/Disk.vue → configure/disk/table/Table.vue}

@@ -1,7 +1,7 @@
 <template>
   <div class="data-table-view">
     <atoms-table-data-grid
-      v-model:selected-row="selectedRow"
+      v-model:selected-row="selectedPerDiskKeysLocal"
       v-model:column-keys="columnKeys"
       v-model:page-size="pagination.pageSize"
       v-model:page="pagination.page"
@@ -21,23 +21,20 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Pagination } from '~/lib/models/table/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_I_Pagination } from '~/lib/models/table/interfaces'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
-import * as table from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/config/config'
+import * as table from '~/components/common/wizards/vm/migrate/select/storage/configure/disk/table/lib/config/diskTable'
 
 const props = defineProps<{
-  selectedPerDisk: number[]
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
 }>()
-const emits = defineEmits<{
-  (event: 'update:selected-per-disk', value: number[]): void
-}>()
+const selectedPerDiskKeysLocal = defineModel<number[]>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -62,15 +59,6 @@ const sorting = (data: [string, boolean]): void => {
   const direction = status ? 'asc' : 'desc'
   sort.value = `${column}.${direction}`
 }
-
-const selectedRow = computed<number[]>({
-  get() {
-    return props.selectedPerDisk
-  },
-  set(newValue: number[]) {
-    emits('update:selected-per-disk', newValue)
-  },
-})
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/vm/migrate/select/storage/{table/disk/lib/config/config.ts → configure/disk/table/lib/config/diskTable.ts}

@@ -3,50 +3,63 @@ import type {
   UI_I_HeadItem,
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import * as defaultSettings from '~/components/atoms/table/dataGrid/lib/config/settingsTable'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import {
-  constructColumnKey,
-  constructHeadItem,
-} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
-import { vmMigrateDiskTableItemKeys } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/config/tableKeys'
+import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/configure/disk/table/lib/models/interfaces'
 import { UI_E_SelectStorageDiskFormat } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/enums'
+import { vmMigrateDiskTableItemKeys } from '~/components/common/wizards/vm/migrate/select/storage/configure/disk/table/lib/config/tableKeys'
+
 const getItems = (
   localization: UI_I_Localization
 ): [string, boolean, string, string][] => {
   return [
-    [localization.common.virtualMachine, true, '200px', vmMigrateDiskTableItemKeys[0]],
-    [localization.common.diskGroup, false, '138px', vmMigrateDiskTableItemKeys[1]],
+    [
+      localization.common.virtualMachine,
+      true,
+      '200px',
+      vmMigrateDiskTableItemKeys[0],
+    ],
+    [
+      localization.common.diskGroup,
+      false,
+      '138px',
+      vmMigrateDiskTableItemKeys[1],
+    ],
     [localization.common.file, true, '180px', vmMigrateDiskTableItemKeys[2]],
     [localization.common.storage, true, '120px', vmMigrateDiskTableItemKeys[3]],
-    [localization.common.diskFormat, true, '180px', vmMigrateDiskTableItemKeys[4]],
+    [
+      localization.common.diskFormat,
+      true,
+      '180px',
+      vmMigrateDiskTableItemKeys[4],
+    ],
     [localization.common.sharing, true, '120px', vmMigrateDiskTableItemKeys[5]],
     [localization.common.target, true, '120px', vmMigrateDiskTableItemKeys[6]],
     [localization.common.cache, true, '120px', vmMigrateDiskTableItemKeys[7]],
-    [localization.common.ioControl, true, '120px', vmMigrateDiskTableItemKeys[8]],
+    [
+      localization.common.ioControl,
+      true,
+      '120px',
+      vmMigrateDiskTableItemKeys[8],
+    ],
     [localization.common.discard, true, '120px', vmMigrateDiskTableItemKeys[9]],
-    [localization.common.diskMode, true, '180px', vmMigrateDiskTableItemKeys[10]],
+    [
+      localization.common.diskMode,
+      true,
+      '180px',
+      vmMigrateDiskTableItemKeys[10],
+    ],
   ]
 }
 
 export const columnKeys = (
   localization: UI_I_Localization
 ): UI_I_ColumnKey[] => {
-  const result: UI_I_ColumnKey[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = `col${i}`
-    result.push(constructColumnKey(col, item[0], item[1]))
-  })
-  return result
+  return defaultSettings.defaultColumnKeys(getItems(localization))
 }
 
 export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  getItems(localization).forEach((item, i) => {
-    const col = `col${i}`
-    result.push(constructHeadItem(col, item[0], item[3], true, item[2]))
-  })
-  return result
+  return defaultSettings.defaultHeadItems(getItems(localization))
 }
 
 export const bodyItems = (

package/components/common/wizards/vm/migrate/select/storage/{table/disk → configure/disk/table}/lib/config/tableKeys.ts

@@ -1,4 +1,4 @@
-import type { UI_T_VmMigrateDiskTableTuple } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/types'
+import type { UI_T_VmMigrateDiskTableTuple } from '~/components/common/wizards/vm/migrate/select/storage/configure/disk/table/lib/models/types'
 
 export const vmMigrateDiskTableItemKeys: UI_T_VmMigrateDiskTableTuple = [
   'virtual_machine',

package/components/common/wizards/vm/migrate/select/storage/{table/disk → configure/disk/table}/lib/models/interfaces.ts

@@ -1,3 +1,5 @@
+import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
+
 interface API_UI_I_ExtraValuePerDiskItem {
   cache: string
   datastore_id: string
@@ -22,3 +24,6 @@ export interface API_UI_I_StorageConfigurePerDiskItem {
 
 export interface UI_I_StorageConfigurePerDiskItem
   extends API_UI_I_StorageConfigurePerDiskItem {}
+
+export interface UI_I_MigrateVmConfigureDisk
+  extends API_UI_I_DataTable<API_UI_I_StorageConfigurePerDiskItem[]> {}

package/components/common/wizards/vm/migrate/select/storage/lib/models/interfaces.ts

@@ -1,14 +0,0 @@
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
-import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
-
-export interface UI_I_SelectStorageDataLocal {
-  vmDiskFormat: 0 | 1 | 2 | 3
-  storage: UI_I_DatastoreTableItem | null
-}
-
-export interface UI_I_SelectStorageReadyData
-  extends UI_I_SelectStorageDataLocal {
-  tab: UI_T_VmMigrateSelectStorageTab
-  configureDisks: UI_I_StorageConfigurePerDiskItem[]
-}

package/components/common/wizards/vm/migrate/select/storage/selectedPerDisk/SelectedPerDisk.vue

@@ -31,39 +31,31 @@
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/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/configure/disk/table/lib/models/interfaces'
 
 const props = defineProps<{
-  modelValue: boolean
-  activeTab: UI_T_VmMigrateSelectStorageTab
-  connectedStorageIdLocal: string
-  data: any[]
-}>()
-const emits = defineEmits<{
-  (event: 'update:model-value', value: boolean): void
-  (event: 'update:active-tab', value: UI_T_VmMigrateSelectStorageTab): void
-  (event: 'update:connected-storage-id-local', value: string): void
+  data: UI_I_StorageConfigurePerDiskItem[]
 }>()
+const modelShowSelectedPerDisks = defineModel<boolean>()
+const modelConnectedStorageIdLocal = defineModel<string>(
+  'connectedStorageIdLocal'
+)
+const modelActiveTab = defineModel<UI_T_VmMigrateSelectStorageTab>('activeTab')
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const normalizedData = computed<string[]>(() =>
-  props.data.map((item) => `${item.virtual_machine} | ${item.file}`)
+  props.data.map(
+    (disk: UI_I_StorageConfigurePerDiskItem) =>
+      `${disk.virtual_machine} | ${disk.file}`
+  )
 )
 
 const onGoBack = (): void => {
-  emits('update:model-value', false)
-  emits('update:connected-storage-id-local', '')
-  activeTabValue.value = 'configure-disk'
+  modelShowSelectedPerDisks.value = false
+  modelConnectedStorageIdLocal.value = ''
+  modelActiveTab.value = 'configure-disk'
 }
-
-const activeTabValue = computed<UI_T_VmMigrateSelectStorageTab>({
-  get() {
-    return props.activeTab
-  },
-  set(newValue: UI_T_VmMigrateSelectStorageTab) {
-    emits('update:active-tab', newValue)
-  },
-})
 </script>
 
 <style lang="scss" scoped>