bfg-common 1.2.162 → 1.2.164

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

@@ -35,7 +35,9 @@
         <common-wizards-vm-migrate-select-compute-resource
           v-show="currentBlockId === 'select-compute-resource'"
           :submit="selectComputeResourceSubmit"
+          :get-compute-resource-data="props.getComputeResourceData"
           :migrate-type="vmMigrateType"
+          :compute-resource-data="props.computeResourceTableData"
           :compute-resource-tree="props.computeResourceTree"
           @next-step="onSelectComputeResourceAndNext"
         />
@@ -90,8 +92,10 @@ const props = defineProps<{
   vmSettings: UI_I_VmSettings | null
   vmName: string
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+  getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
   datastore: UI_I_DatastoreTableItem[]
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
+  computeResourceTableData?: any
   computeResourceTree?: UI_I_TreeNode
   readyCompleteTableInfo?: any // пока так потом если будет нужен изменит или удалить
   finishFunc: any

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

@@ -1,5 +1,4 @@
 import type { UI_I_Localization } from '~/models/interfaces'
-import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/models/interfaces'
 import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/models/types'
 import { UI_E_VmMigrationType } from '~/components/common/wizards/vm/migrate/models/enums'
 import {
@@ -80,7 +79,7 @@ export const constructDataReadyViewFunc = (
   type: UI_T_VmMigrateType,
   name: string,
   data: UI_I_CollectedDataFormLocal
-): UI_I_TableInfoItem[] => {
+): UI_I_MigrateReadyBlockData[] => {
   const localization: UI_I_Localization = useLocal()
 
   // const details = {

package/components/common/wizards/vm/migrate/select/computeResource/ComputeResource.vue

@@ -36,7 +36,6 @@
         :total-items="props.computeResourceData?.total_items || 0"
         :total-pages="props.computeResourceData?.total_pages || 1"
         :type="activeTab"
-        :loading="loading"
       />
     </template>
 
@@ -49,7 +48,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization, UI_I_Pagination } from '~/models/interfaces'
+import type { UI_I_Localization } from '~/models/interfaces'
 import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/models/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/models/interfaces'
 import type { UI_I_TablePayload } from '~/models/store/interfaces'
@@ -173,27 +172,6 @@ const onHideErrorMessageAlert = (): void => {
   errorMessages.value = []
 }
 
-const selectedData = ref([])
-
-const loading = ref<boolean>(false)
-const sort = ref<string | null>(null)
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-const getTableData = (): void => {
-  loading.value = true
-
-  const payload = {
-    pagination: pagination.value,
-    sortBy: sort.value,
-    type: 'hosts',
-  }
-
-  props.getComputeResourceData(payload).then(() => {
-    loading.value = false
-  })
-}
 const checkValidityBlock = (): boolean => {
   const hasSelectedData = Object.values(computeResourceDataLocal.value).some(
     (value) => value !== null

package/components/common/wizards/vm/migrate/select/computeResource/tableView/TableView.vue

@@ -9,7 +9,7 @@
       :body-items="bodyItems"
       :total-items="props.totalItems"
       :total-pages="props.totalPages"
-      :loading="props.loading"
+      :loading="loading"
       class="data-table"
       server-off
       hide-page-size
@@ -57,7 +57,6 @@ const props = defineProps<{
   totalItems: number
   totalPages: number
   type: UI_T_SelectComputeResourceTabType
-  loading: boolean
 }>()
 const emits = defineEmits<{
   (event: 'update:selected-data', value: number): void
@@ -65,6 +64,12 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const loading = ref<boolean>(false)
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+
 const table: any = {
   host: hostTable,
   cluster: clusterTable,
@@ -72,6 +77,26 @@ const table: any = {
   'v-apps': vAppsTable,
 }
 
+const getData = async (
+  type: UI_T_SelectComputeResourceTabType
+): Promise<void> => {
+  const payload: UI_I_TablePayload = {
+    pagination: pagination.value,
+    sortBy: null,
+    schema: 'full',
+    type,
+  }
+
+  props.getComputeResourceData(payload).then(() => {})
+}
+watch(
+  () => props.type,
+  (newValue: UI_T_SelectComputeResourceTabType) => {
+    getData(newValue)
+  },
+  { deep: true, immediate: true }
+)
+
 const headItems = computed<UI_I_HeadItem[]>(() =>
   table[props.type].headItems(localization.value)
 )
@@ -86,11 +111,6 @@ const bodyItems = computed<UI_I_BodyItem[][]>(() => {
   return table[props.type].bodyItems(props.dataTable, localization.value)
 })
 
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-
 const selectedRow = computed<number>({
   get() {
     return props.selectedData

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

@@ -1,5 +1,13 @@
 <template>
   <div class="select-storage">
+    <atoms-alert
+      v-if="errorMessages.length"
+      test-id="select-storage-alert"
+      status="alert-danger"
+      :items="errorMessages"
+      @remove="onHideErrorMessageAlert"
+    />
+
     <common-wizards-vm-migrate-select-storage-selected-per-disk
       v-if="isShowSelectedPerDisks"
       v-model="isShowSelectedPerDisks"
@@ -20,12 +28,12 @@
 
     <common-wizards-vm-migrate-select-storage-configure-batch
       v-show="activeTab === 'batch-configure'"
-      v-model:vm-disk-format="dataLocal.vmDiskFormat"
+      v-model:vm-disk-format="selectStorageDataLocal.vmDiskFormat"
       :get-datastore-table-func="props.getDatastoreTableFunc"
       :datastore="props.datastore"
       :connected-storage-id="connectedStorageId"
       :is-hide-select-disk-format="isHideSelectDiskFormat"
-      @update-selected-datastore="dataLocal.storage = $event"
+      @update-selected-datastore="selectStorageDataLocal.storage = $event"
     >
       <template v-if="isShowSelectedPerDisks" #buttonConfirm>
         <button class="btn btn-sm btn-primary" @click="onApplyChanges">
@@ -44,7 +52,7 @@
     />
 
     <common-wizards-vm-common-validation-compatibility
-      :loading="!dataLocal.storage"
+      :loading="!selectStorageDataLocal.storage"
       :status="'Success'"
       text="compatibilityChecksSucceeded"
     />
@@ -82,7 +90,11 @@ const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
   vmMigrateSelectStorageTabsFunc(localization.value)
 )
 
-// const selectedStorage = ref<UI_I_DatastoreTableItem | null>(null)
+const errorMessages = ref<string[]>([])
+const selectStorageDataLocal = ref<UI_I_SelectStorageDataLocal>({
+  vmDiskFormat: 0,
+  storage: null,
+})
 const isShowSelectedPerDisks = ref<boolean>(false)
 
 const selectedPerDiskKeys = ref<number[]>([])
@@ -106,7 +118,7 @@ const onChangePerDiskStorage = (
   event: UI_I_StorageConfigurePerDiskItem[]
 ): void => {
   connectedStorageIdLocal.value = event[0].extra.datastore_id
-  dataLocal.value.vmDiskFormat = event[0].disk_format
+  selectStorageDataLocal.value.vmDiskFormat = event[0].disk_format
 
   selectedPerDisks.value = event
 }
@@ -122,7 +134,7 @@ const onApplyChanges = (): void => {
     )!
 
     if (selectedDisk) {
-      const { storage, vmDiskFormat } = dataLocal.value
+      const { storage, vmDiskFormat } = selectStorageDataLocal.value
 
       // ;({ name: disk.storage, id: disk.extra.datastore_id } = storage)
       disk.storage = storage.name
@@ -144,23 +156,21 @@ const isHideSelectDiskFormat = computed<boolean>(() => {
     selectedPerDisks.value[0].file === 'Configuration file'
   )
 })
-
-const dataLocal = ref<UI_I_SelectStorageDataLocal>({
-  vmDiskFormat: 0,
-  storage: null,
-})
+const onHideErrorMessageAlert = (): void => {
+  errorMessages.value = []
+}
 
 const checkValidityBlock = (): boolean => {
-  if (!dataLocal.value.storage) {
-    // const errorText = localization.value.nameCannotBeBlank
-    //
-    // showValidationErrors(errorText)
+  if (!selectStorageDataLocal.value.storage) {
+    const errorText = localization.value.selectValidDestinationStorage
+
+    errorMessages.value = [errorText]
     return false
   }
-  const isActivePerDiskTab = activeTab.value === 'configure-disk'
 
+  const isActivePerDiskTab = activeTab.value === 'configure-disk'
   emits('next-step', {
-    ...dataLocal.value,
+    ...selectStorageDataLocal.value,
     tab: activeTab.value,
     // ...(isActivePerDiskTab && { configureDisks: props.configurePerDisks }),
     configureDisks: isActivePerDiskTab

package/package.json

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