bfg-common 1.5.418 → 1.5.420

package/components/common/pages/backups/modals/lib/models/interfaces.ts

@@ -1,164 +1,185 @@
-export interface API_UI_I_Pvm {
-  compatibility: string
-  deployment_name: string
-  guest_os_family: string
-  guest_os_version: string
-  machine_type: string
-  name: string
-  uuid: string
-  cpu: {
-    core_per_socket: number
-    hotplug: boolean
-    limit_mhz: number
-    max_vcpus: number
-    model: string
-    reservation_mhz: number
-    shares: number
-    vcpus: number
-  }
-  disk_devices: {
-    allocated_mb: number
-    boot_order: number
-    bus: string
-    cache: string
-    capacity_mb: number
-    device_type: string
-    discard: string
-    disk_mode: string
-    free_mb: number
-    io: string
-    limit_iops: number
-    location: string
-    provision_type: string
-    read_only: boolean
-    shares: number
-    sharing: boolean
-    source: string
-    storage_id: string
-    target: string
-    used_mb: number
-    volume_path: string
-  }[]
-  input_devices: {
-    bus: string
-    type: string
-  }[]
-  memory: {
-    hotplug: boolean
-    limit_mb: number
-    reservation_mb: number
-    size_mb: number
-  }
-  monitoring: {
-    cpu: {
-      current_vcpus: number
-      provisioned_mhz: number
-      used_mhz: number
-    }
-    encryption: string
-    evc_cpu_mode: string
-    evc_graphics_mode: string
-    guest_tools: {
-      dns_name: string
-      ip: string
-      status: string
-      version: string
-    }
-    memory: {
-      dram_read_bandwidth: number
-      pmem_read_bandwidth: number
-      provisioned_mb: number
-      resident_set_size_mb: number
-      used_mb: number
-    }
-    networks: null // ?
-    state: number
-    storage: {
-      allocated_space_mb: number
-      provisioned_space_mb: number
-      used_space_mb: number
-    }
-    tpm: string
-    uptime: {
-      start_time: string
-      uptime_humanized: string
-      uptime_ms: number
-    }
-    vbs: string
-  }
-  network_devices: {
-    boot_order: number
-    import_source_id: string
-    mac: string
-    model: string
-    net_bridge: string
-    network: string
-    target: string
-  }[]
-  options: {
-    boot_options: {
-      boot_delay_ms: number
-      boot_menu: boolean
-      firmware: string
-    }
-    guest_tools: {
-      enabled: boolean
-      synchronized_time: boolean
-    }
-    remote_console: {
-      guest_os_lock: boolean
-      keymap: string
-      limit_sessions: number
-      password: string
-      port: number
-      spice: {
-        clipboard: boolean
-        file_transfer: boolean
-        img_compression: string
-        jpeg_compression: string
-        playback_compression: boolean
-        streaming_mode: string
-        zlib_glz_compression: string
-      }
-      type: string
-    }
-  }
-  passthrough_pci_devices: any[]
-  snapshots: any
-  storage: {
-    folder: string
-    id: string
-  }
-  usb_controllers: {
-    type: string
-  }[]
-  video_card: {
-    adapter: string
-    displays: number
-    memory_mb: number
-  }
-}
-export interface UI_I_Pvm extends API_UI_I_Pvm {}
-
-export interface UI_I_CreateBackupFormDiskDevice {
-  location: string,
-  target: string,
-}
-export interface UI_I_CreateBackupForm {
-  target: string
-  name: string
-  description: string
-  disk_devices: UI_I_CreateBackupFormDiskDevice[]
-  backup_storage: string
-  strategy: 0 | 1 | 2
-  // start_window_min: number
-  bandwidth_limit: number
-}
-
-export interface UI_I_RestoreForm {
-  restore_code: 1 | 2 | 3 // 1 - disk only, 2 - existing, 3 - asNew
-  backup_storage: string
-  bucket: string
-  backup: string
-  pvm: UI_I_Pvm
-}
+import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
+
+export interface API_UI_I_Pvm {
+  compatibility: string
+  deployment_name: string
+  guest_os_family: string
+  guest_os_version: string
+  machine_type: string
+  name: string
+  uuid: string
+  cpu: {
+    core_per_socket: number
+    hotplug: boolean
+    limit_mhz: number
+    max_vcpus: number
+    model: string
+    reservation_mhz: number
+    shares: number
+    vcpus: number
+  }
+  disk_devices: {
+    allocated_mb: number
+    boot_order: number
+    bus: string
+    cache: string
+    capacity_mb: number
+    device_type: string
+    discard: string
+    disk_mode: string
+    free_mb: number
+    io: string
+    limit_iops: number
+    location: string
+    provision_type: string
+    read_only: boolean
+    shares: number
+    sharing: boolean
+    source: string
+    storage_id: string
+    target: string
+    used_mb: number
+    volume_path: string
+  }[]
+  input_devices: {
+    bus: string
+    type: string
+  }[]
+  memory: {
+    hotplug: boolean
+    limit_mb: number
+    reservation_mb: number
+    size_mb: number
+  }
+  monitoring: {
+    cpu: {
+      current_vcpus: number
+      provisioned_mhz: number
+      used_mhz: number
+    }
+    encryption: string
+    evc_cpu_mode: string
+    evc_graphics_mode: string
+    guest_tools: {
+      dns_name: string
+      ip: string
+      status: string
+      version: string
+    }
+    memory: {
+      dram_read_bandwidth: number
+      pmem_read_bandwidth: number
+      provisioned_mb: number
+      resident_set_size_mb: number
+      used_mb: number
+    }
+    networks: null // ?
+    state: number
+    storage: {
+      allocated_space_mb: number
+      provisioned_space_mb: number
+      used_space_mb: number
+    }
+    tpm: string
+    uptime: {
+      start_time: string
+      uptime_humanized: string
+      uptime_ms: number
+    }
+    vbs: string
+  }
+  network_devices: {
+    boot_order: number
+    import_source_id: string
+    mac: string
+    model: string
+    net_bridge: string
+    network: string
+    target: string
+  }[]
+  options: {
+    boot_options: {
+      boot_delay_ms: number
+      boot_menu: boolean
+      firmware: string
+    }
+    guest_tools: {
+      enabled: boolean
+      synchronized_time: boolean
+    }
+    remote_console: {
+      guest_os_lock: boolean
+      keymap: string
+      limit_sessions: number
+      password: string
+      port: number
+      spice: {
+        clipboard: boolean
+        file_transfer: boolean
+        img_compression: string
+        jpeg_compression: string
+        playback_compression: boolean
+        streaming_mode: string
+        zlib_glz_compression: string
+      }
+      type: string
+    }
+  }
+  passthrough_pci_devices: any[]
+  snapshots: any
+  storage: {
+    folder: string
+    id: string
+  }
+  usb_controllers: {
+    type: string
+  }[]
+  video_card: {
+    adapter: string
+    displays: number
+    memory_mb: number
+  }
+  host_id?: string
+}
+export interface UI_I_Pvm extends API_UI_I_Pvm {}
+
+export interface UI_I_CreateBackupFormDiskDevice {
+  location: string
+  target: string
+}
+export interface UI_I_CreateBackupForm {
+  target: string
+  name: string
+  description: string
+  disk_devices: UI_I_CreateBackupFormDiskDevice[]
+  backup_storage: string
+  strategy: 0 | 1 | 2
+  // start_window_min: number
+  bandwidth_limit: number
+}
+
+export interface UI_I_RestoreForm {
+  restore_code: 1 | 2 | 3 // 1 - disk only, 2 - existing, 3 - asNew
+  backup_storage: string
+  bucket: string
+  backup: string
+  pvm: UI_I_Pvm
+}
+
+export interface UI_I_BackupDatastore {
+  id: string
+  location: string
+  name: string
+  path: string
+  state: number // ??
+  type_code: number // ??
+  type_text: string
+  capacity: {
+    capacity_mb: number
+    free_mb: number
+    provisioned_mb: number
+    used_mb: number
+  }
+}
+export interface UI_I_BackupDatastoreTable
+  extends API_UI_I_DataTable<UI_I_BackupDatastore[]> {}

