bfg-common 1.5.523 → 1.5.524

package/assets/scss/common/icons/icons-1.scss

@@ -3,7 +3,7 @@
   background-position: 0 50.6329113924%;
 }
 .vx-icon-cloneVmToVm {
-  background-position: 0 46.82%;
+  background-position: 0 51.82%;
 }
 .vsphere-icon-Host_Reboot {
   background-position: 0 8.8607594937%;

package/components/common/pages/backups/modals/createBackup/CreateBackup.vue

@@ -1,196 +1,196 @@
-<template>
-  <common-pages-backups-modals-create-backup-new
-    v-if="isNewView"
-    v-model="backupForm"
-    v-model:scheduler-form="schedulerForm"
-    :wizard="wizard"
-    :selected-scheme="selectedScheme"
-    :alert-messages="alertMessages"
-    :title="title"
-    :is-scheduled-tasks="props.isScheduledTasks"
-    :is-edit-scheduled-tasks="props.isEditScheduledTasks"
-    :target="props.target"
-    :selected-vm-name="props.selectedVmName"
-    :disks="props.disks"
-    :disks-loading="props.disksLoading"
-    :datastore-table="props.datastoreTable"
-    :datastore-table-loading="props.datastoreTableLoading"
-    :ready-to-complete-data="readyToCompleteInfo"
-    @change-steps="onChangeSteps"
-    @submit="emits('finish')"
-    @hide="emits('hide')"
-  />
-  <common-pages-backups-modals-create-backup-old
-    v-else
-    v-model="backupForm"
-    v-model:scheduler-form="schedulerForm"
-    :wizard="wizard"
-    :selected-scheme="selectedScheme"
-    :alert-messages="alertMessages"
-    :title="title"
-    :alert-errors="errors"
-    :is-scheduled-tasks="props.isScheduledTasks"
-    :is-edit-scheduled-tasks="props.isEditScheduledTasks"
-    :target="props.target"
-    :selected-vm-name="props.selectedVmName"
-    :disks="props.disks"
-    :disks-loading="props.disksLoading"
-    :datastore-table="props.datastoreTable"
-    :datastore-table-loading="props.datastoreTableLoading"
-    :ready-to-complete-data="readyToCompleteInfo"
-    @change-step-create-backup="onChangeSteps"
-    @remove-validation-errors="onRemoveValidationErrors"
-    @finish="emits('finish')"
-    @hide="emits('hide')"
-  />
-</template>
-
-<script setup lang="ts">
-
-import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
-import type { UI_I_ValidationReturn } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import type {UI_I_Localization} from "~/lib/models/interfaces";
-import {
-  stepsSchemeInitial,
-  stepsFunc,
-  dynamicSteps
-} from '~/components/common/pages/backups/modals/createBackup/lib/config/steps'
-import type {
-  UI_I_BackupDatastoreTable,
-  UI_I_CreateBackupForm,
-  UI_I_Pvm
-} from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
-import {
-  readyToCompleteOptions
-} from '~/components/common/pages/backups/modals/createBackup/lib/config/readyToCompleteOptions'
-import {
-  checkName,
-  checkDisks,
-  checkDatastore,
-  checkConfiguration
-} from '~/components/common/pages/backups/modals/createBackup/lib/validation/validations'
-import type {UI_I_NameCheck} from "~/components/common/pages/backups/modals/restore/name/lib/models/interfaces";
-import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
-import type {UI_I_TableInfoItem} from "~/components/atoms/table/info/lib/models/interfaces";
-
-
-const backupForm = defineModel<UI_I_CreateBackupForm>({ required: true })
-const schedulerForm = defineModel('schedulerForm', { required: true })
-
-const props = defineProps<{
-  isEdit: boolean // ToDo проверить на использование
-  target: string
-  isScheduledTasks: boolean
-  isEditScheduledTasks: boolean
-  selectedVmName: string
-  disks: UI_I_Pvm['disk_devices']
-  disksLoading: boolean
-  datastoreTable: UI_I_BackupDatastoreTable | null
-  datastoreTableLoading: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'change-step-create-backup', value: UI_I_WizardStep[]): void
-  (event: 'check-name', value: UI_I_NameCheck): void
-  (event: 'finish'): void
-  (event: 'hide'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const title = computed<string>(() => {
-  const { createBackup, updateBackup, scheduleNewTasks, scheduleTaskEdit } =
-    localization.value.common
-  let result = props.isEdit ? updateBackup : createBackup
-  if (props.isScheduledTasks) {
-    const schedulerMode = props.isEditScheduledTasks
-      ? scheduleTaskEdit
-      : scheduleNewTasks
-
-    result = `${schedulerMode} (${createBackup})`
-  }
-
-  return result
-})
-
-
-const wizard: Wizard = new Wizard(
-  stepsFunc(localization.value),
-  stepsSchemeInitial(props.isScheduledTasks)
-)
-
-const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
-const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
-
-const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
-  emits('change-step-create-backup', value)
-  wizard.changeSteps(value, validationFunc)
-}
-
-const validationFunc = async (
-  value: UI_I_WizardStep[],
-  currentStep: UI_I_WizardStep,
-  nextStep: UI_I_WizardStep
-): Promise<UI_I_ValidationReturn> => {
-  let stepHasError = false
-  const stepShouldStop = {
-    ifOnCurrentStep: false,
-    ifFromAnyStep: false,
-    stoppageStepId: -1
-  }
-
-  if (wizard.isValidateForStep(dynamicSteps.general, currentStep.id, nextStep.id)) {
-    const nameValidation = await checkName(value, backupForm.value.name, wizard, localization.value, emits)
-    value = nameValidation.newValue
-    stepHasError = nameValidation.stepHasError
-  }
-
-  if (wizard.isValidateForStep(dynamicSteps.disks, currentStep.id, nextStep.id)) {
-    const disksValidation = checkDisks(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
-    value = disksValidation.newValue
-    stepHasError = disksValidation.stepHasError
-  }
-
-  if (wizard.isValidateForStep(dynamicSteps.datastores, currentStep.id, nextStep.id)) {
-    const datastoreValidation = checkDatastore(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
-    value = datastoreValidation.newValue
-    stepHasError = datastoreValidation.stepHasError
-  }
-
-  if (wizard.isValidateForStep(dynamicSteps.configuration, currentStep.id, nextStep.id)) {
-    const configurationValidation = checkConfiguration(value, backupForm.value.bandwidth_limit, wizard, localization.value)
-    value = configurationValidation.newValue
-    stepHasError = configurationValidation.stepHasError
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-    stepShouldStop
-  }
-}
-
-const errors = ref<string[]>([])
-const showValidationErrors = (data: string[]): void => {
-  errors.value = data
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
-
-const strategyOptions = ref<UI_I_SelectInputItem[]>(
-  strategyOptionsFunc(localization.value)
-)
-
-const readyToCompleteInfo = computed<UI_I_TableInfoItem[]>(() => {
-  return readyToCompleteOptions(backupForm.value, localization.value, strategyOptions.value)
-})
-
-</script>
+<template>
+  <common-pages-backups-modals-create-backup-new
+    v-if="isNewView"
+    v-model="backupForm"
+    v-model:scheduler-form="schedulerForm"
+    :wizard="wizard"
+    :selected-scheme="selectedScheme"
+    :alert-messages="alertMessages"
+    :title="title"
+    :is-scheduled-tasks="props.isScheduledTasks"
+    :is-edit-scheduled-tasks="props.isEditScheduledTasks"
+    :target="props.target"
+    :selected-vm-name="props.selectedVmName"
+    :disks="props.disks"
+    :disks-loading="props.disksLoading"
+    :datastore-table="props.datastoreTable"
+    :datastore-table-loading="props.datastoreTableLoading"
+    :ready-to-complete-data="readyToCompleteInfo"
+    @change-steps="onChangeSteps"
+    @submit="emits('finish')"
+    @hide="emits('hide')"
+  />
+  <common-pages-backups-modals-create-backup-old
+    v-else
+    v-model="backupForm"
+    v-model:scheduler-form="schedulerForm"
+    :wizard="wizard"
+    :selected-scheme="selectedScheme"
+    :alert-messages="alertMessages"
+    :title="title"
+    :alert-errors="errors"
+    :is-scheduled-tasks="props.isScheduledTasks"
+    :is-edit-scheduled-tasks="props.isEditScheduledTasks"
+    :target="props.target"
+    :selected-vm-name="props.selectedVmName"
+    :disks="props.disks"
+    :disks-loading="props.disksLoading"
+    :datastore-table="props.datastoreTable"
+    :datastore-table-loading="props.datastoreTableLoading"
+    :ready-to-complete-data="readyToCompleteInfo"
+    @change-step-create-backup="onChangeSteps"
+    @remove-validation-errors="onRemoveValidationErrors"
+    @finish="emits('finish')"
+    @hide="emits('hide')"
+  />
+</template>
+
+<script setup lang="ts">
+
+import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import type { UI_I_ValidationReturn } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type {UI_I_Localization} from "~/lib/models/interfaces";
+import {
+  stepsSchemeInitial,
+  stepsFunc,
+  dynamicSteps
+} from '~/components/common/pages/backups/modals/createBackup/lib/config/steps'
+import type {
+  UI_I_BackupDatastoreTable,
+  UI_I_CreateBackupForm,
+  UI_I_Pvm
+} from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
+import {
+  readyToCompleteOptions
+} from '~/components/common/pages/backups/modals/createBackup/lib/config/readyToCompleteOptions'
+import {
+  checkName,
+  checkDisks,
+  checkDatastore,
+  checkConfiguration
+} from '~/components/common/pages/backups/modals/createBackup/lib/validation/validations'
+import type {UI_I_NameCheck} from "~/components/common/pages/backups/modals/restore/name/lib/models/interfaces";
+import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
+import type {UI_I_TableInfoItem} from "~/components/atoms/table/info/lib/models/interfaces";
+
+
+const backupForm = defineModel<UI_I_CreateBackupForm>({ required: true })
+const schedulerForm = defineModel('schedulerForm', { required: true })
+
+const props = defineProps<{
+  isEdit: boolean // ToDo проверить на использование
+  target: string
+  isScheduledTasks: boolean
+  isEditScheduledTasks: boolean
+  selectedVmName: string
+  disks: UI_I_Pvm['disk_devices']
+  disksLoading: boolean
+  datastoreTable: UI_I_BackupDatastoreTable | null
+  datastoreTableLoading: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'change-step-create-backup', value: UI_I_WizardStep[]): void
+  (event: 'check-name', value: UI_I_NameCheck): void
+  (event: 'finish'): void
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const title = computed<string>(() => {
+  const { createBackup, updateBackup, scheduleNewTasks, scheduleTaskEdit } =
+    localization.value.common
+  let result = props.isEdit ? updateBackup : createBackup
+  if (props.isScheduledTasks) {
+    const schedulerMode = props.isEditScheduledTasks
+      ? scheduleTaskEdit
+      : scheduleNewTasks
+
+    result = `${schedulerMode} (${createBackup})`
+  }
+
+  return result
+})
+
+
+const wizard: Wizard = new Wizard(
+  stepsFunc(localization.value),
+  stepsSchemeInitial(props.isScheduledTasks)
+)
+
+const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
+const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
+
+const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
+  emits('change-step-create-backup', value)
+  wizard.changeSteps(value, validationFunc)
+}
+
+const validationFunc = async (
+  value: UI_I_WizardStep[],
+  currentStep: UI_I_WizardStep,
+  nextStep: UI_I_WizardStep
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+  const stepShouldStop = {
+    ifOnCurrentStep: false,
+    ifFromAnyStep: false,
+    stoppageStepId: -1
+  }
+
+  if (wizard.isValidateForStep(dynamicSteps.general, currentStep.id, nextStep.id)) {
+    const nameValidation = await checkName(value, backupForm.value.name, wizard, localization.value, emits)
+    value = nameValidation.newValue
+    stepHasError = nameValidation.stepHasError
+  }
+
+  if (wizard.isValidateForStep(dynamicSteps.disks, currentStep.id, nextStep.id)) {
+    const disksValidation = checkDisks(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
+    value = disksValidation.newValue
+    stepHasError = disksValidation.stepHasError
+  }
+
+  if (wizard.isValidateForStep(dynamicSteps.datastores, currentStep.id, nextStep.id)) {
+    const datastoreValidation = checkDatastore(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
+    value = datastoreValidation.newValue
+    stepHasError = datastoreValidation.stepHasError
+  }
+
+  if (wizard.isValidateForStep(dynamicSteps.configuration, currentStep.id, nextStep.id)) {
+    const configurationValidation = checkConfiguration(value, backupForm.value.bandwidth_limit, wizard, localization.value)
+    value = configurationValidation.newValue
+    stepHasError = configurationValidation.stepHasError
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+    stepShouldStop
+  }
+}
+
+const errors = ref<string[]>([])
+const showValidationErrors = (data: string[]): void => {
+  errors.value = data
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
+}
+
+const strategyOptions = ref<UI_I_SelectInputItem[]>(
+  strategyOptionsFunc(localization.value)
+)
+
+const readyToCompleteInfo = computed<UI_I_TableInfoItem[]>(() => {
+  return readyToCompleteOptions(backupForm.value, localization.value, strategyOptions.value, props.datastoreTable)
+})
+
+</script>
 <style scoped lang="scss"></style>

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

@@ -1,59 +1,69 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-
-export const readyToCompleteOptions = (backupForm: UI_I_CreateBackupForm, localization: UI_I_Localization, strategyOptions: UI_I_SelectInputItem[]): UI_I_TableInfoItem[] => {
-  const { $binary } = useNuxtApp()
-
-  const result = [
-    // General
-    {
-      label: localization.common.name,
-      value: backupForm.name,
-      iconClassName: 'icon-backup'
-    },
-    {
-      label: localization.common.description,
-      value: backupForm.description
-    }
-  ]
-
-  // Disks
-  backupForm.disk_devices.forEach((disk_device, i) => {
-    result.push({
-      label: `${localization.common.disk} ${i + 1}`,
-      value: disk_device.location,
-      iconClassName: 'icon-vSphere-dsVmDisk'
-    })
-  })
-
-  // Datastores
-  result.push({
-    label: localization.common.datastore,
-    value: 'test',
-    iconClassName: 'vsphere-icon-datastore'
-  })
-
-  // Configuration
-  result.push({
-    label: localization.common.strategy,
-    value:
-      strategyOptions.find(
-        (option) => option.value === backupForm.strategy
-      )?.label || ''
-  })
-
-  const gbSizeByB = 1_073_741_824
-  const maxBandwidth =
-    backupForm.bandwidth_limit >= gbSizeByB
-      ? $binary.bToGb(backupForm.bandwidth_limit) + ' Gbps'
-      : $binary.bToMb(backupForm.bandwidth_limit) + ' Mbps'
-
-  result.push({
-    label: localization.common.maxBandwidth,
-    value: maxBandwidth
-  })
-
-  return result
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_BackupDatastoreTable,
+  UI_I_CreateBackupForm,
+} from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+
+export const readyToCompleteOptions = (
+  backupForm: UI_I_CreateBackupForm,
+  localization: UI_I_Localization,
+  strategyOptions: UI_I_SelectInputItem[],
+  datastoreTable: UI_I_BackupDatastoreTable | null
+): UI_I_TableInfoItem[] => {
+  const { $binary } = useNuxtApp()
+
+  const result = [
+    // General
+    {
+      label: localization.common.name,
+      value: backupForm.name,
+      iconClassName: 'icon-backup',
+    },
+    {
+      label: localization.common.description,
+      value: backupForm.description,
+    },
+  ]
+
+  // Disks
+  backupForm.disk_devices.forEach((disk_device, i) => {
+    result.push({
+      label: `${localization.common.disk} ${i + 1}`,
+      value: disk_device.location,
+      iconClassName: 'icon-vSphere-dsVmDisk',
+    })
+  })
+
+  // Datastores
+  const datastore = datastoreTable?.items.find(
+    (item) => item.id === backupForm.backup_storage
+  )
+  result.push({
+    label: localization.common.datastore,
+    value: datastore?.name || '',
+    iconClassName: 'vsphere-icon-datastore',
+  })
+
+  // Configuration
+  result.push({
+    label: localization.common.strategy,
+    value:
+      strategyOptions.find((option) => option.value === backupForm.strategy)
+        ?.label || '',
+  })
+
+  const gbSizeByB = 1_073_741_824
+  const maxBandwidth =
+    backupForm.bandwidth_limit >= gbSizeByB
+      ? $binary.bToGb(backupForm.bandwidth_limit) + ' Gbps'
+      : $binary.bToMb(backupForm.bandwidth_limit) + ' Mbps'
+
+  result.push({
+    label: localization.common.maxBandwidth,
+    value: maxBandwidth,
+  })
+
+  return result
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.523",
+  "version": "1.5.524",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",