bfg-common 1.5.773 → 1.5.775

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

@@ -1,36 +1,36 @@
-import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-import type { UI_T_BackupActionType } from '~/components/common/pages/backups/lib/models/types'
-
-export interface API_UI_I_Backup {
-  creation_time: number
-  creation_type: number
-  description: string
-  kind: number // TODO
-  msg: string
-  name: string
-  state: number // TODO
-  uuid: string
-  vm_name: string
-  vmid: string
-  storage_id: string
-  storage_name: string
-}
-
-export interface UI_I_Backup extends API_UI_I_Backup {}
-
-export interface UI_I_BackupsTreeNode
-  extends UI_I_TreeNode<UI_I_BackupsTreeNode> {
-  parent_id: string
-  timestamp: string
-  description: string
-}
-
-export interface UI_I_BackupAction {
-  action: UI_T_BackupActionType | ''
-  id?: string
-  name?: string
-  backupId?: string
-  bucketId?: string
-  storageId?: string
-}
+import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_T_BackupActionType } from '~/components/common/pages/backups/lib/models/types'
+
+export interface API_UI_I_Backup {
+  creation_time: number
+  creation_type: number
+  description: string
+  kind: number // TODO
+  msg: string
+  name: string
+  state: number // TODO
+  uuid: string
+  vm_name: string
+  vmid: string
+  storage_id: string
+  storage_name: string
+}
+
+export interface UI_I_Backup extends API_UI_I_Backup {}
+
+export interface UI_I_BackupsTreeNode
+  extends UI_I_TreeNode<UI_I_BackupsTreeNode> {
+  parent_id: string
+  timestamp: string
+  description: string
+}
+
+export interface UI_I_BackupAction {
+  action: UI_T_BackupActionType | ''
+  id?: string
+  name?: string
+  backupId?: string
+  bucketId?: string
+  storageId?: string
+}

package/components/common/pages/backups/modals/Modals.vue

