bfg-common 1.5.707 → 1.5.708

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,11 +76,6 @@
         @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,11 +90,6 @@
         @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/table/old/Old.vue

@@ -18,7 +18,8 @@
       hide-page-size
       @sorting="onSorting"
       @main-filter="emits('main-filter', $event)"
-    />
+    >
+    </atoms-table-data-grid>
   </div>
 </template>
 
@@ -91,7 +92,7 @@ watch(
   .data-table {
     height: inherit;
     :deep(.datagrid-outer-wrapper) {
-      max-height: 400px;
+      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, level } = data
+  const { name, dev_names } = data
 
   return [
     {
@@ -132,13 +132,6 @@ 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 = 'changeComputeResourceOnly',
-  storage = 'changeStorageOnly',
+  resource = 'changeComputeResourceOriginalStorage',
+  storage = 'changeStorageComputeResource',
   '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(
-      (selectedDisk) =>
-        selectedDisk.virtual_machine === disk.virtual_machine &&
-        selectedDisk.extra.disk_source === disk.extra.disk_source &&
-        selectedDisk.extra.datastore_id === disk.extra.datastore_id
+      (selected) =>
+        selected.virtual_machine === disk.virtual_machine &&
+        selected.file === disk.file &&
+        selected.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,16 +158,12 @@ 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
@@ -202,7 +198,7 @@ export const getBodyDataFunc = (
         },
         {
           col: 'col2',
-          text: file,
+          text: disk.file,
         },
         {
           col: 'col3',

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

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

package/composables/useAppVersion.ts

@@ -1,21 +1,21 @@
-import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
-
-export function useAppVersion(): UI_I_UseAppVersionReturnType {
-  const config = useRuntimeConfig()
-  const version = config.public.APP_VERSION as string
-
-  // const regexHasDot = /\./
-  // const regexHasDotAndB = /\.\d*b$/
-  // const regexHasDotAndD = /\..*d/
-
-  // const isBeta = regexHasDotAndB.test(version)
-  // const isDev =
-  //   regexHasDotAndD.test(version) ||
-  //   (!regexHasDot.test(version) && version.length < 8)
-
-  return {
-    version,
-    // isBeta,
-    // isDev,
-  }
-}
+import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
+
+export function useAppVersion(): UI_I_UseAppVersionReturnType {
+  const config = useRuntimeConfig()
+  const version = config.public.APP_VERSION as string
+
+  // const regexHasDot = /\./
+  // const regexHasDotAndB = /\.\d*b$/
+  // const regexHasDotAndD = /\..*d/
+
+  // const isBeta = regexHasDotAndB.test(version)
+  // const isDev =
+  //   regexHasDotAndD.test(version) ||
+  //   (!regexHasDot.test(version) && version.length < 8)
+
+  return {
+    version,
+    // isBeta,
+    // isDev,
+  }
+}

package/composables/useEnvLanguage.ts

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

package/composables/useLocal.ts

@@ -1,6 +1,6 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { useLocalCommon } from '~/composables/useLocalCommon'
-
-export const useLocal = (): UI_I_Localization => {
-  return useLocalCommon()
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { useLocalCommon } from '~/composables/useLocalCommon'
+
+export const useLocal = (): UI_I_Localization => {
+  return useLocalCommon()
+}

package/composables/useLocalCommon.ts

@@ -1,39 +1,39 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import localAr from '~/assets/scss/clarity/local_ar.json'
-import localRu from '~/assets/localization/local_ru.json'
-import localEn from '~/assets/localization/local_en.json'
-import localHy from '~/assets/localization/local_hy.json'
-import localZh from '~/assets/localization/local_zh.json'
-import localKk from '~/assets/localization/local_kk.json'
-import localBe from '~/assets/localization/local_be.json'
-import { productNameLocal } from '~/lib/utils/localizationMapper'
-
-const rawLocals: Record<string, any> = {
-  ar: localAr,
-  ru: localRu,
-  en: localEn,
-  hy: localHy,
-  zh: localZh,
-  kk: localKk,
-  be: localBe,
-}
-
-// Кешируем уже обработанные локали
-const processedCache: Record<string, UI_I_Localization | undefined> = {}
-
-export const useLocalCommon = (): UI_I_Localization => {
-  const config = useRuntimeConfig()
-  let code = String(config?.public?.LOCALIZATION_CODE || 'ru').toLowerCase()
-
-  if (code === 'ar' && !useLocalStorage('rtl')) code = 'ru'
-
-  if (typeof document !== 'undefined') document.documentElement.lang = code
-
-  // если в кеше нет — создаём и сохраняем
-  if (!processedCache[code]) {
-    const raw = rawLocals[code] || rawLocals['ru']
-    processedCache[code] = productNameLocal(raw)
-  }
-
-  return processedCache[code] as UI_I_Localization
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import localAr from '~/assets/scss/clarity/local_ar.json'
+import localRu from '~/assets/localization/local_ru.json'
+import localEn from '~/assets/localization/local_en.json'
+import localHy from '~/assets/localization/local_hy.json'
+import localZh from '~/assets/localization/local_zh.json'
+import localKk from '~/assets/localization/local_kk.json'
+import localBe from '~/assets/localization/local_be.json'
+import { productNameLocal } from '~/lib/utils/localizationMapper'
+
+const rawLocals: Record<string, any> = {
+  ar: localAr,
+  ru: localRu,
+  en: localEn,
+  hy: localHy,
+  zh: localZh,
+  kk: localKk,
+  be: localBe,
+}
+
+// Кешируем уже обработанные локали
+const processedCache: Record<string, UI_I_Localization | undefined> = {}
+
+export const useLocalCommon = (): UI_I_Localization => {
+  const config = useRuntimeConfig()
+  let code = String(config?.public?.LOCALIZATION_CODE || 'ru').toLowerCase()
+
+  if (code === 'ar' && !useLocalStorage('rtl')) code = 'ru'
+
+  if (typeof document !== 'undefined') document.documentElement.lang = code
+
+  // если в кеше нет — создаём и сохраняем
+  if (!processedCache[code]) {
+    const raw = rawLocals[code] || rawLocals['ru']
+    processedCache[code] = productNameLocal(raw)
+  }
+
+  return processedCache[code] as UI_I_Localization
+}

package/lib/models/interfaces.ts

@@ -60,7 +60,6 @@ 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