bfg-common 1.5.490 → 1.5.492

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

@@ -1,63 +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: string,
-  wizard: Wizard,
-  project: UI_T_Project,
-  sendMessage: (message: string) => void
-): Promise<void> => {
-
-  wizard.setLoader(true)
-  const url =
-    project === 'procurator'
-      ? `/ui/ds/validate?name=${encodeURIComponent(name)}`
-      : `/ui/object/validate_name?name=${encodeURIComponent(name)}&kind=${UI_E_Kind.STORAGE_VALIDATION_NAME}`
-  // @ts-ignore
-  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('')
-}
-
-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/lib/validations.ts

@@ -13,7 +13,8 @@ const checkName = async (
   form: UI_I_CreateDatastoreForm,
   localization: UI_I_Localization,
   wizard: Wizard,
-  project: UI_T_Project
+  project: UI_T_Project,
+  datacenterId?: string
 ): Promise<UI_I_AsyncCheckReturn> => {
   const typeCode = form.type_code
 
@@ -26,11 +27,17 @@ const checkName = async (
   }
   if (form.name && help) {
     return new Promise((resolve, _reject) =>
-      checkValidityName(form.name, wizard, project, (message: string) => {
-        resolve({
-          isValid: message === '',
-          message: message === '' ? '' : message,
-        })
+      checkValidityName({
+        name: form.name,
+        wizard,
+        project,
+        datacenterId,
+        sendMessage: (message: string) => {
+          resolve({
+            isValid: message === '',
+            message: message === '' ? '' : message,
+          })
+        },
       })
     )
   } else {
@@ -47,14 +54,15 @@ export const checkDatastoreNameAsync = async (
   stepId: number,
   fieldName: string,
   wizard: Wizard,
-  project: UI_T_Project
+  project: UI_T_Project,
+  datacenterId?: string
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
   const labelValidation: {
     isValid: boolean
     message: string
-  } = await checkName(form, localization, wizard, project)
+  } = await checkName(form, localization, wizard, project, datacenterId)
 
   if (!labelValidation.isValid) {
     stepHasError = wizard.setValidation(stepId, fieldName, {

package/package.json

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