bfg-common 1.5.502 → 1.5.503

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

@@ -1,93 +1,93 @@
-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)
-
-  try {
-    const url = buildValidationUrl(name, project, datacenterId)
-
-    const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
-      method: 'GET',
-    })
-
-    if (error?.value?.data?.error_code !== 0) {
-      const existError =
-        error.value.data?.error_message ?? String(error.value.data)
-      sendMessage(existError)
-      return
-    }
-
-    sendMessage('')
-  } catch (e) {
-    const msg = e instanceof Error ? e.message : 'Unknown error'
-    sendMessage(msg)
-  } finally {
-    wizard.setLoader(false)
-  }
-}
-
-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?${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)
+
+  try {
+    const url = buildValidationUrl(name, project, datacenterId)
+
+    const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
+      method: 'GET',
+    })
+
+    if (error?.value?.data?.error_code !== 0) {
+      const existError =
+        error.value.data?.error_message ?? String(error.value.data)
+      sendMessage(existError)
+      return
+    }
+
+    sendMessage('')
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : 'Unknown error'
+    sendMessage(msg)
+  } finally {
+    wizard.setLoader(false)
+  }
+}
+
+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?${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/components/common/wizards/vm/migrate/select/network/Network.vue

@@ -1,103 +1,103 @@
-<template>
-  <div class="select-network">
-    <div class="select-network__text">
-      {{ selectNetworkHeadline }}
-    </div>
-
-    <common-wizards-vm-migrate-select-network-table-network
-      v-model="model"
-      :networks="dataNetwork"
-      :source-networks="sourceNetworks"
-    />
-
-    <common-wizards-vm-common-validation-compatibility
-      :loading="false"
-      status="Success"
-      text="compatibilityChecksSucceeded"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
-
-const model = defineModel<any>({ required: true })
-
-const props = defineProps<{
-  vmInfo: any | null
-  networks: any
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectNetworkHeadline = computed<string>(() => {
-  const { migrateNetworkingForAllAdapters, migrateNetworkingForEachAdapters } =
-    localization.value.common
-
-  return model.value.isBasicNetworkMode
-    ? migrateNetworkingForAllAdapters
-    : migrateNetworkingForEachAdapters
-})
-
-const sourceNetworks = computed<UI_I_NetworkTableItem[]>(() => {
-  return props.networks?.items?.map((network) => {
-    return {
-      id: network.id,
-      name: network.name,
-      net_bridge: '',
-    }
-  })
-})
-
-const dataNetwork = computed(() => {
-  return (
-    props.vmInfo?.network_devices?.map((network) => {
-      const destinationNetwork =
-        sourceNetworks.value?.map((src) => {
-          return { text: src.name, value: src.name }
-        }) || []
-      return {
-        mac: network.mac,
-        network_adapter: network.model,
-        source_network: network.network,
-        value: destinationNetwork[0]?.value || '',
-        destination_network: [
-          ...destinationNetwork,
-          { text: `${localization.value.common.browse}...`, value: 'browser' },
-        ],
-      }
-    }) || []
-  )
-})
-watch(
-  dataNetwork,
-  (newValue) => {
-    model.value = {}
-    const newModel = {}
-    newValue.forEach((item: any) => {
-      newModel[item.mac] = item.value
-    })
-    model.value = newModel
-  },
-  { deep: true }
-)
-</script>
-
-<style lang="scss" scoped>
-@import 'assets/scss/common/mixins';
-.select-network {
-  @include flex($dir: column);
-  height: inherit;
-  margin-top: 10px;
-  &__text {
-    font-size: 12px;
-  }
-  &__matcher-details {
-    margin-top: 10px;
-  }
-  .vm-migrate-advanced-view-button {
-    text-align: end;
-  }
-}
-</style>
+<template>
+  <div class="select-network">
+    <div class="select-network__text">
+      {{ selectNetworkHeadline }}
+    </div>
+
+    <common-wizards-vm-migrate-select-network-table-network
+      v-model="model"
+      :networks="dataNetwork"
+      :source-networks="sourceNetworks"
+    />
+
+    <common-wizards-vm-common-validation-compatibility
+      :loading="false"
+      status="Success"
+      text="compatibilityChecksSucceeded"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
+
+const model = defineModel<any>({ required: true })
+
+const props = defineProps<{
+  vmInfo: any | null
+  networks: any
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectNetworkHeadline = computed<string>(() => {
+  const { migrateNetworkingForAllAdapters, migrateNetworkingForEachAdapters } =
+    localization.value.common
+
+  return model.value.isBasicNetworkMode
+    ? migrateNetworkingForAllAdapters
+    : migrateNetworkingForEachAdapters
+})
+
+const sourceNetworks = computed<UI_I_NetworkTableItem[]>(() => {
+  return props.networks?.items?.map((network) => {
+    return {
+      id: network.id,
+      name: network.name,
+      net_bridge: '',
+    }
+  })
+})
+
+const dataNetwork = computed(() => {
+  return (
+    props.vmInfo?.network_devices?.map((network) => {
+      const destinationNetwork =
+        sourceNetworks.value?.map((src) => {
+          return { text: src.name, value: src.name }
+        }) || []
+      return {
+        mac: network.mac,
+        network_adapter: network.model,
+        source_network: network.network,
+        value: destinationNetwork[0]?.value || '',
+        destination_network: [
+          ...destinationNetwork,
+          { text: `${localization.value.common.browse}...`, value: 'browser' },
+        ],
+      }
+    }) || []
+  )
+})
+watch(
+  dataNetwork,
+  (newValue) => {
+    model.value = {}
+    const newModel = {}
+    newValue.forEach((item: any) => {
+      newModel[item.mac] = item.value
+    })
+    model.value = newModel
+  },
+  { deep: true }
+)
+</script>
+
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins';
+.select-network {
+  @include flex($dir: column);
+  height: inherit;
+  margin-top: 10px;
+  &__text {
+    font-size: 12px;
+  }
+  &__matcher-details {
+    margin-top: 10px;
+  }
+  .vm-migrate-advanced-view-button {
+    text-align: end;
+  }
+}
+</style>

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.502",
+  "version": "1.5.503",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -30,7 +30,7 @@
     "xterm-addon-web-links": "^0.8.0",
     "eslint-plugin-myrules": "file:./eslint",
     "bfg-nuxt-3-graph": "1.0.26",
-    "bfg-uikit": "1.0.521"
+    "bfg-uikit": "1.0.518"
   },
   "dependencies": {
     "@nuxtjs/eslint-config-typescript": "^12.0.0",