bfg-common 1.5.773 → 1.5.775

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

@@ -1,20 +1,11 @@
 <template>
   <div class="disks h-full">
-    <atoms-alert
-      v-show="props.alertMessages.length"
-      status="alert-danger"
-      :items="props.alertMessages"
-      test-id="create-backup-disks-alert"
-      @remove="onRemoveErrors"
-    />
-
     <common-pages-backups-modals-create-backup-disks-table-view-old-table-view
       v-model:selected="model.disk_devices"
       :data-table="props.disks"
       :loading="props.disksLoading"
       :total-items="props.disks.length"
       :total-pages="1"
-      class="disks-table"
     />
   </div>
 </template>
@@ -24,26 +15,14 @@ import type {
   UI_I_CreateBackupForm,
   UI_I_Pvm
 } from "~/components/common/pages/backups/modals/lib/models/interfaces";
-import { dynamicSteps } from '~/components/common/pages/backups/modals/createBackup/lib/config/steps'
 
 const model = defineModel<UI_I_CreateBackupForm>({ required: true })
 
 const props = defineProps<{
   disks: UI_I_Pvm['disk_devices']
   disksLoading: boolean
-  alertMessages: string[]
-}>()
-const emits = defineEmits<{
-  (event: 'remove-validation-errors', value: number): void
 }>()
 
-const onRemoveErrors = (): void => {
-  emits('remove-validation-errors', dynamicSteps.disks)
-}
 </script>
 
-<style lang="scss" scoped>
-.disks-table {
-  margin-top: 5px;
-}
-</style>
+<style lang="scss" scoped></style>

package/components/common/pages/backups/modals/createBackup/disks/tableView/new/TableView.vue

