bfg-common 1.3.431 → 1.3.433

package/assets/localization/local_be.json

@@ -2380,5 +2380,6 @@
   "passwordIsRequired": "Патрабуецца пароль",
   "source": "Крыніца",
   "diskIsRequired": "Патрабуецца дыск",
-  "datastoreIsRequired": "Патрабуецца сховішча даных"
+  "datastoreIsRequired": "Патрабуецца сховішча даных",
+  "noBackupAvailable": "Няма даступнай рэзервовай копіі"
 }

package/assets/localization/local_en.json

@@ -2384,5 +2384,6 @@
   "passwordIsRequired": "Password is required",
   "source": "Source",
   "diskIsRequired": "Disk is required",
-  "datastoreIsRequired": "Datastore is required"
+  "datastoreIsRequired": "Datastore is required",
+  "noBackupAvailable": "No backup available"
 }

package/assets/localization/local_hy.json

@@ -2384,5 +2384,6 @@
   "passwordIsRequired": "Գաղտնաբառը պարտադիր է",
   "source": "Աղբյուր",
   "diskIsRequired": "Պահանջվում է սկավառակ",
-  "datastoreIsRequired": "Պահանջվում է տվյալների պահեստ"
+  "datastoreIsRequired": "Պահանջվում է տվյալների պահեստ",
+  "noBackupAvailable": "Պահուստավորում չկա"
 }

package/assets/localization/local_kk.json

@@ -2383,5 +2383,6 @@
   "passwordIsRequired": "Құпия сөз қажет",
   "source": "Дереккөз",
   "diskIsRequired": "Диск қажет",
-  "datastoreIsRequired": "Деректер қоймасы қажет"
+  "datastoreIsRequired": "Деректер қоймасы қажет",
+  "noBackupAvailable": "Сақтық көшірме жоқ"
 }

package/assets/localization/local_ru.json

@@ -2389,5 +2389,6 @@
   "passwordIsRequired": "Требуется пароль",
   "source": "Источник",
   "diskIsRequired": "Требуется диск",
-  "datastoreIsRequired": "Требуется хранилище данных"
+  "datastoreIsRequired": "Требуется хранилище данных",
+  "noBackupAvailable": "Резервная копия недоступна"
 }

package/assets/localization/local_zh.json

@@ -2383,5 +2383,6 @@
   "passwordIsRequired": "密码是必需的",
   "source": "来源",
   "diskIsRequired": "需要磁盘",
-  "datastoreIsRequired": "需要数据存储"
+  "datastoreIsRequired": "需要数据存储",
+  "noBackupAvailable": "没有可用的备份"
 }

package/components/common/recursionTree/lib/models/interfaces.ts

@@ -4,7 +4,7 @@ export interface UI_I_TreeNodeShort<T = string> {
   id: string | number
   type: T
 }
-export interface UI_I_TreeNode<N = UI_I_TreeNodeDuplicate, T = string>
+export interface UI_I_TreeNode<N = UI_I_TreeNodeDuplicate, T = string, D = any>
   extends UI_I_TreeNodeShort<T> {
   state: string | number // TODO только number
   name: string
@@ -19,4 +19,5 @@ export interface UI_I_TreeNode<N = UI_I_TreeNodeDuplicate, T = string>
   modified?: number
   testId?: string
   kind?: number
+  data?: D
 }

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDrive.vue

@@ -4,6 +4,7 @@
       :has-children="true"
       :is-roll-back="props.type === 'removed'"
       :removable="isRemovable"
+      test-id="cd-dvd-drive-stack-block"
       @remove="onRemoveCdDvdDrive"
       @roll-back="onRollBackCdDvdDrive"
     >

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Cpu.vue

@@ -1,8 +1,12 @@
 <template>
   <div class="hardware-cpu">
-    <atoms-stack-block :has-children="true">
+    <atoms-stack-block :has-children="true" test-id="cpu-stack-block">
       <template #stackBlockKey>
