bfg-common 1.5.708 → 1.5.710

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/dynamicDirectPathIo/Old.vue

@@ -28,10 +28,9 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ConfigureAllPciDevicesItem } from '~/lib/models/store/host/interfaces'
 import type { UI_I_PciDevice } from '~/lib/models/store/vm/interfaces'
 
-const model = defineModel<UI_I_ConfigureAllPciDevicesItem>()
+const model = defineModel<UI_I_PciDevice>()
 
 const props = defineProps<{
   pciDeviceIndex: number

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/nvidiaGrid/New.vue

@@ -27,7 +27,7 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
 
-const model = defineModel<string>({ required: true })
+const model = defineModel<UI_I_Option | null>({ required: true })
 
 const props = defineProps<{
   options: UI_I_Option[]

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/nvidiaGrid/NvidiaGrid.vue

@@ -11,7 +11,7 @@
 import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
 import type { UI_I_MediatedDevice } from '~/lib/models/store/vm/interfaces'
 
-const model = defineModel<string>({ required: true })
+const model = defineModel<UI_I_Option | null>({ required: true })
 
 const props = defineProps<{
   pciDeviceIndex: number

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/nvidiaGrid/Old.vue

@@ -42,7 +42,7 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
 
-const model = defineModel<string>({ required: true })
+const model = defineModel<UI_I_Option | null>({ required: true })
 
 const props = defineProps<{
   options: UI_I_Option[]

package/components/common/vm/actions/common/select/options/Old.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="select-options">
     <div
-      v-show="!props.isNewVmFromTemplate"
+      v-if="!props.isNewVmFromTemplate"
       :class="['checkbox', { disabled: props.isNewVmFromTemplate }]"
     >
       <input
@@ -28,7 +28,6 @@
       }}</label>
     </div>
     <div class="checkbox">
-      <!--      :disabled="props.isNewVmFromTemplate"-->
       <input
         id="power-on"
         v-model="modelValue"

package/components/common/wizards/common/compatibility/New.vue

@@ -3,7 +3,7 @@
     <p class="compatibility">
       {{ localization.inventorySummary.compatibility }}
     </p>
-    <div class="compatibility-message flex-align-start">
+    <div class="compatibility-message flex-align-start" data-id="compatibility-message">
       <ui-skeleton-item v-if="props.loading" width="160px" height="16px" />
       <template v-else-if="props.text">
         <ui-icon

package/components/common/wizards/common/compatibility/Old.vue

@@ -3,7 +3,7 @@
     <p class="compatibility__title">
       {{ localization.inventorySummary.compatibility }}
     </p>
-    <div class="flex-align-center compatibility__content">
+    <div class="flex-align-center compatibility__content" data-id="compatibility-message">
       <template v-if="props.text">
         <div class="compatibility__message">
           <div v-show="iconStatus" :class="['icon', iconStatus]" />

package/components/common/wizards/datastore/add/lib/config/createDatastore.ts

@@ -6,6 +6,7 @@ export const datastoreDefaultFormFunc = (
   return {
     name: 'Datastore',
     dev_names: [],
+    level: 'linear',
     hosts: hostId ? [hostId] : [],
     type_code: 2,
     version: 4.1,

package/components/common/wizards/datastore/add/lib/models/interfaces.ts

@@ -7,6 +7,7 @@ import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/
 export interface UI_I_CreateDatastoreForm {
   name: string
   dev_names: UI_I_CreateStorageLunDiskItem[]
+  level: 'linear' | 'raid0' | 'raid1' | 'raid5' | 'raid6' | 'raid10'
   version: UI_T_NfsType
   type_code: UI_T_DatastoreTypeCode
   readonly: boolean

package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDeviceNew.vue

@@ -76,6 +76,11 @@
         @main-filter="emits('main-filter', $event)"
       />
     </div>
+
+    <common-wizards-datastore-add-steps-name-and-device-advanced-options
+      v-model="formModelLocal.level"
+      :dev-names-count="formModelLocal.dev_names.length"
+    />
   </div>
 </template>
 

package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDeviceOld.vue

@@ -90,6 +90,11 @@
         @main-filter="emits('main-filter', $event)"
       />
     </div>
+
+    <common-wizards-datastore-add-steps-name-and-device-advanced-options
+      v-model="formModelLocal.level"
+      :dev-names-count="formModelLocal.dev_names.length"
+    />
   </div>
 </template>
 

package/components/common/wizards/datastore/add/steps/nameAndDevice/advancedOptions/AdvancedOptions.vue

@@ -0,0 +1,43 @@
+<template>
+  <component
+    :is="currentComponent"
+    v-model="model"
+    :dev-names-count="props.devNamesCount"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+
+const { $store }: any = useNuxtApp()
+
+const model = defineModel<UI_I_CreateDatastoreForm['level']>({ required: true })
+
+const props = defineProps<{
+  devNamesCount: number
+}>()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+watch(
+  () => props.devNamesCount,
+  (newValue) => {
+    if (newValue < 2) {
+      if (model.value !== 'linear') model.value = 'linear'
+    } else if (newValue < 3) {
+      if (!['linear', 'raid0', 'raid1'].includes(model.value))
+        model.value = 'linear'
+    } else if (newValue < 4) {
+      if (!['linear', 'raid0', 'raid1', 'raid5'].includes(model.value))
+        model.value = 'linear'
+    }
+  }
+)
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/wizards/datastore/add/steps/nameAndDevice/advancedOptions/New.vue

@@ -0,0 +1,114 @@
+<template>
+  <div class="advanced-options-wrap clr-form-control">
+    <b
+      class="advanced-options-label btn btn-link"
+      @click="isShowAdvancedOptions = !isShowAdvancedOptions"
+    >
+      {{ localization.common.advancedOptions }}
+    </b>
+    <div v-show="isShowAdvancedOptions" class="advanced-options compact">
+      <div class="radio">
+        <input
+          v-model="model"
+          id="advanced-option-liner"
+          data-id="advanced-option-liner"
+          type="radio"
+          value="linear"
+        />
+        <label for="advanced-option-liner"> Linear </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid0"
+          :disabled="props.devNamesCount < 2"
+          data-id="advanced-option-raid0"
+          type="radio"
+          value="raid0"
+        />
+        <label for="advanced-option-raid0"> Raid0 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid1"
+          :disabled="props.devNamesCount < 2"
+          data-id="advanced-option-raid1"
+          type="radio"
+          value="raid1"
+        />
+        <label for="advanced-option-raid1"> Raid1 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 3 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid5"
+          :disabled="props.devNamesCount < 3"
+          data-id="advanced-option-raid5"
+          type="radio"
+          value="raid5"
+        />
+        <label for="advanced-option-raid5"> Raid5 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid6"
+          :disabled="props.devNamesCount < 4"
+          data-id="advanced-option-raid6"
+          type="radio"
+          value="raid6"
+        />
+        <label for="advanced-option-raid6"> Raid6 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid10"
+          :disabled="props.devNamesCount < 4"
+          data-id="advanced-option-raid10"
+          type="radio"
+          value="raid10"
+        />
+        <label for="advanced-option-raid10"> Raid10 </label>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateDatastoreForm['level']>({ required: true })
+
+const props = defineProps<{
+  devNamesCount: number
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isShowAdvancedOptions = ref<boolean>(false)
+</script>
+
+<style scoped lang="scss">
+.advanced-options-wrap {
+  display: flex;
+  gap: 10px;
+
+  .advanced-options-label {
+    margin: 0;
+    padding: 0;
+    line-height: normal;
+    height: auto;
+  }
+
+  .radio {
+    margin-bottom: 5px;
+  }
+  input[type='radio']:focus:checked + label::before,
+  input[type='radio']:focus + label::before {
+    box-shadow: inset 0 0 0 0.25rem #0094d2;
+  }
+}
+</style>

package/components/common/wizards/datastore/add/steps/nameAndDevice/advancedOptions/Old.vue

@@ -0,0 +1,114 @@
+<template>
+  <div class="advanced-options-wrap clr-form-control">
+    <b
+      class="advanced-options-label btn btn-link"
+      @click="isShowAdvancedOptions = !isShowAdvancedOptions"
+    >
+      {{ localization.common.advancedOptions }}
+    </b>
+    <div v-show="isShowAdvancedOptions" class="advanced-options compact">
+      <div class="radio">
+        <input
+          v-model="model"
+          id="advanced-option-liner"
+          data-id="advanced-option-liner"
+          type="radio"
+          value="linear"
+        />
+        <label for="advanced-option-liner"> Linear </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid0"
+          :disabled="props.devNamesCount < 2"
+          data-id="advanced-option-raid0"
+          type="radio"
+          value="raid0"
+        />
+        <label for="advanced-option-raid0"> Raid0 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid1"
+          :disabled="props.devNamesCount < 2"
+          data-id="advanced-option-raid1"
+          type="radio"
+          value="raid1"
+        />
+        <label for="advanced-option-raid1"> Raid1 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 3 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid5"
+          :disabled="props.devNamesCount < 3"
+          data-id="advanced-option-raid5"
+          type="radio"
+          value="raid5"
+        />
+        <label for="advanced-option-raid5"> Raid5 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid6"
+          :disabled="props.devNamesCount < 4"
+          data-id="advanced-option-raid6"
+          type="radio"
+          value="raid6"
+        />
+        <label for="advanced-option-raid6"> Raid6 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid10"
+          :disabled="props.devNamesCount < 4"
+          data-id="advanced-option-raid10"
+          type="radio"
+          value="raid10"
+        />
+        <label for="advanced-option-raid10"> Raid10 </label>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateDatastoreForm['level']>({ required: true })
+
+const props = defineProps<{
+  devNamesCount: number
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isShowAdvancedOptions = ref<boolean>(false)
+</script>
+
+<style scoped lang="scss">
+.advanced-options-wrap {
+  display: flex;
+  gap: 10px;
+
+  .advanced-options-label {
+    margin: 0;
+    padding: 0;
+    line-height: normal;
+    height: auto;
+  }
+
+  .radio {
+    margin-bottom: 5px;
+  }
+  input[type='radio']:focus:checked + label::before,
+  input[type='radio']:focus + label::before {
+    box-shadow: inset 0 0 0 0.25rem #0094d2;
+  }
+}
+</style>

package/components/common/wizards/datastore/add/steps/nameAndDevice/table/old/Old.vue

@@ -18,8 +18,7 @@
       hide-page-size
       @sorting="onSorting"
       @main-filter="emits('main-filter', $event)"
-    >
-    </atoms-table-data-grid>
+    />
   </div>
 </template>
 
@@ -92,7 +91,7 @@ watch(
   .data-table {
     height: inherit;
     :deep(.datagrid-outer-wrapper) {
-      height: 400px;
+      max-height: 400px;
     }
   }
 }

package/components/common/wizards/datastore/add/steps/readyComplete/lib/config/propertiesDetails.ts

@@ -112,7 +112,7 @@ const sharedStormDetailsFunc = (
   localization: UI_I_Localization,
   data: UI_I_CreateDatastoreForm
 ): UI_I_DetailsItem[] => {
-  const { name, dev_names } = data
+  const { name, dev_names, level } = data
 
   return [
     {
@@ -132,6 +132,13 @@ const sharedStormDetailsFunc = (
           items: [],
           testId: 'view-selected-lun-disks-in-complete',
         },
+        {
+          label: localization.common.advancedOptions,
+          value: level,
+          items: [],
+          testId: 'view-advanced-options-in-complete',
+          iconClassName: '',
+        },
       ],
       actions: [],
     },

package/components/common/wizards/vm/migrate/lib/models/enums.ts

@@ -1,6 +1,6 @@
 export enum UI_E_VmMigrationType {
-  resource = 'changeComputeResourceOriginalStorage',
-  storage = 'changeStorageComputeResource',
+  resource = 'changeComputeResourceOnly',
+  storage = 'changeStorageOnly',
   'resource-storage' = 'changeComputeResourceAndStorage',
   server = '',
 }

package/components/common/wizards/vm/migrate/steps/selectStorage/SelectStorage.vue

@@ -80,10 +80,10 @@ const onApplyChanges = (): void => {
   /* TODO сделать рефакторинг потом */
   model.value.configure.disks.forEach((disk) => {
     const selectedDisk = selectedPerDisks.value.find(
-      (selected) =>
-        selected.virtual_machine === disk.virtual_machine &&
-        selected.file === disk.file &&
-        selected.extra.datastore_id === disk.extra.datastore_id
+      (selectedDisk) =>
+        selectedDisk.virtual_machine === disk.virtual_machine &&
+        selectedDisk.extra.disk_source === disk.extra.disk_source &&
+        selectedDisk.extra.datastore_id === disk.extra.datastore_id
     )!
 
     if (selectedDisk) {

package/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/new/lib/config/diskTable.ts

@@ -158,12 +158,16 @@ export const getBodyDataFunc = (
   bodyData: UI_I_StorageConfigurePerDiskItem[],
   localization: UI_I_Localization
 ): UI_I_DataTableBody[] => {
-  const { $binary }: any = useNuxtApp()
 
   return bodyData.map((disk, index: number) => {
     const diskFormat =
       index === 0 ? 'N/A' : UI_E_SelectStorageDiskFormat[disk.disk_format]
 
+    const file =
+      disk.extra.disk_source === 'meta'
+        ? disk.file
+        : `${disk.extra.disk_source} (${disk.extra.disk_size} ${localization.common.mb} )`
+
     const diskSharingKey = disk.extra.sharing
       ? E_DiskSharing.Active
       : E_DiskSharing.Inactive
@@ -198,7 +202,7 @@ export const getBodyDataFunc = (
         },
         {
           col: 'col2',
-          text: disk.file,
+          text: file,
         },
         {
           col: 'col3',

package/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/old/lib/config/diskTable.ts

@@ -66,32 +66,38 @@ export const bodyItems = (
   data: UI_I_StorageConfigurePerDiskItem[]
 ): UI_I_BodyItem[][] => {
   const bodyItems: UI_I_BodyItem[][] = []
+  const localization = useLocal()
 
-  data.forEach((storage: UI_I_StorageConfigurePerDiskItem, key: number) => {
+  data.forEach((disk: UI_I_StorageConfigurePerDiskItem, key: number) => {
     const diskFormat =
       key === 0
         ? 'N/A'
-        : UI_E_SelectStorageDiskFormat[storage[vmMigrateDiskTableItemKeys[4]]]
+        : UI_E_SelectStorageDiskFormat[disk[vmMigrateDiskTableItemKeys[4]]]
+
+    const file =
+      disk.extra.disk_source === 'meta'
+        ? disk[vmMigrateDiskTableItemKeys[2]]
+        : `${disk.extra.disk_source} (${disk.extra.disk_size} ${localization.common.mb} )`
 
     bodyItems.push([
       {
         key: 'col0',
-        text: storage[vmMigrateDiskTableItemKeys[0]],
+        text: disk[vmMigrateDiskTableItemKeys[0]],
         id: key,
       },
       {
         key: 'col1',
-        text: storage[vmMigrateDiskTableItemKeys[1]],
+        text: disk[vmMigrateDiskTableItemKeys[1]],
         id: key,
       },
       {
         key: 'col2',
-        text: storage[vmMigrateDiskTableItemKeys[2]],
+        text: file,
         id: key,
       },
       {
         key: 'col3',
-        text: storage[vmMigrateDiskTableItemKeys[3]],
+        text: disk[vmMigrateDiskTableItemKeys[3]],
         id: key,
       },
       {
@@ -101,33 +107,33 @@ export const bodyItems = (
       },
       {
         key: 'col5',
-        text: storage.extra[vmMigrateDiskTableItemKeys[5]],
+        text: disk.extra[vmMigrateDiskTableItemKeys[5]],
         id: key,
       },
 
       {
         key: 'col6',
-        text: storage.extra[vmMigrateDiskTableItemKeys[6]],
+        text: disk.extra[vmMigrateDiskTableItemKeys[6]],
         id: key,
       },
       {
         key: 'col7',
-        text: storage.extra[vmMigrateDiskTableItemKeys[7]],
+        text: disk.extra[vmMigrateDiskTableItemKeys[7]],
         id: key,
       },
       {
         key: 'col8',
-        text: storage.extra[vmMigrateDiskTableItemKeys[8]],
+        text: disk.extra[vmMigrateDiskTableItemKeys[8]],
         id: key,
       },
       {
         key: 'col9',
-        text: storage.extra[vmMigrateDiskTableItemKeys[9]],
+        text: disk.extra[vmMigrateDiskTableItemKeys[9]],
         id: key,
       },
       {
         key: 'col10',
-        text: storage.extra[vmMigrateDiskTableItemKeys[10]],
+        text: disk.extra[vmMigrateDiskTableItemKeys[10]],
         id: key,
       },
     ])

package/composables/useEnvLanguage.ts

@@ -1,11 +1,10 @@
 export function useEnvLanguage(): string {
-  const { $store }: any = useNuxtApp()
+  // const { $store }: any = useNuxtApp()
 
-  let localizationCode = 'en_US'
+  const localizationCode = ref<string>('en_US')
   const langFromLocalStorage =
-    $store.getters['main/getInterfaceLang'] || // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
-    useLocalStorage('lang') ||
-    useLocalStorage('languageType')
+    // $store.getters['main/getInterfaceLang'] || // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
+    useLocalStorage('lang')
 
   if (langFromLocalStorage) {
     if (
@@ -13,11 +12,11 @@ export function useEnvLanguage(): string {
       langFromLocalStorage === 'ru_RU' ||
       langFromLocalStorage === 'hy_AM'
     ) {
-      localizationCode = langFromLocalStorage
+      localizationCode.value = langFromLocalStorage
     }
   }
 
-  localizationCode = localizationCode.slice(0, 2).toUpperCase()
+  localizationCode.value = localizationCode.value.slice(0, 2).toUpperCase()
 
-  return localizationCode
+  return localizationCode.value
 }

package/lib/models/interfaces.ts

@@ -60,6 +60,7 @@ export interface UI_I_Localization {
   registerVm: UI_I_ArbitraryObject<string>
   files: UI_I_ArbitraryObject<string>
   myPreferences: UI_I_ArbitraryObject<string>
+  cacheConfiguration: UI_I_ArbitraryObject<string>
 }
 export interface UI_I_SendTaskParams {
   method: string

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.708",
+  "version": "1.5.710",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -18,7 +18,7 @@
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
     "bfg-nuxt-3-graph": "1.0.27",
-    "bfg-uikit": "1.0.533",
+    "bfg-uikit": "1.0.535",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",
@@ -38,7 +38,6 @@
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@vueuse/components": "^10.1.2",
     "html2canvas": "^1.4.1",
-    "prettier-eslint": "^15.0.1",
-    "qrcode": "^1.5.4"
+    "prettier-eslint": "^15.0.1"
   }
 }