bfg-common 1.5.774 → 1.5.775

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

@@ -1,50 +1,32 @@
-<template>
-  <common-pages-backups-modals-restore-disks-new
-    v-if="isNewView"
-    v-model="modelLocal"
-    :disks="disks"
-  />
-  <common-pages-backups-modals-restore-disks-old
-    v-else
-    v-model="modelLocal"
-    :disks="disks"
-  />
-</template>
-
-<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 props = defineProps<{
-  isCopy?: boolean
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const modelLocal = computed<UI_I_RestoreForm['pvm']['disk_devices']>({
-  get() {
-    return props.isCopy ? model.value.copy_disks : model.value.pvm.disk_devices
-  },
-  set(newValue) {
-    if (props.isCopy) model.value.copy_disks = newValue
-    else model.value.pvm.disk_devices = newValue
-  },
-})
-
-const disks = computed<UI_I_RestoreForm['pvm']['disk_devices']>(() => {
-  if (props.isCopy) {
-    return $store.getters['backup/getBackupDisks'] || []
-  } else {
-    return (
-      $store.getters['backup/getPvm']?.disk_devices.filter(
-        (disk: UI_I_RestoreForm['pvm']['disk_devices'][0]) => disk.source
-      ) || []
-    )
-  }
-})
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-pages-backups-modals-restore-disks-new
+    v-if="isNewView"
+    v-model="model"
+    :disks="disks"
+  />
+  <common-pages-backups-modals-restore-disks-old
+    v-else
+    v-model="model"
+    :disks="disks"
+  />
+</template>
+
+<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 { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const disks = computed<UI_I_RestoreForm['pvm']['disk_devices']>(
+  () =>
+    $store.getters['backup/getPvm']?.disk_devices.filter(
+      (disk: UI_I_RestoreForm['pvm']['disk_devices'][0]) => disk.source
+    ) || []
+)
+
+</script>
+
+<style lang="scss" scoped></style>

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"
+    v-model="model.pvm.disk_devices"
     :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['pvm']['disk_devices']>({ required: true })
+const model = defineModel<UI_I_RestoreForm>({ 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"
+      v-model:selected="model.pvm.disk_devices"
       :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['pvm']['disk_devices']>({ required: true })
+const model = defineModel<UI_I_RestoreForm>({ required: true })
 const props = defineProps<{
   disks: UI_I_RestoreForm['pvm']['disk_devices']
 }>()

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

@@ -1,94 +1,62 @@
-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
-}
+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'
+
+
+export const readyToCompleteOptions = (model: UI_I_RestoreForm, localization: UI_I_Localization, selectedStorageName: string): UI_I_TableInfoItem[] => {
+  const result = []
+
+  switch (model.restore_code) {
+    case restoreCodes.diskOnly:
+    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
+      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'
+        })
+      })
+
+      // 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

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

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

@@ -1,130 +1,108 @@
-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
-]
+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.readyComplete], // disk only
+  [dynamicSteps.selectType, dynamicSteps.readyComplete], // existing
+  [
+    dynamicSteps.selectType,
+    dynamicSteps.selectName,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectDisks,
+    dynamicSteps.selectNetwork,
+    dynamicSteps.readyComplete
+  ] // as new
+]

package/components/common/pages/backups/modals/restore/types/Types.vue

@@ -1,31 +1,19 @@
-<template>
-  <component
-    :is="currentComponent"
-    v-model="model"
-    :backup-types="backupTypes"
-  />
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { backupsTypesFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/typeOptions'
-
-const model = defineModel<UI_I_RestoreForm>({ required: true })
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const backupTypes = ref<UI_I_OptionItem[]>(backupsTypesFunc(localization.value))
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-pages-backups-modals-restore-types-new
+    v-if="isNewView"
+    v-model="model"
+  />
+  <common-pages-backups-modals-restore-types-old v-else v-model="model" />
+</template>
+
+<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 { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>
+
+<style scoped lang="scss"></style>