bfg-common 1.5.539 → 1.5.541

package/components/common/pages/backups/modals/restore/disks/tableView/{lib → old/lib}/config/table.ts

@@ -1,117 +1,117 @@
-import type {
-  UI_I_HeadItem,
-  UI_I_ColumnKey,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import {
-  constructHeadItem,
-  constructColumnKey,
-} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-import { tableKeys } from '~/components/common/pages/backups/modals/restore/disks/tableView/lib/config/keys'
-
-const getItems = (
-  localization: UI_I_Localization
-): [string, boolean, string, string][] => {
-  return [
-    [localization.common.source, true, '180px', tableKeys[0]],
-    [localization.common.deviceType, true, '180px', tableKeys[1]],
-    [localization.common.bus, true, '180px', tableKeys[2]],
-    [localization.common.target, true, '180px', tableKeys[3]],
-    [localization.common.capacity, true, '180px', tableKeys[4]],
-    [localization.common.used, true, '180px', tableKeys[5]],
-    [localization.common.free, true, '180px', tableKeys[6]],
-    [localization.common.volumePath, true, '180px', tableKeys[7]],
-  ]
-}
-export const columnKeys = (
-  localization: UI_I_Localization
-): UI_I_ColumnKey[] => {
-  const result: UI_I_ColumnKey[] = []
-  getItems(localization).forEach((item, i) => {
-    result.push(
-      constructColumnKey(`col${i}`, item[0], item[1], `show-column-${item[3]}`)
-    )
-  })
-  return result
-}
-export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  getItems(localization).forEach((item, i) => {
-    result.push(
-      constructHeadItem(
-        `col${i}`,
-        item[0],
-        item[3],
-        true,
-        item[2],
-        undefined,
-        item[3]
-      )
-    )
-  })
-  return result
-}
-
-export const bodyItems = (
-  data: UI_I_RestoreForm['pvm']['disk_devices']
-): UI_I_BodyItem[][] => {
-  const { $binary }: any = useNuxtApp()
-  const lang = useLocalStorage('lang') === 'ru_RU' ? 'ru' : 'en'
-
-  const bodyItems: UI_I_BodyItem[][] = []
-  data.forEach((disk: UI_I_RestoreForm['pvm']['disk_devices'][0]) => {
-    bodyItems.push([
-      {
-        key: 'col0',
-        text: disk[tableKeys[0]],
-        id: disk.source,
-        data: {
-          location: disk.source,
-          target: disk.target,
-        },
-      },
-      {
-        key: 'col1',
-        text: disk[tableKeys[1]],
-        id: disk.source,
-      },
-      {
-        key: 'col2',
-        text: disk[tableKeys[2]],
-        id: disk.source,
-      },
-      {
-        key: 'col3',
-        text: disk[tableKeys[3]],
-        id: disk.source,
-      },
-      {
-        key: 'col4',
-        text: $binary.round(disk[tableKeys[4]], false, lang),
-        id: disk.source,
-      },
-      {
-        key: 'col5',
-        text: $binary.round(
-          disk[tableKeys[4]] - disk[tableKeys[6]],
-          false,
-          lang
-        ),
-        id: disk.source,
-      },
-      {
-        key: 'col6',
-        text: $binary.round(disk[tableKeys[6]], false, lang),
-        id: disk.source,
-      },
-      {
-        key: 'col7',
-        text: disk[tableKeys[7]],
-        id: disk.source,
-      },
-    ])
-  })
-  return bodyItems
-}
+import type {
+  UI_I_HeadItem,
+  UI_I_ColumnKey,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import {
+  constructHeadItem,
+  constructColumnKey,
+} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+import { tableKeys } from '~/components/common/pages/backups/modals/restore/disks/tableView/old/lib/config/keys'
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [localization.common.source, true, '180px', tableKeys[0]],
+    [localization.common.deviceType, true, '180px', tableKeys[1]],
+    [localization.common.bus, true, '180px', tableKeys[2]],
+    [localization.common.target, true, '180px', tableKeys[3]],
+    [localization.common.capacity, true, '180px', tableKeys[4]],
+    [localization.common.used, true, '180px', tableKeys[5]],
+    [localization.common.free, true, '180px', tableKeys[6]],
+    [localization.common.volumePath, true, '180px', tableKeys[7]],
+  ]
+}
+export const columnKeys = (
+  localization: UI_I_Localization
+): UI_I_ColumnKey[] => {
+  const result: UI_I_ColumnKey[] = []
+  getItems(localization).forEach((item, i) => {
+    result.push(
+      constructColumnKey(`col${i}`, item[0], item[1], `show-column-${item[3]}`)
+    )
+  })
+  return result
+}
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  getItems(localization).forEach((item, i) => {
+    result.push(
+      constructHeadItem(
+        `col${i}`,
+        item[0],
+        item[3],
+        true,
+        item[2],
+        undefined,
+        item[3]
+      )
+    )
+  })
+  return result
+}
+
+export const bodyItems = (
+  data: UI_I_RestoreForm['pvm']['disk_devices']
+): UI_I_BodyItem[][] => {
+  const { $binary }: any = useNuxtApp()
+  const lang = useLocalStorage('lang') === 'ru_RU' ? 'ru' : 'en'
+
+  const bodyItems: UI_I_BodyItem[][] = []
+  data.forEach((disk: UI_I_RestoreForm['pvm']['disk_devices'][0]) => {
+    bodyItems.push([
+      {
+        key: 'col0',
+        text: disk[tableKeys[0]],
+        id: disk.source,
+        data: {
+          location: disk.source,
+          target: disk.target,
+        },
+      },
+      {
+        key: 'col1',
+        text: disk[tableKeys[1]],
+        id: disk.source,
+      },
+      {
+        key: 'col2',
+        text: disk[tableKeys[2]],
+        id: disk.source,
+      },
+      {
+        key: 'col3',
+        text: disk[tableKeys[3]],
+        id: disk.source,
+      },
+      {
+        key: 'col4',
+        text: $binary.round(disk[tableKeys[4]], false, lang),
+        id: disk.source,
+      },
+      {
+        key: 'col5',
+        text: $binary.round(
+          disk[tableKeys[4]] - disk[tableKeys[6]],
+          false,
+          lang
+        ),
+        id: disk.source,
+      },
+      {
+        key: 'col6',
+        text: $binary.round(disk[tableKeys[6]], false, lang),
+        id: disk.source,
+      },
+      {
+        key: 'col7',
+        text: disk[tableKeys[7]],
+        id: disk.source,
+      },
+    ])
+  })
+  return bodyItems
+}

