bfg-common 1.5.550 → 1.5.551

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

@@ -1,186 +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 - 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[]> {}
+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[]> {}

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

@@ -2,6 +2,7 @@
   <common-pages-backups-modals-restore-new
     v-if="isNewView"
     v-model="model"
+    v-model:is-show-confirm="isShowConfirm"
     :wizard="wizard"
     :selected-scheme="selectedScheme"
     :alert-messages="alertMessages"
@@ -15,12 +16,14 @@
     @get-datastore="getDatastoreTableFunc"
     @get-networks="onGetNetworks"
     @change-steps="onChangeSteps"
+    @submit-confirm="onFinish"
     @hide="onHideModal"
-    @submit="onRestore"
+    @submit-wizard="onSubmitWizard"
   />
   <common-pages-backups-modals-restore-old
     v-else
     v-model="model"
+    v-model:is-show-confirm="isShowConfirm"
     :wizard="wizard"
     :selected-scheme="selectedScheme"
     :ready-complete-data="readyToCompleteInfo"
@@ -35,8 +38,9 @@
     @get-datastore="getDatastoreTableFunc"
     @get-networks="onGetNetworks"
     @change-steps="onChangeSteps"
-    @finish="onRestore"
+    @submit-confirm="onFinish"
     @hide="onHideModal"
+    @submit-wizard="onSubmitWizard"
   />
 </template>
 
@@ -271,7 +275,9 @@ const onHideModal = (): void => {
   emits('hide')
 }
 
