bfg-common 1.5.737 → 1.5.739

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

@@ -1,6 +1,6 @@
 <template>
   <common-pages-backups-modals-restore-disks-table-view-new-table
-    v-model="model.pvm.disk_devices"
+    v-model="model"
     :disks="props.disks"
   />
 </template>
@@ -8,7 +8,7 @@
 <script lang="ts" setup>
 import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
 
-const model = defineModel<UI_I_RestoreForm>({ required: true })
+const model = defineModel<UI_I_RestoreForm['pvm']['disk_devices']>({ required: true })
 const props = defineProps<{
   disks: UI_I_RestoreForm['pvm']['disk_devices']
 }>()

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

@@ -1,7 +1,7 @@
 <template>
   <div class="disks h-full">
     <common-pages-backups-modals-restore-disks-table-view-old-table
-      v-model:selected="model.pvm.disk_devices"
+      v-model:selected="model"
       :data-table="props.disks"
       :total-items="props.disks.length"
       :total-pages="1"
@@ -12,7 +12,7 @@
 <script lang="ts" setup>
 import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
 
-const model = defineModel<UI_I_RestoreForm>({ required: true })
+const model = defineModel<UI_I_RestoreForm['pvm']['disk_devices']>({ required: true })
 const props = defineProps<{
   disks: UI_I_RestoreForm['pvm']['disk_devices']
 }>()

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

@@ -1,85 +1,94 @@
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
-import { restoreCodes } from '~/components/common/pages/backups/modals/restore/lib/config/restoreCodes'
-
-const getDisks = (
-  model: UI_I_RestoreForm,
-  localization: UI_I_Localization
-): UI_I_TableInfoItem[] => {
-  const result: UI_I_TableInfoItem[] = []
-
-  model.pvm.disk_devices.forEach((disk_device, i) => {
-    if (!disk_device.source) return
-
-    result.push({
-      label: `${localization.common.disk} ${i}`,
-      value: disk_device.source,
-      iconClassName: 'icon-vSphere-dsVmDisk',
-    })
-  })
-
-  return result
-}
-
-export const readyToCompleteOptions = (
-  model: UI_I_RestoreForm,
-  localization: UI_I_Localization,
-  selectedStorageName: string
-): UI_I_TableInfoItem[] => {
-  const result: UI_I_TableInfoItem[] = []
-
-  switch (model.restore_code) {
-    case restoreCodes.diskOnly:
-      result.push({
-        label: localization.common.backup,
-        value: model.backup,
-        iconClassName: 'icon-backup',
-      })
-      // Disks
-      result.push(...getDisks(model, localization))
-      break
-    case restoreCodes.existing:
-      result.push({
-        label: localization.common.backup,
-        value: model.backup,
-        iconClassName: 'icon-backup',
-      })
-      break
-    case restoreCodes.asNew:
-    case restoreCodes.asNewAndCopy:
-      result.push({
-        label: localization.common.vmName,
-        value: model.pvm.name,
-        iconClassName: 'vsphere-icon-vm',
-      })
-
-      // Datastores
-      result.push({
-        label: localization.common.datastore,
-        value: selectedStorageName,
-        iconClassName: 'vsphere-icon-datastore',
-      })
-
-      // Disks
-      result.push(...getDisks(model, localization))
-
-      // Networks
-      model.pvm.network_devices.forEach((network) => {
-        result.push({
-          label: localization.common.network,
-          value: network.network,
-          iconClassName: 'vsphere-icon-network',
-        })
-      })
-      break
-    // case 1:
-    //   result.push({
-    //     label: localization.value.common.vmName,
-    //     value: model.value.pvm.name,
-    //   })
-    //   break
-  }
-
-  return result
-}
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
+import { restoreCodes } from '~/components/common/pages/backups/modals/restore/lib/config/restoreCodes'
+
+const getDisks = (
+  model: UI_I_RestoreForm,
+  localization: UI_I_Localization
+): UI_I_TableInfoItem[] => {
+  const result: UI_I_TableInfoItem[] = []
+
+  model.pvm.disk_devices.forEach((disk_device, i) => {
+    if (!disk_device.source) return
+
+    result.push({
+      label: `${localization.common.disk} ${i}`,
+      value: disk_device.source,
+      iconClassName: 'icon-vSphere-dsVmDisk',
+    })
+  })
+
+  return result
+}
+
+export const readyToCompleteOptions = (
+  model: UI_I_RestoreForm,
+  localization: UI_I_Localization,
+  selectedStorageName: string
+): UI_I_TableInfoItem[] => {
+  const result: UI_I_TableInfoItem[] = []
+
+  switch (model.restore_code) {
+    case restoreCodes.diskOnly:
+      result.push({
+        label: localization.common.backup,
+        value: model.backup,
+        iconClassName: 'icon-backup',
+      })
+      // Disks
+      result.push(...getDisks(model, localization))
+      break
+    case restoreCodes.existing:
+      result.push({
+        label: localization.common.backup,
+        value: model.backup,
+        iconClassName: 'icon-backup',
+      })
+      break
+    case restoreCodes.asNew:
+      result.push({
+        label: localization.common.vmName,
+        value: model.pvm.name,
+        iconClassName: 'vsphere-icon-vm',
+      })
+
+      // Datastores
+      result.push({
+        label: localization.common.datastore,
+        value: selectedStorageName,
+        iconClassName: 'vsphere-icon-datastore',
+      })
+
+      // Disks
+      result.push(...getDisks(model, localization))
+
+      // Disks for Copy
+      model.copy_disks.forEach((disk_device, i) => {
+        result.push({
+          // label: `${localization.common.disk} ${i}`,
+          label: localization.backup.diskCopyN.replace('{0}', i.toString()),
+          value: disk_device.source,
+          iconClassName: 'icon-vSphere-dsVmDisk',
+        })
+      })
+
+      // Networks
+      model.pvm.network_devices.forEach((network) => {
+        result.push({
+          label: localization.common.network,
+          value: network.network,
+          iconClassName: 'vsphere-icon-network',
+        })
+      })
+      break
+    // case 1:
+    //   result.push({
+    //     label: localization.value.common.vmName,
+    //     value: model.value.pvm.name,
+    //   })
+    //   break
+  }
+
+  return result
+}

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