package/components/common/pages/backups/modals/restore/disks/tableView/{lib → old/lib}/models/types.ts

@@ -6,5 +6,5 @@ export type UI_T_DiskTableKeysTuple = [
   'capacity_mb',
   'used_mb',
   'free_mb',
-  'volume_path',
+  'volume_path'
 ]

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

@@ -0,0 +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'
+
+
+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/steps.ts

@@ -8,7 +8,7 @@ export const dynamicSteps = {
   selectStorage: 2,
   selectDisks: 3,
   selectNetwork: 4,
-  readyComplete: 5,
+  readyComplete: 5
 }
 
 export const stepsFunc = (
@@ -18,42 +18,42 @@ export const stepsFunc = (
     {
       id: dynamicSteps.selectType,
       stepName: '',
-      title: localization.common.selectAType,
+      title: localization.backup.selectType,
       subTitle: '',
       status: UI_E_WIZARD_STATUS.SELECTED,
       isValid: true,
       fields: {},
-      testId: 'backup-restore-type',
+      testId: 'backup-restore-type'
     },
     {
       id: dynamicSteps.selectName,
       stepName: '',
       title: localization.common.selectName,
-      subTitle: '',
+      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: '',
-        },
-      },
+          alert: ''
+        }
+      }
     },
     {
       id: dynamicSteps.selectStorage,
       stepName: '',
       title: localization.common.selectStorage,
-      subTitle: '',
+      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: '',
-        },
-      },
+          alert: ''
+        }
+      }
     },
     {
       id: dynamicSteps.selectDisks,
@@ -65,31 +65,31 @@ export const stepsFunc = (
       fields: {
         disk_devices: {
           field: '',
-          alert: '',
-        },
+          alert: ''
+        }
       },
-      testId: 'backup-restore-select--disks',
+      testId: 'backup-restore-select--disks'
     },
     {
       id: dynamicSteps.selectNetwork,
       stepName: '',
       title: localization.common.selectNetwork,
-      subTitle: '',
+      subTitle: 'Select adapter types and networks in Procurator.',
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
       testId: 'backup-restore-select-network',
-      fields: {},
+      fields: {}
     },
     {
       id: dynamicSteps.readyComplete,
       stepName: '',
       title: localization.common.readyComplete,
-      subTitle: localization.common.clickFinishRestore,
+      subTitle: localization.backup.restoreBackupReviewSubtitle,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
       testId: 'backup-restore-ready-complete',
-      fields: {},
-    },
+      fields: {}
+    }
   ]
 }
 
