bfg-common 1.5.760 → 1.5.762

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/components/common/wizards/network/add/steps/portProperties/PortProperties.vue

@@ -86,45 +86,30 @@ const fields = ref<UI_I_PortProperties>({
   },
 })
 
-const setEnabledServiceDefault = (
-  tcp: UI_T_TCP,
-  currentFields: UI_I_PortProperties
-): void => {
-  tcp === 'default' &&
-    (fields.value = {
-      ...currentFields,
-      services: servicesInitial,
-    })
-}
-
-const setEnabledServiceProvisioning = (
+const setEnabledService = (
   tcp: UI_T_TCP,
   currentFields: UI_I_PortProperties,
   newFields?: UI_I_PortProperties
 ): void => {
-  tcp === 'provisioning' &&
-    (fields.value = {
+  if (tcp === 'default') {
+    fields.value = {
+      ...currentFields,
+      services: useDeepCopy(servicesInitial),
+    }
+  } else if (servicesInitial.hasOwnProperty(tcp)) {
+    fields.value = {
       ...(newFields || currentFields),
       services: {
-        ...servicesInitial,
-        provisioning: true,
+        ...useDeepCopy(servicesInitial),
+        [tcp]: true,
       },
-    })
-}
-
-const setEnabledServiceVMotion = (
-  tcp: UI_T_TCP,
-  currentFields: UI_I_PortProperties,
-  newFields?: UI_I_PortProperties
-): void => {
-  tcp === '' &&
-    (fields.value = {
+    }
+  } else {
+    fields.value = {
       ...(newFields || currentFields),
-      services: {
-        ...servicesInitial,
-        vMotion: true,
-      },
-    })
+      services: useDeepCopy(servicesInitial),
+    }
+  }
 }
 
 let oldFields = useDeepCopy(fields.value)
@@ -134,9 +119,7 @@ watch(
   (newFields: UI_I_PortProperties) => {
     if (newFields.tcp && newFields.tcp !== oldFields.tcp) {
       emits('change-gateway-flag', false)
-      setEnabledServiceDefault(newFields.tcp, fields.value)
-      setEnabledServiceProvisioning(newFields.tcp, fields.value, newFields)
-      setEnabledServiceVMotion(newFields.tcp, fields.value, newFields)
+      setEnabledService(newFields.tcp, fields.value, newFields)
     }
 
     oldFields.networkLabel !== newFields.networkLabel &&
@@ -184,9 +167,7 @@ watch(
   () => fields.value.tcp,
   (newTcp: UI_T_TCP, oldTcp: UI_T_TCP) => {
     if (newTcp !== oldTcp) {
-      setEnabledServiceDefault(newTcp, fields.value)
-      setEnabledServiceProvisioning(newTcp, fields.value)
-      setEnabledServiceVMotion(newTcp, fields.value)
+      setEnabledService(newTcp, fields.value)
     }
     emits('change-port-properties', fields.value)
   }
@@ -196,7 +177,10 @@ watch(
   () => props.tcpStacks,
   (newValue: UI_I_TCPStack[]) => {
     if (fields.value.tcp === '') {
-      fields.value.tcp = newValue?.[0]?.id || ''
+      fields.value.tcp =
+        newValue?.find?.((item) => item.id === 'default')?.id ||
+        newValue?.[0]?.id ||
+        ''
     }
   },
   { deep: true, immediate: true }

package/components/common/wizards/network/add/steps/portProperties/PortPropertiesOld.vue

@@ -146,7 +146,7 @@
                 <select id="tsp" v-model="fields.tcp" data-id="tsp-select">
                   <template v-for="tcp in props.tcpStacks" :key="tcp.id">
                     <option :value="tcp.id">
-                      {{ localization.common[tcp.id] }}
+                      {{ localization.common[tcp.id] || tcp.id }}
                     </option>
                   </template>
                   <!--                  <option value="1">{{ localization.common.provisioning }}</option>-->

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

@@ -1,24 +1,24 @@
-import type { UI_I_Browse } from '~/lib/models/composables/useBrowse/interfaces'
-
-export const useBrowse = (): UI_I_Browse => {
-  const browseInfo: UI_I_Browse = {
-    version: '',
-    type: '',
-  }
-  const userAgent = navigator.userAgent
-  if (userAgent.match(/edg/i)) {
-    browseInfo.version = userAgent.match(/Edg\/(\d+)/)?.[1] || ''
-    browseInfo.type = 'edg'
-  } else if (userAgent.match(/firefox|fxios/i)) {
-    browseInfo.version = userAgent.match(/Firefox\/(\d+)/)?.[1] || ''
-    browseInfo.type = 'firefox'
-  } else if (userAgent.match(/chrome|chromium|crios/i)) {
-    browseInfo.version = userAgent.match(/Chrome\/(\d+)/)?.[1] || ''
-    browseInfo.type = 'chrome'
-  } else if (userAgent.match(/safari/i)) {
-    browseInfo.version = userAgent.match(/Safari\/(\d+)/)?.[1] || ''
-    browseInfo.type = 'safari'
-  }
-
-  return browseInfo
-}
+import type { UI_I_Browse } from '~/lib/models/composables/useBrowse/interfaces'
+
+export const useBrowse = (): UI_I_Browse => {
+  const browseInfo: UI_I_Browse = {
+    version: '',
+    type: '',
+  }
+  const userAgent = navigator.userAgent
+  if (userAgent.match(/edg/i)) {
+    browseInfo.version = userAgent.match(/Edg\/(\d+)/)?.[1] || ''
+    browseInfo.type = 'edg'
+  } else if (userAgent.match(/firefox|fxios/i)) {
+    browseInfo.version = userAgent.match(/Firefox\/(\d+)/)?.[1] || ''
+    browseInfo.type = 'firefox'
+  } else if (userAgent.match(/chrome|chromium|crios/i)) {
+    browseInfo.version = userAgent.match(/Chrome\/(\d+)/)?.[1] || ''
+    browseInfo.type = 'chrome'
+  } else if (userAgent.match(/safari/i)) {
+    browseInfo.version = userAgent.match(/Safari\/(\d+)/)?.[1] || ''
+    browseInfo.type = 'safari'
+  }
+
+  return browseInfo
+}

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

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