@@ -2,5 +2,4 @@ export const restoreCodes = {
     diskOnly: 1,
     existing: 2,
     asNew: 3,
-    asNewAndCopy: 4
 }

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

@@ -1,121 +1,130 @@
-import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const dynamicSteps = {
-  selectType: 0,
-  selectName: 1,
-  selectStorage: 2,
-  selectDisks: 3,
-  selectNetwork: 4,
-  readyComplete: 5,
-}
-
-export const stepsFunc = (
-  localization: UI_I_Localization
-): UI_I_WizardStep[] => {
-  return [
-    {
-      id: dynamicSteps.selectType,
-      stepName: '',
-      title: localization.backup.selectType,
-      subTitle: '',
-      status: UI_E_WIZARD_STATUS.SELECTED,
-      isValid: true,
-      fields: {},
-      testId: 'backup-restore-type',
-    },
-    {
-      id: dynamicSteps.selectName,
-      stepName: '',
-      title: localization.common.selectName,
-      subTitle: 'Specify a unique name for the virtual machine.',
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'backup-restore-select-name',
-      fields: {
-        name: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    {
-      id: dynamicSteps.selectStorage,
-      stepName: '',
-      title: localization.common.selectStorage,
-      subTitle: 'Select a storage for the configuration and disk files.',
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'backup-restore-select-storage',
-      fields: {
-        storage: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    {
-      id: dynamicSteps.selectDisks,
-      stepName: '',
-      title: localization.common.selectDisks,
-      subTitle: localization.common.selectDisksInvolvedBackup,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      fields: {
-        disk_devices: {
-          field: '',
-          alert: '',
-        },
-      },
-      testId: 'backup-restore-select--disks',
-    },
-    {
-      id: dynamicSteps.selectNetwork,
-      stepName: '',
-      title: localization.common.selectNetwork,
-      subTitle: 'Select adapter types and networks in Procurator.',
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'backup-restore-select-network',
-      fields: {},
-    },
-    {
-      id: dynamicSteps.readyComplete,
-      stepName: '',
-      title: localization.common.readyComplete,
-      subTitle: localization.backup.restoreBackupReviewSubtitle,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'backup-restore-ready-complete',
-      fields: {},
-    },
-  ]
-}
-
-export const stepsSchemeInitial = [
-  // [0, 1, 5], // disk only
-  [
-    dynamicSteps.selectType,
-    dynamicSteps.selectDisks,
-    dynamicSteps.readyComplete,
-  ], // disk only
-  // [dynamicSteps.selectType, dynamicSteps.readyComplete], // disk only
-  [dynamicSteps.selectType, dynamicSteps.readyComplete], // existing
-  [
-    dynamicSteps.selectType,
-    dynamicSteps.selectName,
-    dynamicSteps.selectStorage,
-    dynamicSteps.selectDisks,
-    dynamicSteps.selectNetwork,
-    dynamicSteps.readyComplete,
-  ], // as new
-  [
-    dynamicSteps.selectType,
-    dynamicSteps.selectName,
-    dynamicSteps.selectStorage,
-    dynamicSteps.selectDisks,
-    dynamicSteps.selectNetwork,
-    dynamicSteps.readyComplete,
-  ], // as new and copy other disks (like as new)
-]
+import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+export const dynamicSteps = {
+  selectType: 0,
+  selectName: 1,
+  selectStorage: 2,
+  selectDisks: 3,
+  selectDisksForCopy: 4,
+  selectNetwork: 5,
+  readyComplete: 6,
+}
+
+export const stepsFunc = (
+    localization: UI_I_Localization
+): UI_I_WizardStep[] => {
+  return [
+    {
+      id: dynamicSteps.selectType,
+      stepName: '',
+      title: localization.backup.selectType,
+      subTitle: '',
+      status: UI_E_WIZARD_STATUS.SELECTED,
+      isValid: true,
+      fields: {},
+      testId: 'backup-restore-type',
+    },
+    {
+      id: dynamicSteps.selectName,
+      stepName: '',
+      title: localization.common.selectName,
+      subTitle: 'Specify a unique name for the virtual machine.',
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'backup-restore-select-name',
+      fields: {
+        name: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    {
+      id: dynamicSteps.selectStorage,
+      stepName: '',
+      title: localization.common.selectStorage,
+      subTitle: 'Select a storage for the configuration and disk files.',
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'backup-restore-select-storage',
+      fields: {
+        storage: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    {
+      id: dynamicSteps.selectDisks,
+      stepName: '',
+      title: localization.common.selectDisks,
+      subTitle: localization.common.selectDisksInvolvedBackup,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      fields: {
+        disk_devices: {
+          field: '',
+          alert: '',
+        },
+      },
+      testId: 'backup-restore-select-disks',
+    },
+    {
+      id: dynamicSteps.selectDisksForCopy,
+      stepName: '',
+      title: localization.common.selectDisksForCopy,
+      subTitle: localization.common.selectDisksInvolvedBackup,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      fields: {
+        disk_devices: {
+          field: '',
+          alert: '',
+        },
+      },
+      testId: 'backup-restore-select-disks-for-copy',
+    },
+    {
+      id: dynamicSteps.selectNetwork,
+      stepName: '',
+      title: localization.common.selectNetwork,
+      subTitle: 'Select adapter types and networks in Procurator.', // TODO
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'backup-restore-select-network',
+      fields: {},
+    },
+    {
+      id: dynamicSteps.readyComplete,
+      stepName: '',
+      title: localization.common.readyComplete,
+      subTitle: localization.backup.restoreBackupReviewSubtitle,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'backup-restore-ready-complete',
+      fields: {},
+    },
+  ]
+}
+
+export const stepsSchemeInitial = [
+  // [0, 1, 5], // disk only
+  [
+    dynamicSteps.selectType,
+    dynamicSteps.selectDisks,
+    dynamicSteps.readyComplete,
+  ], // disk only
+  // [dynamicSteps.selectType, dynamicSteps.readyComplete], // disk only
+  [dynamicSteps.selectType, dynamicSteps.readyComplete], // existing
+  [
+    dynamicSteps.selectType,
+    dynamicSteps.selectName,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectDisks,
+    dynamicSteps.selectDisksForCopy,
+    dynamicSteps.selectNetwork,
+    dynamicSteps.readyComplete,
+  ], // as new
+]

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
+}