@@ -1,243 +1,243 @@
-<template>
-  <common-pages-backups-modals-create-backup
-    v-if="schedulerTask.isShow"
-    v-model="backupForm"
-    v-model:scheduler-form="schedulerTaskForm"
-    :is-scheduled-tasks="schedulerTask.scheduler.isSchedulerTask"
-    :is-edit-scheduled-tasks="schedulerTask.scheduler.editTask"
-    :target="props.target"
-    :selected-vm-name="props.selectedVmName"
-    :disks="props.disks"
-    :disks-loading="props.disksLoading"
-    :datastore-table="props.datastoreTable"
-    :datastore-table-loading="props.datastoreTableLoading"
-    @change-step-create-backup="onChangeStepCreateBackup"
-    @check-name="onCheckBackupName"
-    @finish="onCreateBackup"
-    @hide="onHide"
-  />
-
-  <common-pages-backups-modals-restore
-    v-if="isShowRestoreModal"
-    v-model="restoreForm"
-    :datastore="props.restoreDatastore"
-    :datastore-loading="props.isRestoreDatastoreLoading"
-    :networks="props.restoreNetworks"
-    @get-datastore="onGetRestoreDatastore"
-    @get-networks="onGetRestoreNetworks"
-    @check-name="onCheckRestoreName"
-    @finish="onRestore"
-    @hide="onHide"
-  />
-
-  <common-pages-backups-modals-delete-backup
-    v-if="isShowDeleteBackupModal || isShowDeleteAllBackupsModal"
-    :name="action?.name"
-    :is-loading="isLoadingDeleteBackup"
-    :is-all="isShowDeleteAllBackupsModal"
-    @remove="onDeleteBackup"
-    @hide="onHide"
-  />
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  UI_I_SendTaskParams,
-  UI_I_ModalPayload,
-} from '~/lib/models/interfaces'
-import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
-import type {
-  UI_I_BackupDatastoreTable,
-  UI_I_CreateBackupForm,
-  UI_I_Pvm,
-  UI_I_RestoreForm,
-} from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
-import type { UI_I_BackupAction } from '~/components/common/pages/backups/lib/models/interfaces'
-import type { UI_I_NameCheck } from '~/components/common/pages/backups/modals/restore/name/lib/models/interfaces'
-import { sendTask } from '~/lib/utils/sendTask'
-import { scheduledTaskDefaultFormFunc } from '~/components/common/pages/scheduledTasks/modals/lib/config/createScheduledTask'
-import { backupDefaultFormFunc } from '~/components/common/pages/backups/modals/lib/config/createBackup'
-import { restoreDefaultFormFunc } from '~/components/common/pages/backups/modals/lib/config/restore'
-import { scheduledTasks } from '~/components/common/pages/scheduledTasks/lib/utils/utils'
-
-const action = defineModel<UI_I_BackupAction | null>('action', {
-  required: true,
-})
-
-const props = defineProps<{
-  project: UI_T_Project
-  target: string
-  selectedVmName: string
-  disks: UI_I_Pvm['disk_devices']
-  disksLoading: boolean
-  datastoreTable: UI_I_BackupDatastoreTable | null
-  datastoreTableLoading: boolean
-  restoreDatastore: UI_I_DatastoreTableItem[]
-  isRestoreDatastoreLoading: boolean
-  restoreNetworks: UI_I_NetworkTableItem[]
-}>()
-const emits = defineEmits<{
-  (event: 'change-step-create-backup', value: UI_I_WizardStep[]): void
-  (event: 'get-restore-datastore', value: string): void
-  (event: 'get-restore-networks', value: string): void
-  (event: 'check-restore-name', value: UI_I_NameCheck): void
-  (event: 'check-backup-name', value: UI_I_NameCheck): void
-  (event: 'delete-backup', value: boolean): void
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const backupForm = ref<UI_I_CreateBackupForm>(
-  useDeepCopy(backupDefaultFormFunc())
-)
-
-const schedulerTaskForm = ref<UI_I_ScheduleNewTasksForm>(
-  useDeepCopy(scheduledTaskDefaultFormFunc())
-)
-
-const restoreForm = ref<UI_I_RestoreForm>(useDeepCopy(restoreDefaultFormFunc()))
-const deleteBackupId = ref<string>('')
-
-const schedulerTask = computed<UI_I_ModalPayload>(
-  () => $store.getters['backup/getCreateBackupModal']
-)
-watch(
-  schedulerTask,
-  (newValue: UI_I_ModalPayload) => {
-    const { scheduler } = newValue
-    if (!scheduler.isSchedulerTask) return
-    schedulerTaskForm.value = scheduler.data
-  },
-  { immediate: true, deep: true }
-)
-
-const isShowDeleteBackupModal = ref<boolean>(false)
-const isShowDeleteAllBackupsModal = ref<boolean>(false)
-const isLoadingDeleteBackup = ref<boolean>(false)
-const isShowRestoreModal = ref<boolean>(false)
-
-const onCreateBackup = (): void => {
-  // TODO
-  backupForm.value.target = props.target
-  const backupTask: UI_I_SendTaskParams = {
-    method:
-      props.project === 'sphere'
-        ? 'VirtualMachines.CreateBackup'
-        : 'backup.create_backup',
-    target: props.target,
-    args: backupForm.value,
-  }
-
-  const {
-    scheduler: { isSchedulerTask, editTask, data },
-  } = schedulerTask.value
-  const sendData = isSchedulerTask
-    ? scheduledTasks(
-        schedulerTaskForm.value,
-        backupTask,
-        props.target,
-        editTask,
-        data,
-        props.project
-      )
-    : backupTask
-
-  sendTask(sendData)
-  onHide()
-}
-
-const onDeleteBackup = async (isAll: boolean): Promise<void> => {
-  isLoadingDeleteBackup.value = true
-  emits('delete-backup', isAll)
-  isLoadingDeleteBackup.value = false
-  onHide()
-}
-
-const onRestore = (): void => {
-  sendTask({
-    args: restoreForm.value,
-    method:
-      props.project === 'sphere'
-        ? 'VirtualMachines.RestoreBackup'
-        : 'backup.restore_backup',
-    target: props.target,
-  })
-  onHide()
-}
-
-watch(
-  action,
-  (newValue) => {
-    switch (newValue?.action) {
-      case 'createBackup':
-        // TODO
-        $store.dispatch('backup/A_SHOW_CREATE_BACKUP_MODAL', {
-          isShow: true,
-          scheduler: {
-            isSchedulerTask: false,
-            editTask: false,
-            data: null,
-          },
-        })
-        break
-      case 'restoreBackup':
-        isShowRestoreModal.value = true
-        restoreForm.value.backup_storage = newValue.storageId || ''
-        restoreForm.value.bucket = newValue.bucketId || ''
-        restoreForm.value.backup = newValue.backupId || ''
-        break
-      case 'deleteBackup':
-        deleteBackupId.value = newValue.backupId || ''
-        isShowDeleteBackupModal.value = true
-        break
-      case 'deleteBackupAll':
-        isShowDeleteAllBackupsModal.value = true
-        break
-    }
-  },
-  { deep: true }
-)
-
-const onHide = (): void => {
-  // TODO
-  $store.dispatch('backup/A_SHOW_CREATE_BACKUP_MODAL', {
-    isShow: false,
-    scheduler: {
-      isSchedulerTask: false,
-      editTask: false,
-      data: null,
-    },
-  })
-  isShowRestoreModal.value = false
-  isShowDeleteBackupModal.value = false
-  isShowDeleteAllBackupsModal.value = false
-
-  action.value.action = ''
-  backupForm.value = useDeepCopy(backupDefaultFormFunc())
-  backupForm.value.target = props.target
-  restoreForm.value = useDeepCopy(restoreDefaultFormFunc())
-}
-
-const onChangeStepCreateBackup = (value: UI_I_WizardStep[]): void => {
-  emits('change-step-create-backup', value)
-}
-const onCheckBackupName = (data: UI_I_NameCheck): void => {
-  emits('check-backup-name', data)
-}
-
-const onGetRestoreDatastore = (bucket: string): void => {
-  emits('get-restore-datastore', bucket)
-}
-const onGetRestoreNetworks = (hostId: string): void => {
-  emits('get-restore-networks', hostId)
-}
-const onCheckRestoreName = (data: UI_I_NameCheck): void => {
-  emits('check-restore-name', data)
-}
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-pages-backups-modals-create-backup
+    v-if="schedulerTask.isShow"
+    v-model="backupForm"
+    v-model:scheduler-form="schedulerTaskForm"
+    :is-scheduled-tasks="schedulerTask.scheduler.isSchedulerTask"
+    :is-edit-scheduled-tasks="schedulerTask.scheduler.editTask"
+    :target="props.target"
+    :selected-vm-name="props.selectedVmName"
+    :disks="props.disks"
+    :disks-loading="props.disksLoading"
+    :datastore-table="props.datastoreTable"
+    :datastore-table-loading="props.datastoreTableLoading"
+    @change-step-create-backup="onChangeStepCreateBackup"
+    @check-name="onCheckBackupName"
+    @finish="onCreateBackup"
+    @hide="onHide"
+  />
+
+  <common-pages-backups-modals-restore
+    v-if="isShowRestoreModal"
+    v-model="restoreForm"
+    :datastore="props.restoreDatastore"
+    :datastore-loading="props.isRestoreDatastoreLoading"
+    :networks="props.restoreNetworks"
+    @get-datastore="onGetRestoreDatastore"
+    @get-networks="onGetRestoreNetworks"
+    @check-name="onCheckRestoreName"
+    @finish="onRestore"
+    @hide="onHide"
+  />
+
+  <common-pages-backups-modals-delete-backup
+    v-if="isShowDeleteBackupModal || isShowDeleteAllBackupsModal"
+    :name="action?.name"
+    :is-loading="isLoadingDeleteBackup"
+    :is-all="isShowDeleteAllBackupsModal"
+    @remove="onDeleteBackup"
+    @hide="onHide"
+  />
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type {
+  UI_I_SendTaskParams,
+  UI_I_ModalPayload,
+} from '~/lib/models/interfaces'
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+import type {
+  UI_I_BackupDatastoreTable,
+  UI_I_CreateBackupForm,
+  UI_I_Pvm,
+  UI_I_RestoreForm,
+} from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
+import type { UI_I_BackupAction } from '~/components/common/pages/backups/lib/models/interfaces'
+import type { UI_I_NameCheck } from '~/components/common/pages/backups/modals/restore/name/lib/models/interfaces'
+import { sendTask } from '~/lib/utils/sendTask'
+import { scheduledTaskDefaultFormFunc } from '~/components/common/pages/scheduledTasks/modals/lib/config/createScheduledTask'
+import { backupDefaultFormFunc } from '~/components/common/pages/backups/modals/lib/config/createBackup'
+import { restoreDefaultFormFunc } from '~/components/common/pages/backups/modals/lib/config/restore'
+import { scheduledTasks } from '~/components/common/pages/scheduledTasks/lib/utils/utils'
+
+const action = defineModel<UI_I_BackupAction | null>('action', {
+  required: true,
+})
+
+const props = defineProps<{
+  project: UI_T_Project
+  target: string
+  selectedVmName: string
+  disks: UI_I_Pvm['disk_devices']
+  disksLoading: boolean
+  datastoreTable: UI_I_BackupDatastoreTable | null
+  datastoreTableLoading: boolean
+  restoreDatastore: UI_I_DatastoreTableItem[]
+  isRestoreDatastoreLoading: boolean
+  restoreNetworks: UI_I_NetworkTableItem[]
+}>()
+const emits = defineEmits<{
+  (event: 'change-step-create-backup', value: UI_I_WizardStep[]): void
+  (event: 'get-restore-datastore', value: string): void
+  (event: 'get-restore-networks', value: string): void
+  (event: 'check-restore-name', value: UI_I_NameCheck): void
+  (event: 'check-backup-name', value: UI_I_NameCheck): void
+  (event: 'delete-backup', value: boolean): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const backupForm = ref<UI_I_CreateBackupForm>(
+  useDeepCopy(backupDefaultFormFunc())
+)
+
+const schedulerTaskForm = ref<UI_I_ScheduleNewTasksForm>(
+  useDeepCopy(scheduledTaskDefaultFormFunc())
+)
+
+const restoreForm = ref<UI_I_RestoreForm>(useDeepCopy(restoreDefaultFormFunc()))
+const deleteBackupId = ref<string>('')
+
+const schedulerTask = computed<UI_I_ModalPayload>(
+  () => $store.getters['backup/getCreateBackupModal']
+)
+watch(
+  schedulerTask,
+  (newValue: UI_I_ModalPayload) => {
+    const { scheduler } = newValue
+    if (!scheduler.isSchedulerTask) return
+    schedulerTaskForm.value = scheduler.data
+  },
+  { immediate: true, deep: true }
+)
+
+const isShowDeleteBackupModal = ref<boolean>(false)
+const isShowDeleteAllBackupsModal = ref<boolean>(false)
+const isLoadingDeleteBackup = ref<boolean>(false)
+const isShowRestoreModal = ref<boolean>(false)
+
+const onCreateBackup = (): void => {
+  // TODO
+  backupForm.value.target = props.target
+  const backupTask: UI_I_SendTaskParams = {
+    method:
+      props.project === 'sphere'
+        ? 'VirtualMachines.CreateBackup'
+        : 'backup.create_backup',
+    target: props.target,
+    args: backupForm.value,
+  }
+
+  const {
+    scheduler: { isSchedulerTask, editTask, data },
+  } = schedulerTask.value
+  const sendData = isSchedulerTask
+    ? scheduledTasks(
+        schedulerTaskForm.value,
+        backupTask,
+        props.target,
+        editTask,
+        data,
+        props.project
+      )
+    : backupTask
+
+  sendTask(sendData)
+  onHide()
+}
+
+const onDeleteBackup = async (isAll: boolean): Promise<void> => {
+  isLoadingDeleteBackup.value = true
+  emits('delete-backup', isAll)
+  isLoadingDeleteBackup.value = false
+  onHide()
+}
+
+const onRestore = (): void => {
+  sendTask({
+    args: restoreForm.value,
+    method:
+      props.project === 'sphere'
+        ? 'VirtualMachines.RestoreBackup'
+        : 'backup.restore_backup',
+    target: props.target,
+  })
+  onHide()
+}
+
+watch(
+  action,
+  (newValue) => {
+    switch (newValue?.action) {
+      case 'createBackup':
+        // TODO
+        $store.dispatch('backup/A_SHOW_CREATE_BACKUP_MODAL', {
+          isShow: true,
+          scheduler: {
+            isSchedulerTask: false,
+            editTask: false,
+            data: null,
+          },
+        })
+        break
+      case 'restoreBackup':
+        isShowRestoreModal.value = true
+        restoreForm.value.backup_storage = newValue.storageId || ''
+        restoreForm.value.bucket = newValue.bucketId || ''
+        restoreForm.value.backup = newValue.backupId || ''
+        break
+      case 'deleteBackup':
+        deleteBackupId.value = newValue.backupId || ''
+        isShowDeleteBackupModal.value = true
+        break
+      case 'deleteBackupAll':
+        isShowDeleteAllBackupsModal.value = true
+        break
+    }
+  },
+  { deep: true }
+)
+
+const onHide = (): void => {
+  // TODO
+  $store.dispatch('backup/A_SHOW_CREATE_BACKUP_MODAL', {
+    isShow: false,
+    scheduler: {
+      isSchedulerTask: false,
+      editTask: false,
+      data: null,
+    },
+  })
+  isShowRestoreModal.value = false
+  isShowDeleteBackupModal.value = false
+  isShowDeleteAllBackupsModal.value = false
+
+  action.value.action = ''
+  backupForm.value = useDeepCopy(backupDefaultFormFunc())
+  backupForm.value.target = props.target
+  restoreForm.value = useDeepCopy(restoreDefaultFormFunc())
+}
+
+const onChangeStepCreateBackup = (value: UI_I_WizardStep[]): void => {
+  emits('change-step-create-backup', value)
+}
+const onCheckBackupName = (data: UI_I_NameCheck): void => {
+  emits('check-backup-name', data)
+}
+
+const onGetRestoreDatastore = (bucket: string): void => {
+  emits('get-restore-datastore', bucket)
+}
+const onGetRestoreNetworks = (hostId: string): void => {
+  emits('get-restore-networks', hostId)
+}
+const onCheckRestoreName = (data: UI_I_NameCheck): void => {
+  emits('check-restore-name', data)
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -28,6 +28,7 @@
     :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"
@@ -73,11 +74,10 @@ import {
 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";
-import type {UI_I_ScheduleNewTasksForm} from "~/components/common/pages/scheduledTasks/modals/lib/models/interfaces";
 
 
 const backupForm = defineModel<UI_I_CreateBackupForm>({ required: true })
-const schedulerForm = defineModel<UI_I_ScheduleNewTasksForm>('schedulerForm', { required: true })
+const schedulerForm = defineModel('schedulerForm', { required: true })
 
 const props = defineProps<{
   isEdit?: boolean // ToDo проверить на использование
@@ -152,13 +152,13 @@ const validationFunc = async (
   }
 
   if (wizard.isValidateForStep(dynamicSteps.disks, currentStep.id, nextStep.id)) {
-    const disksValidation = checkDisks(value, backupForm.value, wizard, localization.value)
+    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)
+    const datastoreValidation = checkDatastore(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
     value = datastoreValidation.newValue
     stepHasError = datastoreValidation.stepHasError
   }
@@ -176,8 +176,12 @@ const validationFunc = async (
   }
 }
 
-const onRemoveValidationErrors = (stepId: number): void => {
-  wizard.hideAlertMessagesByStepId(stepId)
+const errors = ref<string[]>([])
+const showValidationErrors = (data: string[]): void => {
+  errors.value = data
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
 }
 
 const strategyOptions = ref<UI_I_SelectInputItem[]>(