bfg-common 1.5.774 → 1.5.775

package/components/common/pages/backups/modals/createBackup/lib/validation/validations.ts

@@ -20,7 +20,7 @@ export const checkName = async (
   if (!name) {
     stepHasError = wizard.setValidation(dynamicSteps.general, 'name', {
       fieldMessage: localization.common.fieldRequired,
-      alertMessage: ''
+      alertMessage: localization.common.fieldRequired
     })
     wizard.setLoader(false)
     return { 
@@ -53,7 +53,7 @@ export const checkName = async (
 
         if (stepErrorMessage) {
           stepHasError = wizard.setValidation(dynamicSteps.general, 'name', {
-            fieldMessage: ' ',
+            fieldMessage: stepErrorMessage,
             alertMessage: stepErrorMessage
           })
         } else if (wizard.hasMessage(dynamicSteps.general, 'name')) {
@@ -76,17 +76,21 @@ export const checkDisks = (
   backupForm: UI_I_CreateBackupForm,
   wizard: Wizard,
   localization: UI_I_Localization,
+  showValidationErrors: (data: string[]) => void,
+  onRemoveValidationErrors: () => void
 ): UI_I_ValidationReturn => {
   let stepHasError = false
   const isValidStores = !!backupForm?.disk_devices.length
 
   if (!isValidStores) {
     stepHasError = wizard.setValidation(dynamicSteps.disks, 'disk_devices', {
-      fieldMessage: localization.common.selectLeastOneDisk,
-      alertMessage: localization.common.selectLeastOneDisk
+      fieldMessage: localization.common.diskIsRequired,
+      alertMessage: localization.common.diskIsRequired
     })
+    showValidationErrors([localization.common.diskIsRequired])
   } else if (wizard.hasMessage(dynamicSteps.disks, 'disk_devices')) {
     value = wizard.removeValidation(dynamicSteps.disks, 'disk_devices', value)
+    onRemoveValidationErrors()
   }
 
   return { 
@@ -100,17 +104,21 @@ export const checkDatastore = (
   backupForm: UI_I_CreateBackupForm,
   wizard: Wizard,
   localization: UI_I_Localization,
+  showValidationErrors: (data: string[]) => void,
+  onRemoveValidationErrors: () => void
 ): UI_I_ValidationReturn => {
   let stepHasError = false
   const isValidStorage = !!backupForm?.backup_storage.length
 
   if (!isValidStorage) {
     stepHasError = wizard.setValidation(dynamicSteps.datastores, 'backup_storage', {
-      fieldMessage: localization.common.selectBackupStorageToProceed,
-      alertMessage: localization.common.selectBackupStorageToProceed
+      fieldMessage: localization.common.datastoreIsRequired,
+      alertMessage: localization.common.datastoreIsRequired
     })
+    showValidationErrors([localization.common.datastoreIsRequired])
   } else if (wizard.hasMessage(dynamicSteps.datastores, 'backup_storage')) {
     value = wizard.removeValidation(dynamicSteps.datastores, 'backup_storage', value)
+    onRemoveValidationErrors()
   }
 
   return { stepHasError, newValue: value }

package/components/common/pages/backups/modals/deleteBackup/DeleteBackup.vue

@@ -48,7 +48,6 @@ const description = computed<string>(() => {
 
 const modalTexts = computed<UI_I_ModalTexts>(() => {
   return {
-    button1: localization.value.common.cancel,
     button2: props.isAll
       ? localization.value.common.deleteAll
       : localization.value.common.delete,

package/components/common/pages/backups/modals/lib/config/restore.ts

@@ -1,116 +1,115 @@
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-
-export const restoreDefaultFormFunc = (): UI_I_RestoreForm => {
-  return {
-    restore_code: 2,
-    backup_storage: '',
-    bucket: '',
-    backup: '',
-    copy_disks: [],
-    pvm: {
-      deployment_name: '',
-      name: '',
-      uuid: '',
-      compatibility: '',
-      guest_os_family: '',
-      guest_os_version: '',
-      storage: {
-        id: '',
-        folder: '',
-      },
-      machine_type: '',
-      cpu: {
-        vcpus: -1,
-        max_vcpus: -1,
-        core_per_socket: -1,
-        model: '',
-        reservation_mhz: -1,
-        limit_mhz: -1,
-        shares: -1,
-        hotplug: false,
-      },
-      memory: {
-        size_mb: -1,
-        hotplug: false,
-        reservation_mb: -1,
-        limit_mb: -1,
-      },
-      video_card: {
-        adapter: '',
-        displays: -1,
-        memory_mb: -1,
-      },
-      usb_controllers: [],
-      input_devices: [],
-      disk_devices: [],
-      network_devices: [],
-      passthrough_pci_devices: [],
-      options: {
-        remote_console: {
-          type: '',
-          port: -1,
-          keymap: '',
-          password: '',
-          guest_os_lock: false,
-          limit_sessions: -1,
-          spice: {
-            img_compression: '',
-            jpeg_compression: '',
-            zlib_glz_compression: '',
-            streaming_mode: '',
-            playback_compression: false,
-            file_transfer: false,
-            clipboard: false,
-          },
-        },
-        guest_tools: {
-          enabled: false,
-          synchronized_time: false,
-        },
-        boot_options: {
-          firmware: '',
-          boot_delay_ms: -1,
-          boot_menu: false,
-        },
-      },
-      monitoring: {
-        state: -1,
-        memory: {
-          dram_read_bandwidth: -1,
-          pmem_read_bandwidth: -1,
-          provisioned_mb: -1,
-          used_mb: -1,
-          resident_set_size_mb: -1,
-        },
-        cpu: {
-          current_vcpus: -1,
-          provisioned_mhz: -1,
-          used_mhz: -1,
-        },
-        storage: {
-          provisioned_space_mb: -1,
-          used_space_mb: -1,
-          allocated_space_mb: -1,
-        },
-        networks: null,
-        uptime: {
-          start_time: '',
-          uptime_ms: -1,
-          uptime_humanized: '',
-        },
-        guest_tools: {
-          status: '',
-          version: '',
-          ip: '',
-          dns_name: '',
-        },
-        evc_cpu_mode: '',
-        evc_graphics_mode: '',
-        encryption: '',
-        tpm: '',
-        vbs: '',
-      },
-      snapshots: {},
-    },
-  }
-}
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+
+export const restoreDefaultFormFunc = (): UI_I_RestoreForm => {
+  return {
+    restore_code: 2,
+    backup_storage: '',
+    bucket: '',
+    backup: '',
+    pvm: {
+      deployment_name: '',
+      name: '',
+      uuid: '',
+      compatibility: '',
+      guest_os_family: '',
+      guest_os_version: '',
+      storage: {
+        id: '',
+        folder: '',
+      },
+      machine_type: '',
+      cpu: {
+        vcpus: -1,
+        max_vcpus: -1,
+        core_per_socket: -1,
+        model: '',
+        reservation_mhz: -1,
+        limit_mhz: -1,
+        shares: -1,
+        hotplug: false,
+      },
+      memory: {
+        size_mb: -1,
+        hotplug: false,
+        reservation_mb: -1,
+        limit_mb: -1,
+      },
+      video_card: {
+        adapter: '',
+        displays: -1,
+        memory_mb: -1,
+      },
+      usb_controllers: [],
+      input_devices: [],
+      disk_devices: [],
+      network_devices: [],
+      passthrough_pci_devices: [],
+      options: {
+        remote_console: {
+          type: '',
+          port: -1,
+          keymap: '',
+          password: '',
+          guest_os_lock: false,
+          limit_sessions: -1,
+          spice: {
+            img_compression: '',
+            jpeg_compression: '',
+            zlib_glz_compression: '',
+            streaming_mode: '',
+            playback_compression: false,
+            file_transfer: false,
+            clipboard: false,
+          },
+        },
+        guest_tools: {
+          enabled: false,
+          synchronized_time: false,
+        },
+        boot_options: {
+          firmware: '',
+          boot_delay_ms: -1,
+          boot_menu: false,
+        },
+      },
+      monitoring: {
+        state: -1,
+        memory: {
+          dram_read_bandwidth: -1,
+          pmem_read_bandwidth: -1,
+          provisioned_mb: -1,
+          used_mb: -1,
+          resident_set_size_mb: -1,
+        },
+        cpu: {
+          current_vcpus: -1,
+          provisioned_mhz: -1,
+          used_mhz: -1,
+        },
+        storage: {
+          provisioned_space_mb: -1,
+          used_space_mb: -1,
+          allocated_space_mb: -1,
+        },
+        networks: null,
+        uptime: {
+          start_time: '',
+          uptime_ms: -1,
+          uptime_humanized: '',
+        },
+        guest_tools: {
+          status: '',
+          version: '',
+          ip: '',
+          dns_name: '',
+        },
+        evc_cpu_mode: '',
+        evc_graphics_mode: '',
+        encryption: '',
+        tpm: '',
+        vbs: '',
+      },
+      snapshots: {},
+    },
+  }
+}

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

@@ -1,187 +1,186 @@
-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
-}
-// TODO use from vms
-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 - as New
-  backup_storage: string
-  bucket: string
-  backup: string
-  copy_disks: UI_I_Pvm['disk_devices']
-  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[]> {}
+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
+}
+// TODO use from vms
+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[]> {}