-        <div id="vm-wizard-toggle-block-cpu" data-id="vm-wizard-toggle-block-cpu" class="flex-align-center">
+        <div
+          id="vm-wizard-toggle-block-cpu"
+          data-id="vm-wizard-toggle-block-cpu"
+          class="flex-align-center"
+        >
           <span>{{ localization.cpu }}</span>
           <atoms-the-icon
             v-show="cpuInvalid"

package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/Memory.vue

@@ -1,8 +1,12 @@
 <template>
   <div class="hardware-memory">
-    <atoms-stack-block :has-children="true">
+    <atoms-stack-block :has-children="true" test-id="memory-stack-block">
       <template #stackBlockKey>
-        <div id="vm-wizard-toggle-block-memory" data-id="vm-wizard-toggle-block-memory" class="flex-align-center">
+        <div
+          id="vm-wizard-toggle-block-memory"
+          data-id="vm-wizard-toggle-block-memory"
+          class="flex-align-center"
+        >
           <span>{{ localization.memory }}</span>
           <atoms-the-icon
             v-show="memoryInvalid"

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue

@@ -4,6 +4,7 @@
       :has-children="true"
       :is-roll-back="props.type === 'removed'"
       :removable="isRemovable"
+      test-id="hard-disk-stack-block"
       @remove="onRemoveHardDisk"
       @roll-back="onRollBackHardDisk"
     >

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/NewNetwork.vue

@@ -3,6 +3,7 @@
     <atoms-stack-block
       :has-children="true"
       :removable="isRemovable"
+      test-id="network-stack-block"
       @remove="removeNetwork"
     >
       <template #stackBlockKey>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/NewPciDevice.vue

@@ -3,6 +3,7 @@
     <atoms-stack-block
       :has-children="true"
       :removable="isRemovable"
+      test-id="pci-device-stack-block"
       @remove="onRemovePciDevice"
     >
       <template #stackBlockKey>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbController.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="hardware-usb-controller">
-    <atoms-stack-block :has-children="false">
+    <atoms-stack-block :has-children="false" test-id="usb-controller-stack-block">
       <template #stackBlockKey>
         <div
           id="vm-wizard-toggle-block-usb-controller"

package/components/common/vm/actions/common/customizeHardware/virtualHardware/other/Other.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="hardware-other">
-    <atoms-stack-block :has-children="true">
+    <atoms-stack-block :has-children="true" test-id="other-stack-block">
       <template #stackBlockKey>
         <div
           id="vm-wizard-toggle-block-other"

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="hardware-video-card">
-    <atoms-stack-block :has-children="true">
+    <atoms-stack-block :has-children="true" test-id="video-card-stack-block">
       <template #stackBlockKey>
         <div
           id="vm-wizard-toggle-block-video-card"

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptions.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="boot-options">
-    <atoms-stack-block :has-children="true">
+    <atoms-stack-block :has-children="true" test-id="boot-options-stack-block">
       <template #stackBlockKey>
         <div
           id="vm-wizard-toggle-block-boot-option"

package/components/common/vm/actions/common/customizeHardware/vmoptions/generalOptions/GeneralOptions.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="general-options">
-    <atoms-stack-block :has-children="true" @toggle="blockIsOpen = $event">
+    <atoms-stack-block
+      :has-children="true"
+      test-id="general-options-stack-block"
+      @toggle="blockIsOpen = $event"
+    >
       <template #stackBlockKey>
         <div
           id="vm-wizard-toggle-block-general-options"

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/RemoteConsoleOptions.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="hardware-cpu">
-    <atoms-stack-block :has-children="true">
+  <div class="hardware-remote-console">
+    <atoms-stack-block :has-children="true" test-id="remote-console-stack-block">
       <template #stackBlockKey>
         <div
           id="vm-wizard-toggle-block-remote-console"

package/components/common/vm/actions/common/customizeHardware/vmoptions/tools/Tools.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="hardware-cpu">
-    <atoms-stack-block :has-children="true">
+  <div class="hardware-tools">
+    <atoms-stack-block :has-children="true" test-id="tools-stack-block">
       <template #stackBlockKey>
         <div
           id="vm-wizard-toggle-block-tools"

package/components/common/wizards/datastoreNew/add/lib/models/types.ts

