bfg-common 1.5.708 → 1.5.709

package/components/common/wizards/datastore/add/lib/utils.ts

@@ -1,85 +1,85 @@
-import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
-import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import { UI_E_Kind } from '~/lib/models/enums'
-
-export const checkValidityName = async ({
-  name,
-  wizard,
-  project,
-  sendMessage,
-  datacenterId,
-}: {
-  name: string
-  wizard: Wizard
-  project: UI_T_Project
-  sendMessage: (message: string) => void
-  datacenterId?: string
-}): Promise<void> => {
-  wizard.setLoader(true)
-  const url = buildValidationUrl(name, project, datacenterId)
-
-  const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
-    method: 'GET',
-  })
-
-  wizard.setLoader(false)
-
-  if (error.value && error.value.data.error_code !== 0) {
-    const existError = error.value.data?.error_message || error.value.data
-    sendMessage(existError)
-    return
-  }
-  sendMessage('')
-}
-
-const buildValidationUrl = (
-  name: string,
-  project: UI_T_Project,
-  datacenterId?: string
-): string => {
-  if (project === 'procurator') {
-    const params = new URLSearchParams({ name })
-    return `/ui/ds/validate?${params.toString()}`
-  }
-
-  const params = new URLSearchParams()
-  params.set('name', name)
-  params.set('kind', String(UI_E_Kind.STORAGE_VALIDATION_NAME))
-  if (datacenterId) params.set('datacenter', datacenterId)
-
-  return `/ui/object/validate_name_datacenter?${params.toString()}`
-}
-
-export const validateNameAndGenerateDataId = (
-  name: string,
-  _errorMessage: string,
-  defaultDataId?: string
-): string => {
-  let baseDataId = defaultDataId || 'storage-name-alert-error'
-
-  const patterns = [
-    {
-      regex: /^[a-zA-Z0-9_\-\.]+$/,
-      error_message:
-        /invalid name, must only contain letters, numbers, and '_', '-' '.' symbols/,
-      suffix: '-invalid-name-symbols',
-    },
-    {
-      regex: /^.{3,64}$/,
-      error_message:
-        /invalid name length, must be between: \d+ and \d+ characters/,
-      suffix: '-invalid-name-length',
-    },
-  ]
-
-  // Проверка error_message на соответствие шаблонам
-
-  for (const pattern of patterns) {
-    if (!pattern.regex.test(name)) {
-      return `${baseDataId}${pattern.suffix}`
-    }
-  }
-
-  return baseDataId
-}
+import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import { UI_E_Kind } from '~/lib/models/enums'
+
+export const checkValidityName = async ({
+  name,
+  wizard,
+  project,
+  sendMessage,
+  datacenterId,
+}: {
+  name: string
+  wizard: Wizard
+  project: UI_T_Project
+  sendMessage: (message: string) => void
+  datacenterId?: string
+}): Promise<void> => {
+  wizard.setLoader(true)
+  const url = buildValidationUrl(name, project, datacenterId)
+
+  const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
+    method: 'GET',
+  })
+
+  wizard.setLoader(false)
+
+  if (error.value && error.value.data.error_code !== 0) {
+    const existError = error.value.data?.error_message || error.value.data
+    sendMessage(existError)
+    return
+  }
+  sendMessage('')
+}
+
+const buildValidationUrl = (
+  name: string,
+  project: UI_T_Project,
+  datacenterId?: string
+): string => {
+  if (project === 'procurator') {
+    const params = new URLSearchParams({ name })
+    return `/ui/ds/validate?${params.toString()}`
+  }
+
+  const params = new URLSearchParams()
+  params.set('name', name)
+  params.set('kind', String(UI_E_Kind.STORAGE_VALIDATION_NAME))
+  if (datacenterId) params.set('datacenter', datacenterId)
+
+  return `/ui/object/validate_name_datacenter?${params.toString()}`
+}
+
+export const validateNameAndGenerateDataId = (
+  name: string,
+  _errorMessage: string,
+  defaultDataId?: string
+): string => {
+  let baseDataId = defaultDataId || 'storage-name-alert-error'
+
+  const patterns = [
+    {
+      regex: /^[a-zA-Z0-9_\-\.]+$/,
+      error_message:
+        /invalid name, must only contain letters, numbers, and '_', '-' '.' symbols/,
+      suffix: '-invalid-name-symbols',
+    },
+    {
+      regex: /^.{3,64}$/,
+      error_message:
+        /invalid name length, must be between: \d+ and \d+ characters/,
+      suffix: '-invalid-name-length',
+    },
+  ]
+
+  // Проверка error_message на соответствие шаблонам
+
+  for (const pattern of patterns) {
+    if (!pattern.regex.test(name)) {
+      return `${baseDataId}${pattern.suffix}`
+    }
+  }
+
+  return baseDataId
+}

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/datastore/add/steps/typeMode/lib/config/typeOptions.ts

@@ -1,43 +1,43 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
-
-export const datastoreTypesFunc = (
-  localization: UI_I_Localization,
-  _project?: UI_T_Project
-): UI_I_RadioOption[] => {
-  return [
-    {
-      id: 'datastore-type-shared-storm',
-      label: localization.common.stormSharedStorage,
-      value: 2,
-      disabled: false,
-      description: localization.common.sharedStormDesc,
-      isTooltip: false,
-      tooltipContent: localization.common.stormSharedStorageHelpDesc,
-      testId: 'datastore-type-shared-storm',
-    },
-    {
-      id: 'datastore-type-nfs',
-      label: localization.common.nfs,
-      value: 4,
-      disabled: false,
-      description: localization.common.nfsDesc,
-      isTooltip: false,
-      tooltipContent: localization.common.nfsHelpDesc,
-      testId: 'datastore-type-nfs',
-    },
-  ]
-
-  // if (project === 'procurator') {
-  //   types.unshift({
-  //     label: localization.common.localStorage,
-  //     value: 1,
-  //     disabled: false,
-  //     description: localization.common.localDesc,
-  //     isTooltip: false,
-  //     tooltipContent: localization.common.localStorageHelpDesc,
-  //     testId: 'datastore-type-local',
-  //   })
-  // }
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
+
+export const datastoreTypesFunc = (
+  localization: UI_I_Localization,
+  _project?: UI_T_Project
+): UI_I_RadioOption[] => {
+  return [
+    {
+      id: 'datastore-type-shared-storm',
+      label: localization.common.stormSharedStorage,
+      value: 2,
+      disabled: false,
+      description: localization.common.sharedStormDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.stormSharedStorageHelpDesc,
+      testId: 'datastore-type-shared-storm',
+    },
+    {
+      id: 'datastore-type-nfs',
+      label: localization.common.nfs,
+      value: 4,
+      disabled: false,
+      description: localization.common.nfsDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.nfsHelpDesc,
+      testId: 'datastore-type-nfs',
+    },
+  ]
+
+  // if (project === 'procurator') {
+  //   types.unshift({
+  //     label: localization.common.localStorage,
+  //     value: 1,
+  //     disabled: false,
+  //     description: localization.common.localDesc,
+  //     isTooltip: false,
+  //     tooltipContent: localization.common.localStorageHelpDesc,
+  //     testId: 'datastore-type-local',
+  //   })
+  // }
+}

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',