-const onRestore = (): void => {
+const isShowConfirm = ref<boolean>(false)
+
+const onSubmitWizard = (): void => {
   if (model.value.restore_code === restoreCodes.existing) {
     isShowConfirm.value = true
   } else {
@@ -279,8 +285,6 @@ const onRestore = (): void => {
   }
 }
 
-const isShowConfirm = ref<boolean>(false)
-
 const onGetNetworks = (hostId: string): void => {
   emits('get-networks', hostId)
 }

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

@@ -10,7 +10,7 @@
     class="restore-wizard"
     @change-steps="onChangeSteps"
     @hide="onHideModal"
-    @submit="onCreateDatastore"
+    @submit="emits('submit-wizard')"
   >
     <template #content="{ selectedStep }">
       <ui-wizard-block
@@ -161,6 +161,15 @@
       </ui-wizard-block>
     </template>
   </ui-wizard>
+
+  <common-modals-confirmation
+    v-if="isShowConfirm"
+    :headline="localization.common.restoreConfirmation"
+    :description="localization.common.restoreConfirmationDesc"
+    icon-name="circle-warning"
+    @hide-modal="isShowConfirm = false"
+    @confirm="emits('submit-confirm')"
+  />
 </template>
 
 <script setup lang="ts">
@@ -178,6 +187,7 @@ import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interface
 import { dynamicSteps } from '~/components/common/pages/backups/modals/restore/lib/config/steps'
 
 const model = defineModel<UI_I_RestoreForm>({ required: true })
+const isShowConfirm = defineModel<boolean>('is-show-confirm')
 
 const props = defineProps<{
   wizard: Wizard
@@ -195,8 +205,9 @@ const emits = defineEmits<{
   (event: 'change-storage', value: UI_I_DatastoreTableItem | null): void
   (event: 'get-datastore', value: string): void
   (event: 'get-networks', value: string): void
+  (event: 'submit-confirm'): void
   (event: 'hide'): void
-  (event: 'submit'): void
+  (event: 'submit-wizard'): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -250,7 +261,6 @@ const onGetNetworks = (hostId: string): void => {
 }
 
 const onHideModal = (): void => emits('hide')
-const onCreateDatastore = (): void => emits('submit')
 </script>
 
 <style scoped lang="scss">

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

@@ -9,7 +9,7 @@
       test-id="restore"
       @change-steps="onChangeSteps"
       @hide="onHideModal"
-      @submit="onRestore"
+      @submit="emits('submit-wizard')"
     >
       <template #modalBody="{ selectedStep }">
         <div
@@ -79,7 +79,7 @@
     :headline="localization.common.attention"
     :description="localization.common.restoreBackupConfirmDescription"
     @hide-modal="isShowConfirm = false"
-    @confirm="onFinish"
+    @confirm="emits('submit-confirm')"
   />
 </template>
 
@@ -93,15 +93,15 @@ import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interface
 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 { dynamicSteps } from '~/components/common/pages/backups/modals/restore/lib/config/steps'
-import { restoreCodes } from '~/components/common/pages/backups/modals/restore/lib/config/restoreCodes'
 
 const model = defineModel<UI_I_RestoreForm>({ required: true })
+const isShowConfirm = defineModel<boolean>('is-show-confirm')
 
 const props = defineProps<{
   wizard: Wizard
   selectedScheme: number[]
   readyCompleteData: UI_I_TableInfoItem[]
-  nameFormSubmit: null | Function
+  // nameFormSubmit: null | Function
   storageSubmit: null | Function
   isLoading: boolean
   errors: string[]
@@ -116,7 +116,8 @@ const emits = defineEmits<{
   (event: 'get-networks', value: string): void
   (event: 'check-name', value: UI_I_NameCheck): void
   (event: 'change-steps', value: UI_I_WizardStep[]): void
-  (event: 'finish'): void
+  (event: 'submit-confirm'): void
+  (event: 'submit-wizard'): void
   (event: 'hide'): void
 }>()
 
@@ -138,23 +139,10 @@ const onCheckName = async (data: UI_I_NameCheck): Promise<void> => {
   emits('check-name', data)
 }
 
-const onFinish = (): void => {
-  emits('finish')
-}
 const onHideModal = (): void => {
   emits('hide')
 }
 
-const onRestore = (): void => {
-  if (model.value.restore_code === restoreCodes.existing) {
-    isShowConfirm.value = true
-  } else {
-    onFinish()
-  }
-}
-
-const isShowConfirm = ref<boolean>(false)
-
 const onGetNetworks = (hostId: string): void => {
   emits('get-networks', hostId)
 }

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

@@ -1,6 +1,6 @@
-import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
-
-export interface UI_I_NameCheck {
-  name: string
-  cb: (error: API_UI_I_Error) => void
-}
+import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+
+export interface UI_I_NameCheck {
+  name: string
+  cb: (error: API_UI_I_Error) => void
+}

package/components/common/pages/home/lib/models/interfaces.ts

@@ -1,48 +1,48 @@
-import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
-import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
-import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
-
-export interface UI_I_ZoneList extends UI_I_Option {}
-export interface UI_I_Hosts {
-  connected: number
-  disconnected: number
-  maintenance: number
-  total: number
-}
-
-export interface UI_I_Vms {
-  powered_on: number
-  powered_off: number
-  suspended: number
-  total: number
-}
-
-export interface UI_I_Alert {
-  item: string
-  type: UI_T_NodeType
-  id: number
-  alerts: number
-  warnings: number
-}
-
-export interface UI_I_Service {
-  id: number
-  item: string
-  statusIcon: string
-  statusText: string
-  version: string
-}
-
-export interface UI_I_HomeInfo {
-  resource_meter: UI_I_Resources[]
-  vms: UI_I_Vms
-  alerts: UI_I_Alert[]
-  services: UI_I_Service[]
-  hosts?: UI_I_Hosts
-}
-
-export interface UI_I_Card {
-  text: string
-  value: number
-  icon?: string
-}
+import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
+import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
+
+export interface UI_I_ZoneList extends UI_I_Option {}
+export interface UI_I_Hosts {
+  connected: number
+  disconnected: number
+  maintenance: number
+  total: number
+}
+
+export interface UI_I_Vms {
+  powered_on: number
+  powered_off: number
+  suspended: number
+  total: number
+}
+
+export interface UI_I_Alert {
+  item: string
+  type: UI_T_NodeType
+  id: number
+  alerts: number
+  warnings: number
+}
+
+export interface UI_I_Service {
+  id: number
+  item: string
+  statusIcon: string
+  statusText: string
+  version: string
+}
+
+export interface UI_I_HomeInfo {
+  resource_meter: UI_I_Resources[]
+  vms: UI_I_Vms
+  alerts: UI_I_Alert[]
+  services: UI_I_Service[]
+  hosts?: UI_I_Hosts
+}
+
+export interface UI_I_Card {
+  text: string
+  value: number
+  icon?: string
+}