@@ -6,7 +6,7 @@ export type UI_T_KerberosAuthentication =
   | 'use-only-krb5'
   | 'use-integrity'
 
-export type UI_T_WizardDatastoreMode = 'procurator' | 'sphere'
+// export type UI_T_WizardDatastoreMode = 'procurator' | 'sphere'
 
 // export interface UI_I_DatastoreValidityName {
 //   valid: boolean

package/components/common/wizards/datastoreNew/add/sharedStorm/SharedStorm.vue

@@ -4,10 +4,10 @@
       v-show="props.stepId === 2"
       v-model="model"
       v-model:lun-disk="selectedLunDisk"
+      :step-id="props.stepId"
       :device-selection-submit="0"
-      :step-position="1"
       :datastore-type="props.datastoreType"
-      :mode="props.project"
+      :project="props.project"
       :datacenter-hosts="props.datacenterHosts"
       :is-main-filter="props.isMainFilter"
       :host-id="props.hostId"
@@ -63,7 +63,7 @@ const selectedLunDisk = ref<UI_I_CreateStorageLunDiskItem[]>([])
 
 const lunDiskTotalCapacity = computed<number>(() => {
   console.log(model.value, 'model.value')
-
+  console.log(selectedLunDisk.value, 'selectedLunDisk.value')
 
   if (!selectedLunDisk.value.length) return 0
 

package/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/DeviceSelection.vue

@@ -46,7 +46,7 @@
     />
 
     <div
-      v-if="props.mode === 'sphere' && !props.hostId"
+      v-if="props.project === 'sphere' && !props.hostId"
       class="clr-form-control clr-row"
     >
       <label class="clr-control-label clr-col-12 clr-col-md-2">{{
@@ -96,6 +96,7 @@
 </template>
 
 <script lang="ts" setup>
+import { UI_T_Project } from '~/lib/models/types'
 import { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
 // import { UI_I_SchemaTablePayload } from '~/lib/models/store/interfaces'
 import { UI_I_Localization } from '~/lib/models/interfaces'
@@ -112,16 +113,14 @@ import {
   UI_I_SelectHostOptions,
 } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 // import { Ui_T_HostSelectedType } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/types'
-import {
-  UI_T_DatastoreType,
-  UI_T_WizardDatastoreMode,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
+import { UI_T_DatastoreType } from '~/components/common/wizards/datastoreNew/add/lib/models/types'
 import { defaultFormFunc } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/config/defaultForm'
 import { hostsOptionsFunc } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/config/selectOptions'
 import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
 
 const props = defineProps<{
-  mode: UI_T_WizardDatastoreMode
+  project: UI_T_Project
+  stepId: number
   deviceSelectionSubmit: number
   lunDisk: UI_I_CreateStorageLunDiskItem[]
   stepPosition: number
@@ -187,20 +186,6 @@ const sort = ref<string | null>(null)
 
 const selectedLunDisk = ref<number[]>([])
 
-watch(
-  selectedLunDisk,
-  (newValue: number[] | null) => {
-    if (newValue === null || !dataTable.value) return null
-
-    const lunDisk = dataTable.value.items.filter((_: any, key: number) =>
-      newValue.includes(key)
-    )
-
-    emits('update:lun-disk', lunDisk)
-  },
-  { deep: true }
-)
-
 const updatePagination = (event: UI_I_Pagination): void => {
   pagination.value = event
 }
@@ -215,7 +200,7 @@ const loading = computed<boolean>(() =>
 const dataTable = computed<API_UI_I_DataTable<
   UI_I_CreateStorageLunDiskItem[]
 > | null>(() => {
-  // if (props.mode === 'procurator')
+  // if (props.project === 'procurator')
   return $store.getters['storage/getNewDatastoreHosts']
 
   // if (props.datastoreType === 'local') return []
@@ -263,7 +248,7 @@ const validatePropertiesForSphere = (): boolean => {
   }
 
   if (props.datastoreType === 'shared-storm') {
-    return !selectedHost.value || !selectedLunDisk.value.length
+    return !selectedHost.value || !model.value.lunDisk.length
   }
 
   return false
@@ -284,17 +269,17 @@ const validationTextForSphere = (): string => {
 
 const collectDataForReview = (
   name: string,
-  mode: UI_T_WizardDatastoreMode
+  mode: UI_T_Project
 ): UI_I_DeviceSelectionSendData => {
   const data: UI_I_DeviceSelectionSendData = {
     name,
   }
 
-  if (mode === 'procurator') {
-    data.lunDisk = props.lunDisk.map((lun) => {
-      return { name: lun.name, capacity: lun.capacity_mb }
-    })
-  }
+  // if (mode === 'procurator') {
+  //   data.lunDisk = props.lunDisk.map((lun) => {
+  //     return { name: lun.name, capacity: lun.capacity_mb }
+  //   })
+  // }
 
   if (mode === 'sphere') {
     if (props.datastoreType === 'local') {
@@ -314,16 +299,16 @@ const collectDataForReview = (
 
 const submit = async (): Promise<void> => {
   const name = form.value.name.value
-  const { mode } = props
+  const { project } = props
 
   const valid = validation.touch()
   const isShowAlertDanger =
-    mode === 'procurator'
-      ? !selectedLunDisk.value.length
+    project === 'procurator'
+      ? !model.value.lunDisk.length
       : validatePropertiesForSphere()
 
   if (!valid.isValid || isShowAlertDanger) {
-    const isModeSphere = mode === 'sphere' && props.datastoreType === 'local'
+    const isModeSphere = project === 'sphere' && props.datastoreType === 'local'
 
     const errorText =
       localization.value[
@@ -337,7 +322,10 @@ const submit = async (): Promise<void> => {
   if (!isShowAlertDanger) {
     emits('loading', true)
 
-    const { valid: validName, msg } = await checkValidityName(name, props.mode)
+    const { valid: validName, msg } = await checkValidityName(
+      name,
+      props.project
+    )
 
     emits('loading', false)
 
@@ -349,7 +337,7 @@ const submit = async (): Promise<void> => {
 
   resetValidation()
 
-  const eventData = collectDataForReview(name, mode)
+  const eventData = collectDataForReview(name, project)
   emits('submit', eventData)
 }
 
@@ -382,30 +370,9 @@ const initLunDisksDataTable = async (): Promise<void> => {
   } as UI_I_DataTableQuery)
 }
 
-watch(
-  () => props.stepPosition,
-  () => {
-    const { stepPosition, datastoreType, mode } = props
-    // const hostsDataForProcurator =
-    //   $store.getters['storage/getNewDatastoreHosts']
-
-    // if (
-    //   mode === 'sphere' &&
-    //   stepPosition === 1 &&
-    //   datastoreType === 'local' &&
-    //   !hostData.value
-    // ) {
-    //   initHostData()
-    // }
-    if (
-      mode === 'procurator' &&
-      stepPosition === 1 &&
-      datastoreType === 'shared-storm'
-    ) {
-      initLunDisksDataTable()
-    }
-  }
-)
+if (props.project === 'procurator' && props.stepId === 2) {
+  initLunDisksDataTable()
+}
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/table/Table.vue

@@ -50,7 +50,7 @@ const props = defineProps<{
   pagination: UI_I_Pagination
   isMainFilter?: boolean
 }>()
-const selectedLunDiskLocal = defineModel<number[]>()
+const modelLunDisk = defineModel<UI_I_CreateStorageLunDiskItem[]>()
 const emits = defineEmits<{
   (event: 'pagination', value: UI_I_Pagination): void
   (event: 'sort', value: string): void
@@ -107,6 +107,17 @@ const bodyItems = computed<UI_I_BodyItem[][]>(() => {
 
   return result
 })
+
+const selectedLunDiskLocal = ref<number[]>()
+watch(
+  selectedLunDiskLocal,
+  (newValue: number[]) => {
+    modelLunDisk.value = props.dataTable.filter((_: any, key: number) =>
+      newValue.includes(key)
+    )
+  },
+  { deep: true, immediate: true }
+)
 </script>
 
 <style lang="scss" scoped>

package/package.json

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