package/components/common/pages/backups/modals/restore/Restore.vue

@@ -32,21 +32,21 @@
         />
 
         <common-pages-backups-modals-restore-types
-          v-show="selectedStep.id === 0"
+          v-show="selectedStep.id === dynamicSteps.selectType"
           v-model="model"
         />
 
         <common-pages-backups-modals-restore-name
-          v-show="selectedStep.id === 1"
+          v-show="selectedStep.id === dynamicSteps.selectName"
           v-model="model"
-          :show="selectedStep.id === 1"
+          :show="selectedStep.id === dynamicSteps.selectName"
           :name-form-submit="nameFormSubmit"
-          @check-name="onCheckName(...$event)"
+          @check-name="onCheckName"
         />
 
         <!--        TODO refactoring-->
         <common-vm-actions-common-select-storage
-          v-show="selectedStep.id === 2"
+          v-show="selectedStep.id === dynamicSteps.selectStorage"
           :storage-submit="storageSubmit"
           :datastore="props.datastore"
           :is-datastore-loading="props.datastoreLoading"
@@ -56,11 +56,11 @@
         />
 
         <common-pages-backups-modals-restore-disks
-          v-show="selectedStep.id === 3"
+          v-show="selectedStep.id === dynamicSteps.selectDisks"
           v-model="model"
         />
         <common-pages-backups-modals-restore-networks
