bfg-common 1.2.140 → 1.2.142

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

@@ -43,7 +43,7 @@
           :submit="selectStorageSubmit"
           :get-datastore-table-func="props.getDatastoreTableFunc"
           :datastore="props.datastore"
-          :connected-storage-id="connectedStorageIdOnVm"
+          :connected-storage-id-default="connectedStorageIdOnVm"
           :configure-per-disks="props.configurePerDisks"
           @next-step="onSelectStorageAndNext"
         />

package/components/common/wizards/vm/migrate/config/constructDataReady.ts

@@ -45,25 +45,26 @@ const storageDetailsFunc = (
       permissions: ['batch-configure'],
     },
     {
-      label: localization.diskFormat,
-      value: diskFormat.text,
+      label: name,
+      value: '',
       permissions: ['configure-disk'],
     },
   ]
 
   if (isActivePerDiskTab && selectStorage.configureDisks) {
-    const perDiskItems: UI_I_MigrateReadyBlockData[] = selectStorage.configureDisks.map(
-      (item) => ({
-        label: item.name,
-        value: `${item.file} ${item.disk_format}`,
+    const perDiskItems: UI_I_MigrateReadyBlockData[] =
+      selectStorage.configureDisks.map((item) => ({
+        label: item.file,
+        value: `${item.datastore} (${item.disk_format})`,
         permissions: ['configure-disk'],
         isProperty: true,
-      })
-    )
+      }))
     result = result.concat(perDiskItems)
   }
 
