bfg-common 1.5.718 → 1.5.719

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/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/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/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/enums.ts

@@ -18,6 +18,20 @@ export enum UI_E_NodeIconsByState {
   'network_Error' = 'vsphere-icon-network-error',
   'network_Warning' = 'vsphere-icon-network-warning',
   'network_connected' = 'vsphere-icon-network',
+
+  'network-error' = 'vsphere-icon-network-error',
+  'network' = 'vsphere-icon-network',
+  'network-warning' = 'vsphere-icon-network-warning',
+
+  'folder_Normal' = 'vsphere-icon-folder',
+  'folder_Error' = 'vsphere-icon-folder-error',
+  'folder_Warning' = 'vsphere-icon-folder-warning',
+  'folder_connected' = 'vsphere-icon-folder',
+
+  'file_Normal' = 'vsphere-icon-file',
+  'file_Error' = 'vsphere-icon-file-error',
+  'file_Warning' = 'vsphere-icon-file-warning',
+  'file_connected' = 'vsphere-icon-file',
 }
 
 export enum UI_E_State {

package/lib/models/types.ts

@@ -1,60 +1,59 @@
-export type UI_T_Project = 'sphere' | 'procurator'
-
-export type UI_T_Lang = 'ru' | 'en' | 'be' | 'hy' | 'kk' | 'zh'
-
-export type UI_T_NavNodes =
-  | 'h'
-  // для прокуратор
-  | 'v'
-  | 's'
-  | 'n'
-  | 'b'
-
-export type UI_T_Binary = 'KB' | 'MB' | 'GB' | 'TB' | 'PB' | 'EB' | 'ZB' | 'YB'
-export type UI_T_BinaryLower =
-  | 'kb'
-  | 'mb'
-  | 'gb'
-  | 'tb'
-  | 'pb'
-  | 'eb'
-  | 'zb'
-  | 'yb'
-
-export type UI_T_LangValue =
-  | 'en_US'
-  | 'ru_RU'
-  | 'hy_AM'
-  | 'zh_CHS'
-  | 'kk_KZ'
-  | 'be_BY'
-  | 'BROWSER'
-
-export type UI_T_LanguageKey =
-  | 'common'
-  | 'auth'
-  | 'home'
-  | 'tasks'
-  | 'layout'
-  | 'mainNavigation'
-  | 'administration'
-  | 'inventoryConfigure'
-  | 'vmOverrides'
-  | 'datastoreWizard'
-  | 'inventorySummary'
-  | 'contextMenu'
-  | 'networks'
-  | 'inventory'
-  | 'inventoryMonitor'
-  | 'inventoryTabs'
-  | 'bottomPanel'
-
-export type UI_T_ProcuratorTypeNodes =
-  | 'host'
-  | 'vm'
-  | 'datastore'
-  | 'network'
-  | 'folder'
-  | 'file'
-
-export type UI_T_SphereTypeNodes = UI_T_ProcuratorTypeNodes // TODO добавить осталиные типи те что исползуется в сфере
+export type UI_T_Project = 'sphere' | 'procurator'
+
+export type UI_T_Lang = 'ru' | 'en' | 'be' | 'hy' | 'kk' | 'zh'
+
+export type UI_T_NavNodes =
+  // для Сферы
+  | 'h'
+  // для Прокуратора и Сферы
+  | 'v'
+  | 's'
+  | 'n'
+  | 'b'
+
+export type UI_T_Binary = 'KB' | 'MB' | 'GB' | 'TB' | 'PB' | 'EB' | 'ZB' | 'YB'
+export type UI_T_BinaryLower =
+  | 'kb'
+  | 'mb'
+  | 'gb'
+  | 'tb'
+  | 'pb'
+  | 'eb'
+  | 'zb'
+  | 'yb'
+
+export type UI_T_LangValue =
+  | 'en_US'
+  | 'ru_RU'
+  | 'hy_AM'
+  | 'zh_CHS'
+  | 'kk_KZ'
+  | 'be_BY'
+  | 'BROWSER'
+
+export type UI_T_ProcuratorTypeNodes =
+  | 'host'
+  | 'vm'
+  | 'datastore'
+  | 'network'
+  | 'folder'
+  | 'file'
+
+export type UI_T_SphereTypeNodes =
+  | UI_T_ProcuratorTypeNodes
+  | 'zone'
+  | 'datacenter'
+  | 'cluster'
+  | 'zone_dir'
+  | 'dc_hc_dir'
+  | 'dc_net_dir'
+  | 'dc_ds_dir'
+  | 'dc_vmt_dir'
+  | 'dc_backup_dir'
+  | 'IdentityProviders'
+  | 'networks' // может быть это не нужный тип так как есть 'network' в UI_T_ProcuratorTypeNodes
+  | 'backup_storage'
+  | 'bucket'
+  | 'vmtemplate' // TODO думаю нужно добавить в UI_T_ProcuratorTypeNodes
+
+export type UI_T_AllTypeNodes = UI_T_SphereTypeNodes

package/lib/utils/localizationMapper.ts

@@ -1,12 +1,11 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_LanguageKey } from '~/lib/models/types'
 
 const replaceProductNameRecursion = (
   localization: UI_I_Localization,
   productName: any
 ): UI_I_Localization => {
   for (const key of Object.keys(localization)) {
-    let item = localization[key as UI_T_LanguageKey]
+    let item = localization[key as keyof typeof localization]
 
     for (const key2 of Object.keys(item)) {
       item[key2] = item[key2].replaceAll('{productName}', productName)

package/package.json

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

package/plugins/console.ts

@@ -1,21 +1,21 @@
-import { defineNuxtPlugin } from '#app'
-import type { UI_T_CODEC } from '~/components/common/spiceConsole/lib/models/types'
-
-export default defineNuxtPlugin(() => {
-  const console = function (): any {
-    const self: any = {
-      codec: ref<UI_T_CODEC>(1),
-    }
-
-    self.changeCodec = (codec: UI_T_CODEC): void => {
-      self.codec.value = codec
-    }
-    return self
-  }.call({})
-
-  return {
-    provide: {
-      console,
-    },
-  }
-})
+import { defineNuxtPlugin } from '#app'
+import type { UI_T_CODEC } from '~/components/common/spiceConsole/lib/models/types'
+
+export default defineNuxtPlugin(() => {
+  const console = function (): any {
+    const self: any = {
+      codec: ref<UI_T_CODEC>(1),
+    }
+
+    self.changeCodec = (codec: UI_T_CODEC): void => {
+      self.codec.value = codec
+    }
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      console,
+    },
+  }
+})

package/plugins/mouse.ts

@@ -1,21 +1,21 @@
-import { defineNuxtPlugin } from '#app'
-import type { UI_T_MouseMode } from '~/components/common/spiceConsole/lib/models/types'
-
-export default defineNuxtPlugin(() => {
-  const mouse = function (): any {
-    const self: any = {
-      mode: ref<UI_T_MouseMode>(1),
-    }
-
-    self.changeMode = (mode: UI_T_MouseMode): void => {
-      self.mode.value = mode
-    }
-    return self
-  }.call({})
-
-  return {
-    provide: {
-      mouse,
-    },
-  }
-})
+import { defineNuxtPlugin } from '#app'
+import type { UI_T_MouseMode } from '~/components/common/spiceConsole/lib/models/types'
+
+export default defineNuxtPlugin(() => {
+  const mouse = function (): any {
+    const self: any = {
+      mode: ref<UI_T_MouseMode>(1),
+    }
+
+    self.changeMode = (mode: UI_T_MouseMode): void => {
+      self.mode.value = mode
+    }
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      mouse,
+    },
+  }
+})