@@ -61,7 +61,7 @@ const texts = computed<UI_I_TableTexts>(() => ({
   searchHere: localization.value.common.searchHere,
   rowsPerPage: localization.value.common.rowsPerPage,
   of: localization.value.common.of,
-  selected: localization.value.common.selected2,
+  selected: localization.value.common.selected,
   columns: localization.value.common.columns,
   previous: localization.value.common.previous,
   next: localization.value.common.next,

package/components/common/pages/backups/modals/createBackup/disks/tableView/new/lib/config/table.ts

@@ -19,7 +19,7 @@ export const getHeaderDataFunc = (
     text: localization.common.source,
     isSortable: true,
     sort: 'asc',
-    width: '352px',
+    width: '368px',
     show: true,
     filter: true
   },
@@ -29,7 +29,7 @@ export const getHeaderDataFunc = (
     text: localization.common.deviceType,
     isSortable: true,
     sort: 'asc',
-    width: '160px',
+    width: '136px',
     show: true,
     filter: true
   },
@@ -39,7 +39,7 @@ export const getHeaderDataFunc = (
     text: localization.common.bus,
     isSortable: true,
     sort: 'asc',
-    width: '136px',
+    width: '112px',
     show: true,
     filter: true
   },
@@ -49,7 +49,7 @@ export const getHeaderDataFunc = (
     text: localization.common.target,
     isSortable: true,
     sort: 'asc',
-    width: '136px',
+    width: '112px',
     show: true,
     filter: true
   },
@@ -59,7 +59,7 @@ export const getHeaderDataFunc = (
     text: localization.common.capacity,
     isSortable: true,
     sort: 'asc',
-    width: '136px',
+    width: '112px',
     show: true,
     filter: true
   },
@@ -69,7 +69,7 @@ export const getHeaderDataFunc = (
     text: localization.common.used,
     isSortable: true,
     sort: 'asc',
-    width: '136px',
+    width: '112px',
     show: true,
     filter: true
   },
@@ -79,7 +79,7 @@ export const getHeaderDataFunc = (
     text: localization.common.free,
     isSortable: true,
     sort: 'asc',
-    width: '136px',
+    width: '112px',
     show: true,
     filter: true
   },

package/components/common/pages/backups/modals/createBackup/general/General.vue

@@ -9,8 +9,6 @@
     v-else
     v-model="model"
     :show="props.show"
-    :alert-messages="props.alertMessages"
-    @remove-validation-errors="emits('remove-validation-errors', $event)"
   />
 </template>
 
@@ -23,11 +21,7 @@ const model = defineModel<UI_I_CreateBackupForm>({ required: true })
 
 const props = defineProps<{
   show: boolean
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-  alertMessages: string[]
-}>()
-const emits = defineEmits<{
-  (event: 'remove-validation-errors', value: number): void
+  messagesFields?: UI_I_ArbitraryObject<UI_I_ErrorFields>
 }>()
 
 const { $store }: any = useNuxtApp()

package/components/common/pages/backups/modals/createBackup/general/GeneralNew.vue

@@ -30,7 +30,7 @@
         v-model="model.description"
         :placeholder="localization.common.description"
         test-id="vm-backup-name-input"
-        height="92"
+        height="84"
       />
     </div>
   </div>

package/components/common/pages/backups/modals/createBackup/general/GeneralOld.vue

@@ -1,13 +1,5 @@
 <template>
   <div class="general">
-    <atoms-alert
-      v-show="props.alertMessages.length"
-      status="alert-danger"
-      :items="props.alertMessages"
-      test-id="create-backup-name-alert"
-      @remove="onRemoveErrors"
-    />
-
     <form @submit.prevent>
       <div class="field flex pt-4">
         <label for="general-name">{{ localization.common.name }}:</label>
@@ -37,16 +29,11 @@
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import { dynamicSteps } from '~/components/common/pages/backups/modals/createBackup/lib/config/steps'
 
 const model = defineModel<UI_I_CreateBackupForm>({ required: true })
 
 const props = defineProps<{
   show: boolean
-  alertMessages: string[]
-}>()
-const emits = defineEmits<{
-  (event: 'remove-validation-errors', value: number): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -64,10 +51,6 @@ watch(
     }, 0)
   }
 )
-
-const onRemoveErrors = (): void => {
-  emits('remove-validation-errors', dynamicSteps.general)
-}
 </script>
 
 <style lang="scss" scoped>

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

@@ -18,12 +18,12 @@ export const readyToCompleteOptions = (
     // General
     {
       label: localization.common.name,
-      value: backupForm.name || '--',
+      value: backupForm.name,
       iconClassName: 'icon-backup',
     },
     {
       label: localization.common.description,
-      value: backupForm.description || '--',
+      value: backupForm.description,
     },
   ]
 
@@ -31,7 +31,7 @@ export const readyToCompleteOptions = (
   backupForm.disk_devices.forEach((disk_device, i) => {
     result.push({
       label: `${localization.common.disk} ${i + 1}`,
-      value: disk_device.location || '--',
+      value: disk_device.location,
       iconClassName: 'icon-vSphere-dsVmDisk',
     })
   })
@@ -42,7 +42,7 @@ export const readyToCompleteOptions = (
   )
   result.push({
     label: localization.common.datastore,
-    value: datastore?.name || '--',
+    value: datastore?.name || '',
     iconClassName: 'vsphere-icon-datastore',
   })
 
@@ -51,7 +51,7 @@ export const readyToCompleteOptions = (
     label: localization.common.strategy,
     value:
       strategyOptions.find((option) => option.value === backupForm.strategy)
-        ?.label || '--',
+        ?.label || '',
   })
 
   const gbSizeByB = 1_073_741_824

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

@@ -62,7 +62,7 @@ export const stepsFunc = (
       stepName: '',
       title: localization.common.datastores,
 
-      subTitle: localization.common.selectBackupStorageConfigurationDiskFiles,
+      subTitle: localization.common.selectStorageConfigurationDiskFiles2,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
       fields: {

package/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions.ts

@@ -4,19 +4,10 @@ import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/
 export const strategyOptionsFunc = (
   localization: UI_I_Localization
 ): UI_I_SelectInputItem[] => {
-  const { $text } = useNuxtApp()
-  const isLangEn = useLocalStorage('lang') === 'en_US'
-
-  const labels = [
+  return [
     { label: localization.common.fullBackup, value: 0 },
     { label: localization.common.incrementalBackup, value: 1 },
     { label: localization.common.differentialBackup, value: 2 },
   ]
-
-  return isLangEn
-    ? labels.map((item) => ({
-        ...item,
-        label: $text.toCapitalizeEveryWord(item.label),
-      }))
-    : labels
 }
+

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

@@ -1,8 +1,8 @@
-export interface UI_I_DynamicSteps {
-  general: number
-  disks: number
-  datastores: number
-  configuration: number
-  readyComplete: number
-  schedulingOptions: number
-}
+export interface UI_I_DynamicSteps {
+  general: number
+  disks: number
+  datastores: number
+  configuration: number
+  readyComplete: number
+  schedulingOptions: number
+}

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

@@ -6,7 +6,6 @@ export const restoreDefaultFormFunc = (): UI_I_RestoreForm => {
     backup_storage: '',
     bucket: '',
     backup: '',
-    copy_disks: [],
     pvm: {
       deployment_name: '',
       name: '',

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

@@ -160,11 +160,10 @@ export interface UI_I_CreateBackupForm {
 }
 
 export interface UI_I_RestoreForm {
-  restore_code: 1 | 2 | 3 // 1 - disk only, 2 - existing, 3 - as New
+  restore_code: 1 | 2 | 3 // 1 - disk only, 2 - existing, 3 - asNew
   backup_storage: string
   bucket: string
   backup: string
-  copy_disks: UI_I_Pvm['disk_devices']
   pvm: UI_I_Pvm
 }
 

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

@@ -1,6 +1,6 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-pages-backups-modals-restore-new
+    v-if="isNewView"
     v-model="model"
     v-model:is-show-confirm="isShowConfirm"
     :wizard="wizard"
@@ -12,8 +12,28 @@
     :networks="props.networks"
     :ready-complete-data="readyToCompleteInfo"
     :selected-storage="selectedStorage"
+    @change-storage="onChangeStorage"
+    @get-datastore="getDatastoreTableFunc"
+    @get-networks="onGetNetworks"
+    @change-steps="onChangeSteps"
+    @submit-confirm="onFinish"
+    @hide="onHideModal"
+    @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"
+    :storage-submit="storageSubmit"
     :is-loading="isLoading"
     :errors="errors"
+    :datastore="props.datastore"
+    :datastore-loading="props.datastoreLoading"
+    :networks="props.networks"
+    @remove-validation-errors="onRemoveValidationErrors"
     @change-storage="onChangeStorage"
     @get-datastore="getDatastoreTableFunc"
     @get-networks="onGetNetworks"
@@ -21,7 +41,6 @@
     @submit-confirm="onFinish"
     @hide="onHideModal"
     @submit-wizard="onSubmitWizard"
-    @remove-validation-errors="onRemoveValidationErrors"
   />
 </template>
 
@@ -69,11 +88,6 @@ const { $store }: any = useNuxtApp()
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
 
 const wizard: Wizard = new Wizard(
   stepsFunc(localization.value),
@@ -223,33 +237,20 @@ const onChangeStorage = (storage: UI_I_DatastoreTableItem | null): void => {
   }
 }
 
-const loadingCount = ref<number>(0)
-const isLoading = computed<boolean>(() => loadingCount.value !== 0)
+const isLoading = ref<boolean>(true)
 // В Сфере и Прокураторе одно и тоже
 const getPvm = async (): Promise<void> => {
-  loadingCount.value++
   await $store.dispatch('backup/A_GET_PVM', {
     target: model.value.backup_storage,
     bucketId: model.value.bucket, // TODO bucket поменять на vm так как это сейчас vm
     backupId: model.value.backup,
   })
 
-  loadingCount.value--
-}
-getPvm()
-// В Сфере и Прокураторе одно и тоже
-const getBackupDisks = async (): Promise<void> => {
-  loadingCount.value++
-  await $store.dispatch('backup/A_GET_BACKUP_DISKS', {
-    target: model.value.backup_storage,
-    bucketId: model.value.bucket, // TODO bucket поменять на vm так как это сейчас vm
-    backupId: model.value.backup,
-  })
-
+  model.value.pvm = useDeepCopy($store.getters['backup/getPvm'])
   model.value.pvm.disk_devices = [] // ToDo если не обнулить тогда в форме всегда будет выбранны диски
-  loadingCount.value--
+  isLoading.value = false
 }
-getBackupDisks()
+getPvm()
 
 const readyToCompleteInfo = computed<UI_I_TableInfoItem[]>(() =>
   readyToCompleteOptions(

package/components/common/pages/backups/modals/restore/{Old.vue → RestoreOld.vue}

@@ -58,11 +58,6 @@
           v-show="selectedStep.id === dynamicSteps.selectDisks"
           v-model="model"
         />
-        <common-pages-backups-modals-restore-disks
-          v-show="selectedStep.id === dynamicSteps.selectDisksForCopy"
-          v-model="model"
-          is-copy
-        />
         <common-pages-backups-modals-restore-networks
           v-if="selectedStep.id === dynamicSteps.selectNetwork"
           v-model="model"

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

@@ -1,12 +1,12 @@
 <template>
   <common-pages-backups-modals-restore-disks-new
     v-if="isNewView"
-    v-model="modelLocal"
+    v-model="model"
     :disks="disks"
   />
   <common-pages-backups-modals-restore-disks-old
     v-else
-    v-model="modelLocal"
+    v-model="model"
     :disks="disks"
   />
 </template>
@@ -16,35 +16,17 @@ import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/
 
 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']>(
+  () =>
+    $store.getters['backup/getPvm']?.disk_devices.filter(
+      (disk: UI_I_RestoreForm['pvm']['disk_devices'][0]) => disk.source
+    ) || []
+)
 
-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>

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']
 }>()