bfg-common 1.5.418 → 1.5.420

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

@@ -1,159 +1,160 @@
-<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 { I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-
-const model = defineModel<I_RestoreForm>({ required: true })
-
-const props = defineProps<{
-  show: boolean
-  nameFormSubmit: null | Function
-}>()
-const emits = defineEmits<{
-  (event: 'check-name', value: [string, (error: any) => void]): 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,
-      (error): void => {
-        const status = error?.statusCode || 200
-        switch (status) {
-          case 405: // Invalid kind
-            showValidationErrors([
-              localization.value.common.kindValidationDescription,
-            ])
-            resolve(false)
-            break
-          case 406: // Invalid name
-            showValidationErrors([
-              localization.value.common.vmNameValidationDescription,
-            ])
-            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>
+  <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 405: // Invalid kind
+            showValidationErrors([
+              localization.value.common.kindValidationDescription,
+            ])
+            resolve(false)
+            break
+          case 406: // Invalid name
+            showValidationErrors([
+              localization.value.common.vmNameValidationDescription,
+            ])
+            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>

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

@@ -0,0 +1,6 @@
+import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+
+export interface UI_I_NameCheck {
+  name: string
+  cb: (error: API_UI_I_Error) => void
+}

package/components/common/pages/backups/modals/restore/networks/Networks.vue

@@ -1,67 +1,67 @@
-<template>
-  <div class="select-network h-full flex flex-col">
-    <atoms-alert
-      v-if="props.alertMessages.length"
-      :items="props.alertMessages"
-      status="alert-danger"
-      test-id="import-vms-select-networks-errors"
-      @remove="onHideAlert"
-    />
-
-    <common-pages-backups-modals-restore-networks-table
-      v-model="model"
-      :networks-table="model.pvm.network_devices"
-      :source-networks="props.networks"
-      :loading="networkTableLoading"
-      @hide-alert="onHideAlert"
-    />
-
-    <common-wizards-vm-common-validation-compatibility
-      :loading="!model.pvm.network_devices.length"
-      status="Success"
-      text="compatibilityChecksSucceeded"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
-// import type { I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-
-const model = defineModel<I_RestoreForm>({ required: true })
-const props = defineProps<{
-  alertMessages: string[]
-  networks: UI_I_NetworkTableItem[]
-}>()
-const emits = defineEmits<{
-  (event: 'get-networks', value: string): void
-  (event: 'hide-alert', value: number): void
-}>()
-
-const networkTableLoading = ref<boolean>(false)
-const getNetworks = async (): Promise<void> => {
-  networkTableLoading.value = true
-  emits('get-networks', model.value.pvm.host_id)
-  networkTableLoading.value = false
-}
-getNetworks()
-
-const onHideAlert = (): void => {
-  emits('hide-alert', 4)
-}
-</script>
-
-<style lang="scss" scoped>
-.select-network {
-  margin-top: 10px;
-  &__text {
-    font-size: 12px;
-  }
-  &__matcher-details {
-    margin-top: 10px;
-  }
-  .vm-migrate-advanced-view-button {
-    text-align: end;
-  }
-}
-</style>
+<template>
+  <div class="select-network h-full flex flex-col">
+    <atoms-alert
+      v-if="props.alertMessages.length"
+      :items="props.alertMessages"
+      status="alert-danger"
+      test-id="import-vms-select-networks-errors"
+      @remove="onHideAlert"
+    />
+
+    <common-pages-backups-modals-restore-networks-table
+      v-model="model"
+      :networks-table="model.pvm.network_devices"
+      :source-networks="props.networks"
+      :loading="networkTableLoading"
+      @hide-alert="onHideAlert"
+    />
+
+    <common-wizards-vm-common-validation-compatibility
+      :loading="!model.pvm.network_devices.length"
+      status="Success"
+      text="compatibilityChecksSucceeded"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/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<{
+  alertMessages: string[]
+  networks: UI_I_NetworkTableItem[]
+}>()
+const emits = defineEmits<{
+  (event: 'get-networks', value: string): void
+  (event: 'hide-alert'): void
+}>()
+
+const networkTableLoading = ref<boolean>(false)
+const getNetworks = async (): Promise<void> => {
+  networkTableLoading.value = true
+  emits('get-networks', model.value.pvm.host_id || '')
+  networkTableLoading.value = false
+}
+getNetworks()
+
+const onHideAlert = (): void => {
+  emits('hide-alert')
+}
+</script>
+
+<style lang="scss" scoped>
+.select-network {
+  margin-top: 10px;
+  &__text {
+    font-size: 12px;
+  }
+  &__matcher-details {
+    margin-top: 10px;
+  }
+  .vm-migrate-advanced-view-button {
+    text-align: end;
+  }
+}
+</style>

package/components/common/pages/backups/modals/restore/networks/table/Table.vue

@@ -65,14 +65,12 @@ import type {
   UI_I_HeadItem,
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_I_Pvm } from '~/lib/models/store/vm/interfaces'
-// import type { I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-// import type { I_Pvm } from '~/store/modules/inventory/modules/backup/lib/models/interfaces'
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
 import * as table from '~/components/common/pages/backups/modals/restore/networks/table/lib/config/networkTable'
 
-const model = defineModel<I_RestoreForm>({ required: true })
+const model = defineModel<UI_I_RestoreForm>({ required: true })
 const props = defineProps<{
-  networksTable: UI_I_Pvm['network_devices']
+  networksTable: UI_I_RestoreForm['pvm']['network_devices']
   sourceNetworks: UI_I_NetworkTableItem[]
   loading: boolean
 }>()

package/components/common/pages/backups/modals/restore/networks/table/lib/config/networkTable.ts

@@ -4,14 +4,7 @@ import type {
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-// import { networkTableItemKeys } from '~/components/common/importVms/select/networks/table/lib/config/tableKeys'
-// TODO fix
-export const networkTableItemKeys = [
-  'import_source_id',
-  'mac',
-  'target',
-  'network',
-]
+import { networkTableItemKeys } from '~/components/common/pages/backups/modals/restore/networks/table/lib/config/tableKeys'
 
 const getItems = (
   localization: UI_I_Localization

package/components/common/pages/backups/modals/restore/types/Types.vue

@@ -14,11 +14,11 @@
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-// import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type {UI_I_RestoreForm} from "~/components/common/pages/backups/modals/lib/models/interfaces";
 import { backupsTypesFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/typeOptions'
 import { descriptionsFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/descriptions'
 
-const model = defineModel<I_RestoreForm>({ required: true })
+const model = defineModel<UI_I_RestoreForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -29,6 +29,14 @@ const description = computed<string[]>(
 )
 </script>
 
+<style>
+:root {
+  --type-list-border-color: #ccc;
+}
+:root.dark-theme {
+  --type-list-border-color: #000;
+}
+</style>
 <style scoped lang="scss">
 .select-restore-type {
   padding-top: 12px;
@@ -50,12 +58,3 @@ const description = computed<string[]>(
   }
 }
 </style>
-
-<style>
-:root {
-  --type-list-border-color: #ccc;
-}
-:root.dark-theme {
-  --type-list-border-color: #000;
-}
-</style>

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

@@ -1,24 +1,25 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-export const backupsTypesFunc = (
-  localization: UI_I_Localization,
-): UI_I_OptionItem[] => {
-  return [
-    {
-      text: localization.common.restoreExisting,
-      value: 2,
-      testId: 'backup-type-restore-existing',
-    },
-    {
-      text: localization.common.restoreAsNew,
-      value: 3,
-      testId: 'backup-type-restore-as-new',
-    },
-    {
-      text: localization.common.restoreDiskOnly,
-      value: 1,
-      testId: 'backup-type-restore-disk-only',
-    }
-  ]
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import { restoreCodes } from '~/components/common/pages/backups/modals/restore/lib/config/restoreCodes'
+
+export const backupsTypesFunc = (
+  localization: UI_I_Localization
+): UI_I_OptionItem[] => {
+  return [
+    {
+      text: localization.common.restoreExisting,
+      value: restoreCodes.existing,
+      testId: 'backup-type-restore-existing',
+    },
+    {
+      text: localization.common.restoreAsNew,
+      value: restoreCodes.asNew,
+      testId: 'backup-type-restore-as-new',
+    },
+    {
+      text: localization.common.restoreDiskOnly,
+      value: restoreCodes.diskOnly,
+      testId: 'backup-type-restore-disk-only',
+    },
+  ]
+}

package/components/common/pages/backups/tools/lib/config/tabs.ts

@@ -6,31 +6,31 @@ import type { UI_T_Project } from '~/lib/models/types'
 export const backupsTabsFunc = (
   localization: UI_I_Localization,
   isDisabled: boolean,
-  snapshotsCount: number,
+  backupsCount: number,
   selectedNode: UI_I_BackupsTreeNode | null,
   project: UI_T_Project
 ): UI_I_CollapseNavItem[] => {
   return [
     {
       text: localization.common.restore.toUpperCase(),
-      value: 'restore',
+      value: 'restoreBackup',
       disabled: isDisabled || selectedNode?.type !== 'backup',
       testId: 'restore-backup',
-      permission: project ? 'VirtualMachines.RestoreBackup' : '',
+      permission: project === 'sphere' ? 'VirtualMachines.RestoreBackup' : '',
     },
     {
       text: localization.common.delete.toUpperCase(),
       value: 'deleteBackup',
       disabled: isDisabled || selectedNode?.type !== 'backup',
       testId: 'delete-backup',
-      permission: project ? 'VirtualMachines.DeleteBackup' : '',
+      permission: project === 'sphere' ? 'VirtualMachines.DeleteBackup' : '',
     },
     {
       text: localization.common.deleteAll.toUpperCase(),
-      value: 'deleteAll',
-      disabled: isDisabled || !snapshotsCount,
+      value: 'deleteBackupAll',
+      disabled: isDisabled || !backupsCount,
       testId: 'delete-all-backups',
-      permission: project ? 'VirtualMachines.DeleteBackups' : '',
+      permission: project === 'sphere' ? 'VirtualMachines.DeleteBackups' : '',
     },
   ]
 }

package/package.json

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

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

@@ -1,14 +0,0 @@
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-
-export const backupDefaultFormFunc = (): UI_I_CreateBackupForm => {
-  return {
-    target: '',
-    name: '',
-    description: '',
-    disk_devices: [],
-    backup_storage: '',
-    strategy: 0,
-    // start_window_min: 60,
-    bandwidth_limit: 1_024 * 1_024,
-  }
-}

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

@@ -1,4 +0,0 @@
-export interface UI_I_DiskData {
-  location: string
-  target: string
-}