@@ -103,6 +103,6 @@ export const stepsSchemeInitial = [
     dynamicSteps.selectStorage,
     dynamicSteps.selectDisks,
     dynamicSteps.selectNetwork,
-    dynamicSteps.readyComplete,
-  ], // as new
+    dynamicSteps.readyComplete
+  ] // as new
 ]

package/components/common/pages/backups/modals/restore/name/Name.vue

@@ -1,166 +1,31 @@
-<template>
-  <div class="select-name">
-    <atoms-alert
-      v-show="errors.length"
-      :items="errors"
-      status="alert-danger"
-      test-id="name-alert"
-      @remove="onRemoveValidationErrors"
-    />
-
-    <form
-      id="virtual-machine-form"
-      class="flex items-center pt-5"
-      @submit.prevent
-    >
-      <label for="virtual-machine-name"
-        >{{ localization.common.virtualMachineName }}:</label
-      >
-      <input
-        id="virtual-machine-name"
-        v-model.trim="model.pvm.name"
-        data-id="virtual-machine-name-input"
-        type="text"
-        maxlength="54"
-      />
-    </form>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/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'
-
-const model = defineModel<UI_I_RestoreForm>({ required: true })
-
-const props = defineProps<{
-  show: boolean
-  nameFormSubmit: null | Function
-}>()
-const emits = defineEmits<{
-  (event: 'check-name', value: UI_I_NameCheck): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-watch(
-  () => props.nameFormSubmit,
-  (newValue) => {
-    newValue && submit(newValue)
-  }
-)
-
-const submit = async (cb: Function): Promise<void> => {
-  const name = model.value.pvm.name
-
-  if (name !== '') {
-    const isNameValid = await checkNameIsValid(name)
-    if (!isNameValid) {
-      // @ts-ignore
-      cb(false)
-      return
-    }
-  }
-
-  onRemoveValidationErrors()
-  // @ts-ignore
-  cb(true)
-}
-const checkNameIsValid = async (name: string): Promise<boolean> => {
-  return new Promise((resolve) => {
-    emits('check-name', {
-      name,
-      cb: (error): void => {
-        const status = error?.statusCode || 200
-        switch (status) {
-          case 400: // Empty name
-            showValidationErrors([
-              localization.value.common.emptyNameValidationDescription,
-            ])
-            resolve(false)
-            break
-          case 405: // Invalid kind
-            showValidationErrors([
-              localization.value.common.kindValidationDescription,
-            ])
-            resolve(false)
-            break
-          case 406: // Invalid name
-            showValidationErrors([
-              localization.value.common.nameValidationDescription,
-            ])
-            resolve(false)
-            break
-          case 409: // Name exist
-            showValidationErrors([
-              localization.value.common.vmNameExistInSelectedLocation,
-            ])
-            resolve(false)
-            break
-        }
-
-        resolve(true)
-      },
-    })
-  })
-}
-
-const errors = ref<string[]>([])
-const showValidationErrors = (data: string[]): void => {
-  errors.value = data
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
-
-watch(
-  () => props.show,
-  (newValue) => {
-    if (!newValue) return
-
-    const input = document.getElementById('virtual-machine-name')
-    if (!input) return
-
-    setTimeout(() => {
-      input.focus()
-    }, 0)
-  }
-)
-</script>
-
-<style scoped lang="scss">
-.select-name {
-  form {
-    label {
-      width: 216px;
-    }
-    input {
-      width: 345px;
-    }
-  }
-
-  .tree-view-wrap {
-    position: relative;
-    border: 1px solid #000;
-    padding: 5px;
-    max-height: 300px;
-    min-height: 200px;
-    overflow: auto;
-    margin-bottom: 10px;
-  }
-}
-.content-signpost {
-  .icon-show-help {
-    cursor: pointer;
-  }
-
-  .help-title {
-    font-size: 22px;
-    margin-bottom: 24px;
-  }
-  .signpost {
-    max-width: 360px;
-  }
-}
-</style>
+<template>
+  <common-pages-backups-modals-restore-name-new
+    v-if="isNewView"
+    v-model="model"
+    :messages-fields="props.messagesFields"
+  />
+  <common-pages-backups-modals-restore-name-old
+    v-else
+    v-model="model"
+    :show="props.show"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ErrorFields } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
+
+const model = defineModel<UI_I_RestoreForm>({ required: true })
+
+const props = defineProps<{
+  show: boolean
+  messagesFields?: UI_I_ArbitraryObject<UI_I_ErrorFields>
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>
+
+<style scoped lang="scss"></style>