bfg-common 1.5.418 → 1.5.420

package/components/common/backup/storage/actions/delete/Delete.vue

@@ -26,7 +26,7 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_DeleteItem } from '~/components/common/backup/storage/actions/delete/lib/models/interfaces'
-import { getBackupTreeNodeIdByTypeFromRoute } from '~/components/common/backup/lib/utils/getBackupOrBackupStorageId'
+import { getBackupTreeNodeIdByTypeFromRoute } from '~/components/common/pages/backups/lib/utils/getBackupOrBackupStorageId'
 
 const props = defineProps<{
   datastore: UI_I_DeleteItem | null

package/components/common/modals/confirmation/ConfirmationNew.vue

@@ -33,7 +33,7 @@ const props = withDefaults(
     isLoading?: boolean
   }>(),
   {
-    isLoading: boolean,
+    isLoading: false,
   }
 )
 const emits = defineEmits<{

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

@@ -1,4 +1,6 @@
+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
@@ -17,8 +19,18 @@ export interface API_UI_I_Backup {
 
 export interface UI_I_Backup extends API_UI_I_Backup {}
 
-export interface UI_I_BackupsTreeNode extends UI_I_TreeNode<UI_I_BackupsTreeNode> {
+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/lib/models/types.ts

@@ -2,6 +2,6 @@ export type UI_T_TargetType = 'vm' | 'bucket'
 
 export type UI_T_BackupActionType =
   | 'createBackup'
-  | 'restore'
-  | 'delete'
-  | 'deleteAll'
+  | 'restoreBackup'
+  | 'deleteBackup'
+  | 'deleteBackupAll'

package/components/common/{backup → pages/backups}/lib/utils/getBackupOrBackupStorageId.ts

@@ -4,10 +4,6 @@ export const getBackupTreeNodeIdByTypeFromRoute = (type: 'host' | 'backupStorage
   const idFromRoute = useRoute().params.id?.toString() || ''
 
   let result = ''
-  // if typeFromRoute === 'bucket' ids === [hostId, storageId, bucketId|vmId]
-  // if typeFromRoute === 'backup' ids === [hostId, storageId]
-  // if typeFromRoute === 'vm' ids === [bucketId|vmId]
-  // vmId === bucketId
 
   const ids = idFromRoute.split('_')
   switch(type) {

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

@@ -30,27 +30,21 @@
   />
 
   <common-pages-backups-modals-delete-backup
-    v-if="isShowDeleteBackupModal"
+    v-if="isShowDeleteBackupModal || isShowDeleteAllBackupsModal"
     :name="action.name"
     :is-loading="isLoadingDeleteBackup"
-    @remove="onDeleteBackup"
-    @hide="onHide"
-  />
-  <common-pages-backups-modals-delete-backup
-    v-if="isShowDeleteAllBackupsModal"
-    is-all
-    :is-loading="isLoadingDeleteBackup"
+    :is-all="isShowDeleteAllBackupsModal"
     @remove="onDeleteBackup"
     @hide="onHide"
   />
 </template>
 
 <script lang="ts" setup>
-import { sendTask } from '~/lib/utils/sendTask'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_SendTaskParams } 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_CreateBackupFormDiskDevice,
   UI_I_RestoreForm,
@@ -58,12 +52,15 @@ import type {
 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_WizardStep } from '~/components/atoms/wizard/lib/models/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<I_ActionPayload>('action', { required: true })
+const action = defineModel<UI_I_BackupAction>('action', { required: true })
 
 const props = defineProps<{
   project: UI_T_Project
@@ -71,7 +68,7 @@ const props = defineProps<{
   selectedVmName: string
   disks: UI_I_CreateBackupFormDiskDevice[]
   disksLoading: boolean
-  datastoreTable: any // ??
+  datastoreTable: UI_I_BackupDatastoreTable
   datastoreTableLoading: boolean
   restoreDatastore: UI_I_DatastoreTableItem[]
   isRestoreDatastoreLoading: boolean
@@ -81,7 +78,8 @@ 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: any): void // ??
+  (event: 'check-restore-name', value: UI_I_NameCheck): void
+  (event: 'delete-backup', value: boolean): void
 }>()
 
 const { $store }: any = useNuxtApp()
@@ -100,7 +98,7 @@ const schedulerTaskForm = ref<UI_I_ScheduleNewTasksForm>(
 const restoreForm = ref<UI_I_RestoreForm>(useDeepCopy(restoreDefaultFormFunc()))
 const deleteBackupId = ref<string>('')
 
-// TODO
+// TODO fix after refactor schedule tasks
 const isShowCreateBackupModal = computed<any>( // ??
   () => $store.getters['backup/getCreateBackupModal']
 )
@@ -110,6 +108,7 @@ const isLoadingDeleteBackup = ref<boolean>(false)
 const isShowRestoreModal = ref<boolean>(false)
 
 const onCreateBackup = (): void => {
+  // TODO
   const backupTask: UI_I_SendTaskParams = {
     method:
       props.project === 'sphere'
@@ -139,26 +138,7 @@ const onCreateBackup = (): void => {
 
 const onDeleteBackup = async (isAll: boolean): Promise<void> => {
   isLoadingDeleteBackup.value = true
-  if (isAll) {
-    await sendTask({
-      method:
-        props.project === 'sphere'
-          ? 'VirtualMachines.DeleteBackups'
-          : 'backup.delete_backups',
-      target: props.target,
-    })
-  } else {
-    await sendTask({
-      method:
-        props.project === 'sphere'
-          ? 'VirtualMachines.DeleteBackup'
-          : 'backup.delete_backup',
-      target: props.target,
-      args: {
-        backup_uuid: deleteBackupId.value,
-      },
-    })
-  }
+  emits('delete-backup', isAll)
   isLoadingDeleteBackup.value = false
   onHide()
 }
@@ -190,7 +170,7 @@ watch(
           },
         })
         break
-      case 'restore':
+      case 'restoreBackup':
         isShowRestoreModal.value = true
         restoreForm.value.backup_storage = newValue.storageId || ''
         restoreForm.value.bucket = newValue.bucketId || ''
@@ -200,7 +180,7 @@ watch(
         deleteBackupId.value = newValue.backupId || ''
         isShowDeleteBackupModal.value = true
         break
-      case 'deleteAll':
+      case 'deleteBackupAll':
         isShowDeleteAllBackupsModal.value = true
         break
     }
@@ -238,8 +218,7 @@ const onGetRestoreDatastore = (bucket: string): void => {
 const onGetRestoreNetworks = (hostId: string): void => {
   emits('get-restore-networks', hostId)
 }
-const onCheckRestoreName = (data: any): void => {
-  // ??
+const onCheckRestoreName = (data: UI_I_NameCheck): void => {
   emits('check-restore-name', data)
 }
 </script>

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

@@ -62,9 +62,7 @@
 </template>
 
 <script setup lang="ts">
-// TODO move to common
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
 import type {
   UI_I_WizardStep,
@@ -72,14 +70,16 @@ import type {
 } from '~/components/atoms/wizard/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_CreateBackupFormDiskDevice
+  UI_I_CreateBackupFormDiskDevice,
 } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_DynamicSteps } from '~/components/common/pages/backups/modals/createBackup/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {
   stepsSchemeInitial,
-  stepsFunc, dynamicSteps,
+  stepsFunc,
+  dynamicSteps,
 } from '~/components/common/pages/backups/modals/createBackup/lib/config/steps'
 import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
 
@@ -97,7 +97,7 @@ const props = defineProps<{
   selectedVmName: string
   disks: UI_I_CreateBackupFormDiskDevice[]
   disksLoading: boolean
-  datastoreTable: any // ??
+  datastoreTable: UI_I_BackupDatastoreTable
   datastoreTableLoading: boolean
 }>()
 
@@ -158,11 +158,7 @@ const validationFunc = async (
   }
 
   if (
-    wizard.isValidateForStep(
-      dynamicSteps.general,
-      currentStep.id,
-      nextStep.id
-    )
+    wizard.isValidateForStep(dynamicSteps.general, currentStep.id, nextStep.id)
   ) {
     const nameValidation = checkName(value)
 
@@ -171,11 +167,7 @@ const validationFunc = async (
   }
 
   if (
-    wizard.isValidateForStep(
-      dynamicSteps.disks,
-      currentStep.id,
-      nextStep.id
-    )
+    wizard.isValidateForStep(dynamicSteps.disks, currentStep.id, nextStep.id)
   ) {
     const validation = checkDisks(value)
 
@@ -229,21 +221,13 @@ const checkDisks = (value: UI_I_WizardStep[]): UI_I_ValidationReturn => {
 
   const isValidStores = !!model.value?.disk_devices.length
   if (!isValidStores) {
-    stepHasError = wizard.setValidation(
-      dynamicSteps.disks,
-      'disk_devices',
-      {
-        fieldMessage: localization.value.common.diskIsRequired,
-        alertMessage: localization.value.common.diskIsRequired,
-      }
-    )
+    stepHasError = wizard.setValidation(dynamicSteps.disks, 'disk_devices', {
+      fieldMessage: localization.value.common.diskIsRequired,
+      alertMessage: localization.value.common.diskIsRequired,
+    })
     showValidationErrors([localization.value.common.diskIsRequired])
   } else if (wizard.hasMessage(dynamicSteps.disks, 'disk_devices')) {
-    value = wizard.removeValidation(
-      dynamicSteps.disks,
-      'disk_devices',
-      value
-    )
+    value = wizard.removeValidation(dynamicSteps.disks, 'disk_devices', value)
     onRemoveValidationErrors()
   }
 
@@ -267,9 +251,7 @@ const checkDatastore = (value: UI_I_WizardStep[]): UI_I_ValidationReturn => {
       }
     )
     showValidationErrors([localization.value.common.datastoreIsRequired])
-  } else if (
-    wizard.hasMessage(dynamicSteps.datastores, 'backup_storage')
-  ) {
+  } else if (wizard.hasMessage(dynamicSteps.datastores, 'backup_storage')) {
     value = wizard.removeValidation(
       dynamicSteps.datastores,
       'backup_storage',
@@ -289,7 +271,7 @@ const onChangeDatastore = (names: string[]): void => {
   selectedDatastoresNames.value = names
 }
 
-const strategyOptions = ref<UI_I_OptionItem[]>(
+const strategyOptions = ref<UI_I_SelectInputItem[]>(
   strategyOptionsFunc(localization.value)
 )
 

package/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/MaxBandwidth.vue

@@ -26,8 +26,8 @@
 <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 type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_T_BandwidthOption } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/models/types'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
 import { maxBandwidthOptions } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options'
 
 const model = defineModel<UI_I_CreateBackupForm>({ required: true })
@@ -35,7 +35,8 @@ const model = defineModel<UI_I_CreateBackupForm>({ required: true })
 const localization = computed<UI_I_Localization>(() => useLocal())
 const { $binary }: any = useNuxtApp()
 
-const maxBandwidthOptionsLocal = ref<UI_I_OptionItem[]>(maxBandwidthOptions)
+const maxBandwidthOptionsLocal =
+  ref<UI_I_SelectInputItem[]>(maxBandwidthOptions)
 
 const maxBindwidthLocal = computed<number>({
   get() {

package/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options.ts

@@ -1,6 +1,6 @@
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
 
-export const maxBandwidthOptions: UI_I_OptionItem[] = [
+export const maxBandwidthOptions: UI_I_SelectInputItem[] = [
   { label: 'Mbps', value: 0 },
   { label: 'Gbps', value: 1 },
 ]

package/components/common/pages/backups/modals/createBackup/configuration/strategy/Strategy.vue

@@ -14,17 +14,16 @@
 </template>
 
 <script lang="ts" setup>
-// TODO merge with common-backups-modals-new-rule-retention-strategy
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
 import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
 
 const model = defineModel<UI_I_CreateBackupForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const strategyOptions = ref<UI_I_OptionItem[]>(
+const strategyOptions = ref<UI_I_SelectInputItem[]>(
   strategyOptionsFunc(localization.value)
 )
 </script>

package/components/common/pages/backups/modals/createBackup/datastores/Datastores.vue

@@ -11,10 +11,13 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type {
+  UI_I_BackupDatastoreTable,
+  UI_I_CreateBackupForm
+} from '~/components/common/pages/backups/modals/lib/models/interfaces'
 
 const props = defineProps<{
-  datastoreTable: any // ??
+  datastoreTable: UI_I_BackupDatastoreTable
   datastoreTableLoading: boolean
 }>()
 const emits = defineEmits<{
@@ -23,8 +26,6 @@ const emits = defineEmits<{
 
 const model = defineModel<UI_I_CreateBackupForm>({ required: true })
 
-const { $store }: any = useNuxtApp()
-
 const selectedKeys = ref<string[]>([])
 
 watch(

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

@@ -1,94 +1,95 @@
-<template>
-  <div class="data-table-view overflow-hidden">
-    <div class="data-table-view__inner">
-      <atoms-table-data-grid
-        v-model:selected-row="selectedRows"
-        v-model:column-keys="columnKeys"
-        class="data-table"
-        type="radio"
-        test-id="disks-table"
-        :head-items="headItems"
-        :body-items="bodyItems"
-        :total-items="props.totalItems"
-        :total-pages="props.totalPages"
-        :items-per-page="itemsPerPage"
-        :loading="loading"
-        hide-pagination
-        server-off
-      >
-        <template #icon="{ item }">
-          <span :class="['datagrid-cell-icon', item.data]" />
-          <span class="text-ellipsis">
-            {{ item.text }}
-          </span>
-        </template>
-      </atoms-table-data-grid>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-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 { itemsPerPage } from '~/components/atoms/table/dataGrid/lib/config/itemsPerPage'
-import * as table from '~/components/common/pages/backups/modals/createBackup/datastores/tableView/lib/config/table'
-
-const props = defineProps<{
-  dataTable: any // ??
-  loading: boolean
-  totalItems: number
-  totalPages: number
-}>()
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectedRows = defineModel<string>('selected')
-
-const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
-
-const headItems = computed<UI_I_HeadItem[]>(() =>
-  table.headItems(localization.value)
-)
-
-const bodyItems = computed<UI_I_BodyItem[][]>(() => {
-  let result: UI_I_BodyItem[][] = []
-  if (props.dataTable) {
-    result = table.bodyItems(props.dataTable, localization.value)
-  }
-
-  return result
-})
-watch(
-  bodyItems,
-  () => {
-    setTimeout(() => {
-      selectedRows.value = ''
-    }, 0)
-  },
-  { deep: true, immediate: true }
-)
-</script>
-
-<style lang="scss" scoped>
-.data-table-view {
-  height: inherit;
-  margin-bottom: 10px;
-  margin-right: 10px;
-
-  &__inner {
-    height: inherit;
-  }
-  :deep(.data-table) {
-    height: inherit;
-    .datagrid-outer-wrapper {
-      height: inherit;
-    }
-  }
-}
-.vm-icon {
-  margin-right: 5px;
-}
-</style>
+<template>
+  <div class="data-table-view overflow-hidden">
+    <div class="data-table-view__inner">
+      <atoms-table-data-grid
+        v-model:selected-row="selectedRows"
+        v-model:column-keys="columnKeys"
+        class="data-table"
+        type="radio"
+        test-id="disks-table"
+        :head-items="headItems"
+        :body-items="bodyItems"
+        :total-items="props.totalItems"
+        :total-pages="props.totalPages"
+        :items-per-page="itemsPerPage"
+        :loading="loading"
+        hide-pagination
+        server-off
+      >
+        <template #icon="{ item }">
+          <span :class="['datagrid-cell-icon', item.data]" />
+          <span class="text-ellipsis">
+            {{ item.text }}
+          </span>
+        </template>
+      </atoms-table-data-grid>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+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_BackupDatastore } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import { itemsPerPage } from '~/components/atoms/table/dataGrid/lib/config/itemsPerPage'
+import * as table from '~/components/common/pages/backups/modals/createBackup/datastores/tableView/lib/config/table'
+
+const props = defineProps<{
+  dataTable: UI_I_BackupDatastore[]
+  loading: boolean
+  totalItems: number
+  totalPages: number
+}>()
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectedRows = defineModel<string>('selected')
+
+const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
+
+const headItems = computed<UI_I_HeadItem[]>(() =>
+  table.headItems(localization.value)
+)
+
+const bodyItems = computed<UI_I_BodyItem[][]>(() => {
+  let result: UI_I_BodyItem[][] = []
+  if (props.dataTable) {
+    result = table.bodyItems(props.dataTable, localization.value)
+  }
+
+  return result
+})
+watch(
+  bodyItems,
+  () => {
+    setTimeout(() => {
+      selectedRows.value = ''
+    }, 0)
+  },
+  { deep: true, immediate: true }
+)
+</script>
+
+<style lang="scss" scoped>
+.data-table-view {
+  height: inherit;
+  margin-bottom: 10px;
+  margin-right: 10px;
+
+  &__inner {
+    height: inherit;
+  }
+  :deep(.data-table) {
+    height: inherit;
+    .datagrid-outer-wrapper {
+      height: inherit;
+    }
+  }
+}
+.vm-icon {
+  margin-right: 5px;
+}
+</style>