-          v-if="selectedStep.id === 4"
+          v-if="selectedStep.id === dynamicSteps.selectNetwork"
           v-model="model"
           :alert-messages="[]"
           :networks="props.networks"
@@ -68,7 +68,7 @@
         />
 
         <common-ready-to-complete
-          v-show="selectedStep.id === 5"
+          v-show="selectedStep.id === dynamicSteps.readyComplete"
           :data="readyToCompleteInfo"
         />
       </template>
@@ -93,16 +93,17 @@ import type {
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
-import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
-// import type { I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_NameCheck } from '~/components/common/pages/backups/modals/restore/name/lib/models/interfaces'
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
 import {
   stepsSchemeInitial,
   stepsFunc,
+  dynamicSteps,
 } from '~/components/common/pages/backups/modals/restore/lib/config/steps'
-// import { datastoreTableFunc } from '~/components/templates/inventory/actions/vm/lib/utils'
+import { restoreCodes } from '~/components/common/pages/backups/modals/restore/lib/config/restoreCodes'
 
-const model = defineModel<I_RestoreForm>({ required: true })
+const model = defineModel<UI_I_RestoreForm>({ required: true })
 
 const props = defineProps<{
   datastore: UI_I_DatastoreTableItem[]
@@ -112,12 +113,12 @@ const props = defineProps<{
 const emits = defineEmits<{
   (event: 'get-datastore', value: string): void
   (event: 'get-networks', value: string): void
-  (event: 'check-name', value: any): void // ??
+  (event: 'check-name', value: UI_I_NameCheck): void
   (event: 'finish'): void
   (event: 'hide'): void
 }>()
 
-const { $store } = useNuxtApp()
+const { $store }: any = useNuxtApp()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -155,21 +156,39 @@ const validationFunc = async (
 
   wizard.setLoader(true)
 
-  if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.selectName,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
     const nameValidation = await checkName(value)
 
     value = nameValidation.newValue
     stepHasError = stepHasError || nameValidation.stepHasError
   }
 
-  if (wizard.isValidateForStep(2, currentStep.id, nextStep.id)) {
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.selectStorage,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
     const validation = await checkStorage(value)
 
     value = validation.newValue
     stepHasError = stepHasError || validation.stepHasError
   }
 
-  if (wizard.isValidateForStep(3, currentStep.id, nextStep.id)) {
+  if (
+    wizard.isValidateForStep(
+      dynamicSteps.selectDisks,
+      currentStep.id,
+      nextStep.id
+    )
+  ) {
     const validation = checkDisks(value)
 
     value = validation.newValue
@@ -193,12 +212,12 @@ const checkName = async (
   return new Promise((resolve) => {
     nameFormSubmit.value = (isValid: boolean): void => {
       if (!isValid) {
-        stepHasError = wizard.setValidation(1, 'name', {
+        stepHasError = wizard.setValidation(dynamicSteps.selectName, 'name', {
           fieldMessage: 'aaa',
           alertMessage: 'aaa',
         })
-      } else if (wizard.hasMessage(1, 'name')) {
-        value = wizard.removeValidation(1, 'name', value)
+      } else if (wizard.hasMessage(dynamicSteps.selectName, 'name')) {
+        value = wizard.removeValidation(dynamicSteps.selectName, 'name', value)
       }
 
       resolve({
@@ -218,12 +237,20 @@ const checkStorage = async (
   return new Promise((resolve) => {
     storageSubmit.value = (isValid: boolean): void => {
       if (!isValid) {
-        stepHasError = wizard.setValidation(2, 'storage', {
-          fieldMessage: 'aaa',
-          alertMessage: 'aaa',
-        })
-      } else if (wizard.hasMessage(2, 'storage')) {
-        value = wizard.removeValidation(2, 'storage', value)
+        stepHasError = wizard.setValidation(
+          dynamicSteps.selectStorage,
+          'storage',
+          {
+            fieldMessage: 'aaa',
+            alertMessage: 'aaa',
+          }
+        )
+      } else if (wizard.hasMessage(dynamicSteps.selectStorage, 'storage')) {
+        value = wizard.removeValidation(
+          dynamicSteps.selectStorage,
+          'storage',
+          value
+        )
       }
 
       resolve({
@@ -240,13 +267,21 @@ const checkDisks = (value: UI_I_WizardStep[]): UI_I_ValidationReturn => {
 
   const isValidStores = !!model.value?.pvm.disk_devices.length
   if (!isValidStores) {
-    stepHasError = wizard.setValidation(3, 'disk_devices', {
-      fieldMessage: localization.value.common.diskIsRequired,
-      alertMessage: localization.value.common.diskIsRequired,
-    })
+    stepHasError = wizard.setValidation(
+      dynamicSteps.selectDisks,
+      'disk_devices',
+      {
+        fieldMessage: localization.value.common.diskIsRequired,
+        alertMessage: localization.value.common.diskIsRequired,
+      }
+    )
     showValidationErrors([localization.value.common.diskIsRequired])
-  } else if (wizard.hasMessage(3, 'disk_devices')) {
-    value = wizard.removeValidation(3, 'disk_devices', value)
+  } else if (wizard.hasMessage(dynamicSteps.selectDisks, 'disk_devices')) {
+    value = wizard.removeValidation(
+      dynamicSteps.selectDisks,
+      'disk_devices',
+      value
+    )
     onRemoveValidationErrors()
   }
 
@@ -256,10 +291,7 @@ const checkDisks = (value: UI_I_WizardStep[]): UI_I_ValidationReturn => {
   }
 }
 
-const getDatastoreTableFunc = async (
-    payload: UI_I_TablePayload
-): Promise<void> => {
-  console.log(payload, 111);
+const getDatastoreTableFunc = async (): Promise<void> => {
   emits('get-datastore', model.value.bucket)
 }
 
@@ -273,11 +305,8 @@ const onChangeStorage = (storage: UI_I_DatastoreTableItem | null): void => {
   }
 }
 
-const onCheckName = async (
-  name: string,
-  cb: (error: API_UI_I_Error) => void
-): Promise<void> => {
-  emits('check-name', { name, cb })
+const onCheckName = async (data: UI_I_NameCheck): Promise<void> => {
+  emits('check-name', data)
 }
 
 const isLoading = ref<boolean>(true)
@@ -298,14 +327,14 @@ const readyToCompleteInfo = computed<UI_I_TableInfoItem[]>(() => {
   const result = []
 
   switch (model.value.restore_code) {
-    case 1:
-    case 2:
+    case restoreCodes.diskOnly:
+    case restoreCodes.existing:
       result.push({
         label: localization.value.common.backup,
         value: model.value.backup,
       })
       break
-    case 3:
+    case restoreCodes.asNew:
       result.push({
         label: localization.value.common.vmName,
         value: model.value.pvm.name,
@@ -362,7 +391,7 @@ const onHideModal = (): void => {
 }
 
 const onRestore = (): void => {
-  if (model.value.restore_code === 2) {
+  if (model.value.restore_code === restoreCodes.existing) {
     isShowConfirm.value = true
   } else {
     onFinish()

package/components/common/pages/backups/modals/restore/disks/Disks.vue

@@ -10,17 +10,16 @@
 </template>
 
 <script lang="ts" setup>
-// import type { I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_Pvm } from '~/lib/models/store/vm/interfaces'
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
 
-const model = defineModel<I_RestoreForm>({ required: true })
+const model = defineModel<UI_I_RestoreForm>({ required: true })
 
 const { $store } = useNuxtApp()
 
-const disks = computed<UI_I_Pvm['disk_devices']>(
+const disks = computed<UI_I_RestoreForm['pvm']['disk_devices']>(
   () =>
     $store.getters['backup/getPvm']?.disk_devices.filter(
-      (disk: UI_I_Pvm['disk_devices'][0]) => disk.source
+      (disk: UI_I_RestoreForm['pvm']['disk_devices'][0]) => disk.source
     ) || []
 )
 </script>

package/components/common/pages/backups/modals/restore/disks/tableView/TableView.vue

@@ -26,23 +26,24 @@ import type {
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Pvm } from '~/lib/models/store/vm/interfaces'
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
 import { itemsPerPage } from '~/components/atoms/table/dataGrid/lib/config/itemsPerPage'
-// import type { I_DiskDevice } from '~/store/modules/backupManager/modules/backups/lib/models/interfaces'
-// import type { I_Pvm } from '~/store/modules/inventory/modules/backup/lib/models/interfaces'
-import * as table from '~/components/common/pages/backups/modals/createBackup/disks/tableView/lib/config/table'
+import * as table from '~/components/common/pages/backups/modals/restore/disks/tableView/lib/config/table'
 
 const props = defineProps<{
-  dataTable: I_DiskDevice[]
+  dataTable: UI_I_RestoreForm['pvm']['disk_devices']
   loading: boolean
   totalItems: number
   totalPages: number
 }>()
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selectedRows = defineModel<UI_I_Pvm['disk_devices']>('selected', {
-  required: true,
-})
+const selectedRows = defineModel<UI_I_RestoreForm['pvm']['disk_devices']>(
+  'selected',
+  {
+    required: true,
+  }
+)
 // const selectedRowsOld: I_Pvm['disk_devices'] = useDeepCopy(selectedRows.value)
 
 const selectedRowsLocal = ref<string[]>(