-  return result.filter((option) => option.permissions.includes(selectStorage.tab))
+  return result.filter((option) =>
+    option.permissions.includes(selectStorage.tab)
+  )
 }
 export const constructDataReadyViewFunc = (
   type: UI_T_VmMigrateType,

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

@@ -4,6 +4,7 @@
       v-if="isShowSelectedPerDisks"
       v-model="isShowSelectedPerDisks"
       v-model:active-tab="activeTab"
+      v-model:connected-storage-id-local="connectedStorageIdLocal"
       :data="selectedPerDisks"
     />
 
@@ -21,16 +22,23 @@
       v-model:vm-disk-format="dataLocal.vmDiskFormat"
       :get-datastore-table-func="props.getDatastoreTableFunc"
       :datastore="props.datastore"
-      :connected-storage-id="props.connectedStorageId"
+      :connected-storage-id="connectedStorageId"
       @update-selected-datastore="dataLocal.storage = $event"
-    />
+    >
+      <template v-if="isShowSelectedPerDisks" #buttonConfirm>
+        <button class="btn btn-sm btn-primary" @click="onApplyChanges">
+          {{ localization.confirm }}
+        </button>
+      </template>
+    </common-wizards-vm-migrate-select-storage-configure-batch>
 
     <common-wizards-vm-migrate-select-storage-configure-disk
       v-show="activeTab === 'configure-disk'"
       v-model="isShowSelectedPerDisks"
+      v-model:selected-per-disk-keys="selectedPerDiskKeys"
       v-model:active-tab="activeTab"
-      :configure-per-disks="props.configurePerDisks"
-      @update-selected-per-disks="selectedPerDisks = $event"
+      :configure-per-disks="configurePerDisksLocal"
+      @update-selected-per-disks="onChangePerDiskStorage"
     />
 
     <common-wizards-vm-common-validation-compatibility
@@ -58,7 +66,7 @@ const props = defineProps<{
   submit: number
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
   datastore: UI_I_DatastoreTableItem[]
-  connectedStorageId: string | null
+  connectedStorageIdDefault: string | null
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
 }>()
 const emits = defineEmits<{
@@ -74,8 +82,48 @@ const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
 
 // const selectedStorage = ref<UI_I_DatastoreTableItem | null>(null)
 const isShowSelectedPerDisks = ref<boolean>(false)
+
+const selectedPerDiskKeys = ref<number[]>([])
 const selectedPerDisks = ref<UI_I_StorageConfigurePerDiskItem[]>([])
 
+const configurePerDisksLocal = ref<UI_I_StorageConfigurePerDiskItem[]>(
+  props.configurePerDisks
+)
+
+const connectedStorageIdLocal = ref<string>('')
+const connectedStorageId = computed<string | null>(
+  () => connectedStorageIdLocal.value || props.connectedStorageIdDefault
+)
+const onChangePerDiskStorage = (
+  event: UI_I_StorageConfigurePerDiskItem[]
+): void => {
+  connectedStorageIdLocal.value = event[0].datastore_id
+
+  selectedPerDisks.value = event
+}
+
+const onApplyChanges = (): void => {
+  /* TODO сделать рефакторинг потом */
+  configurePerDisksLocal.value.forEach((disk) => {
+    const selectedDisk = selectedPerDisks.value.find(
+      (selected) =>
+        selected.virtual_machine === disk.virtual_machine &&
+        selected.file === disk.file &&
+        selected.datastore_id === disk.datastore_id
+    )!
+
+    if (selectedDisk) {
+      ({ name: disk.datastore, id: disk.datastore_id } =
+        dataLocal.value.storage)
+    }
+  })
+
+  isShowSelectedPerDisks.value = false
+  activeTab.value = 'configure-disk'
+  selectedPerDisks.value = []
+  selectedPerDiskKeys.value = []
+}
+
 const dataLocal = ref<UI_I_SelectStorageDataLocal>({
   vmDiskFormat: 'same-format-source',
   storage: null,

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="configure-batch-mode">
     <common-wizards-vm-migrate-select-storage-disk-format
       v-model:vm-disk-format="selectedVmDiskFormat"
     />
@@ -24,6 +24,13 @@
       :connected-storage-id="props.connectedStorageId"
       @update-selected-datastore="emits('update-selected-datastore', $event)"
     />
+
+    <div
+      v-if="$slots.buttonConfirm"
+      class="clr-justify-content-end configure-batch-mode__button"
+    >
+      <slot name="buttonConfirm"></slot>
+    </div>
   </div>
 </template>
 
@@ -58,4 +65,10 @@ const selectedVmDiskFormat = computed<string>({
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.configure-batch-mode {
+  &__button {
+    display: flex;
+  }
+}
+</style>

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

@@ -12,7 +12,7 @@
     </div>
 
     <common-wizards-vm-migrate-select-storage-table-disk
-      v-model:selected-per-disk="selectedPerDiskKeys"
+      v-model:selected-per-disk="selectedPerDiskKeysLocal"
       :configure-per-disks="props.configurePerDisks"
     />
   </div>
@@ -25,11 +25,13 @@ import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards
 
 const props = defineProps<{
   modelValue: boolean
+  selectedPerDiskKeys: number[]
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
   activeTab: UI_T_VmMigrateSelectStorageTab
 }>()
 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[]
@@ -39,13 +41,12 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selectedPerDiskKeys = ref<number[]>([])
 const selectedDisksFromTable = computed<UI_I_StorageConfigurePerDiskItem[]>(
   () => {
     if (!props.configurePerDisks) return []
 
     return props.configurePerDisks.filter((_: never, key: number) =>
-      selectedPerDiskKeys.value.includes(key)
+        selectedPerDiskKeysLocal.value.includes(key)
     )
   }
 )
@@ -56,6 +57,15 @@ const onConfigure = (): void => {
   activeTabValue.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

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

@@ -34,21 +34,24 @@ import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards
 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
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const normalizedData = computed<string[]>(() =>
-  props.data.map((item) => `${item.name} | ${item.file}`)
+  props.data.map((item) => `${item.virtual_machine} | ${item.file}`)
 )
 
 const onGoBack = (): void => {
   emits('update:model-value', false)
+  emits('update:connected-storage-id-local', '')
   activeTabValue.value = 'configure-disk'
 }
 
@@ -56,7 +59,7 @@ const activeTabValue = computed<UI_T_VmMigrateSelectStorageTab>({
   get() {
     return props.activeTab
   },
-  set(newValue: string) {
+  set(newValue: UI_T_VmMigrateSelectStorageTab) {
     emits('update:active-tab', newValue)
   },
 })

package/components/common/wizards/vm/migrate/select/storage/table/datastore/Datastore.vue

@@ -81,8 +81,8 @@ const getStorage = async (): Promise<void> => {
   }
 
   props.getDatastoreTableFunc(payload).then(() => {
-    selectedStorageKey.value = null
-    setStorageFromProps()
+    // selectedStorageKey.value = null
+    // setStorageFromProps()
   })
 }
 getStorage()
@@ -100,6 +100,14 @@ const setStorageFromProps = (): void => {
     if (item.id === props.connectedStorageId) changeStorage(index)
   })
 }
+
+watch(
+  () => props.connectedStorageId,
+  (newValue) => {
+    if (!props.datastore.length || !newValue) return
+    setStorageFromProps()
+  }
+)
 </script>
 
 <style lang="scss" scoped></style>

package/components/common/wizards/vm/migrate/select/storage/table/disk/config/config.ts

@@ -14,11 +14,15 @@ const getItems = (
   localization: UI_I_Localization
 ): [string, boolean, string, string][] => {
   return [
-    [localization.virtualMachine, true, '96px', vmMigrateDiskTableItemKeys[0]],
+    [localization.virtualMachine, true, '200px', vmMigrateDiskTableItemKeys[0]],
     [localization.diskGroup, false, '138px', vmMigrateDiskTableItemKeys[1]],
-    [localization.file, true, '110px', vmMigrateDiskTableItemKeys[2]],
-    [localization.storage, true, '96px', vmMigrateDiskTableItemKeys[3]],
-    // [localization.diskFormat, true, '110px', vmMigrateDiskTableItemKeys[4]],
+    [localization.file, true, '180px', vmMigrateDiskTableItemKeys[2]],
+    [localization.storage, true, '120px', vmMigrateDiskTableItemKeys[3]],
+    [localization.diskFormat, true, '180px', vmMigrateDiskTableItemKeys[4]],
+    [localization.sharing, true, '120px', vmMigrateDiskTableItemKeys[5]],
+    [localization.target, true, '120px', vmMigrateDiskTableItemKeys[6]],
+    [localization.cache, true, '120px', vmMigrateDiskTableItemKeys[7]],
+    [localization.diskMode, true, '180px', vmMigrateDiskTableItemKeys[8]],
   ]
 }
 
@@ -69,6 +73,32 @@ export const bodyItems = (
         text: storage[vmMigrateDiskTableItemKeys[3]],
         id: key,
       },
+      {
+        key: 'col4',
+        text: storage[vmMigrateDiskTableItemKeys[4]],
+        id: key,
+      },
+      {
+        key: 'col5',
+        text: storage[vmMigrateDiskTableItemKeys[5]],
+        id: key,
+      },
+
+      {
+        key: 'col6',
+        text: storage[vmMigrateDiskTableItemKeys[6]],
+        id: key,
+      },
+      {
+        key: 'col7',
+        text: storage[vmMigrateDiskTableItemKeys[7]],
+        id: key,
+      },
+      {
+        key: 'col8',
+        text: storage[vmMigrateDiskTableItemKeys[8]],
+        id: key,
+      },
     ])
   })
   return bodyItems

package/components/common/wizards/vm/migrate/select/storage/table/disk/config/tableKeys.ts

@@ -5,4 +5,9 @@ export const vmMigrateDiskTableItemKeys: UI_T_VmMigrateDiskTableTuple = [
   'disk_group',
   'file',
   'datastore',
+  'provision_type',
+  'sharing',
+  'target',
+  'cache',
+  'disk_mode',
 ]

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

@@ -1,18 +1,23 @@
-export interface API_UI_I_StorageConfigurePerDiskItem {
-  virtual_machine: string
-  target: string
-  disk_group: string
-  disk_source: string
-  disk_size: string
-  file: string
-  datastore: string
+interface API_UI_I_ExtraValuePerDiskItem {
+  cache: string
   datastore_id: string
-  sharing: string
-  read_only: string
+  discard: string
   disk_mode: string
-  cache: string
+  disk_size: number
+  disk_source: string
   io_control: string
-  discard: string
+  read_only: string
+  sharing: string
+  target: string
+}
+
+export interface API_UI_I_StorageConfigurePerDiskItem {
+  disk_format: 0 | 1 | 2 | 3
+  disk_group: string
+  file: string
+  storage: string
+  virtual_machine: string
+  extra: API_UI_I_ExtraValuePerDiskItem
 }
 
 export interface UI_I_StorageConfigurePerDiskItem

package/components/common/wizards/vm/migrate/select/storage/table/disk/models/types.ts

@@ -2,5 +2,10 @@ export type UI_T_VmMigrateDiskTableTuple = [
   'virtual_machine',
   'disk_group',
   'file',
-  'datastore'
+  'datastore',
+  'provision_type',
+  'sharing',
+  'target',
+  'cache',
+  'disk_mode'
 ]

package/package.json

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