bfg-common 1.5.786 → 1.5.788

package/components/common/wizards/common/steps/name/Name.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script setup lang="ts">
-import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+// import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import { validateObjectName } from '~/lib/utils/validation'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
@@ -121,42 +121,57 @@ const submit = async (cb: Function): Promise<void> => {
 }
 // TODO use for import vms
 const checkNameIsValid = async (nameLocal: string): Promise<boolean> => {
-  const nameRequestUrlLocal: string = props.nameRequestUrl.replace('{name}', nameLocal)
-
-
-  const { statusCode } = await validateObjectName({ url: nameRequestUrlLocal })
-
-  console.log(statusCode, 11)
+  const nameRequestUrlLocal: string = props.nameRequestUrl.replace(
+    '{name}',
+    nameLocal
+  )
 
-  const { error } = await useMyFetch<null, API_UI_I_Error>(
-    nameRequestUrlLocal,
-    {
-      method: 'GET',
-    }
+  const customMessages = {
+    400: localization.value.common.emptyNameValidationDescription,
+    405: localization.value.common.kindValidationDescription,
+    406: localization.value.common.nameValidationDescription,
+    409: props.nameExistValidationDescription,
+  }
+  const { isValid, statusCode, error } = await validateObjectName(
+    { url: nameRequestUrlLocal },
+    customMessages
   )
-  const status = error.value?.statusCode || 200
-  switch (status) {
-    case 400: // Empty name
-      showValidationErrors([
-        localization.value.common.emptyNameValidationDescription,
-      ])
-      return false
-    case 405: // Invalid kind
-      showValidationErrors([
-        localization.value.common.kindValidationDescription,
-      ])
-      return false
-    case 406: // Invalid name
-      showValidationErrors([
-        localization.value.common.nameValidationDescription,
-      ])
-      return false
-    case 409: // Name exist
-      showValidationErrors([props.nameExistValidationDescription])
-      return false
+
+  if (!isValid) {
+    showValidationErrors([error])
+    return isValid
   }
 
-  return true
+  return isValid
+
+  // const { error } = await useMyFetch<null, API_UI_I_Error>(
+  //   nameRequestUrlLocal,
+  //   {
+  //     method: 'GET',
+  //   }
+  // )
+  // const status = error.value?.statusCode || 200
+  // switch (statusCode) {
+  //   case 400: // Empty name
+  //     showValidationErrors([
+  //       localization.value.common.emptyNameValidationDescription,
+  //     ])
+  //     return false
+  //   case 405: // Invalid kind
+  //     showValidationErrors([
+  //       localization.value.common.kindValidationDescription,
+  //     ])
+  //     return false
+  //   case 406: // Invalid name
+  //     showValidationErrors([
+  //       localization.value.common.nameValidationDescription,
+  //     ])
+  //     return false
+  //   case 409: // Name exist
+  //     showValidationErrors([props.nameExistValidationDescription])
+  //     return false
+  // }
+  // return true
 }
 
 const errors = ref<string[]>([])

package/lib/utils/validation.ts

@@ -7,8 +7,9 @@ import type { UI_T_Project } from '~/lib/models/types'
 import { UI_E_ObjectNodeKind } from '~/lib/models/enums'
 
 export const validateObjectName = async (
-  args: UI_I_ValidateNameByParams | UI_I_ValidateNameByUrl
-): Promise<{ statusCode: number; error: string }> => {
+  args: UI_I_ValidateNameByParams | UI_I_ValidateNameByUrl,
+  customMessages?: Partial<Record<number, string>>
+): Promise<{ statusCode: number; error: string; isValid: boolean }> => {
   const url =
     'url' in args
       ? args.url
@@ -18,7 +19,6 @@ export const validateObjectName = async (
           args.kind,
           args.datacenterId
         )
-  console.log(url, 'checkName URL')
 
   const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
     method: 'GET',
@@ -28,12 +28,18 @@ export const validateObjectName = async (
     return {
       statusCode: 200,
       error: '',
+      isValid: true,
     }
   }
 
+  const status = error.value?.statusCode ?? 500
   return {
-    statusCode: error.value?.statusCode ?? 500,
-    error: error.value.data?.error_message || error.value.data,
+    statusCode: status,
+    error:
+      customMessages?.[status] ?? // сообщение снаружи
+      error.value.data?.error_message ??
+      error.value.data, // сообщение backend
+    isValid: false,
   }
 }
 
@@ -53,6 +59,7 @@ const buildValidationUrl = (
   params.set('kind', String(kind))
   if (datacenterId) params.set('datacenter', datacenterId)
 
+  // Если указан datacenterId — имя проверяется только в рамках этого датацентра.
   const endpoint = datacenterId ? 'validate_name_datacenter' : 'validate_name'
   return `/ui/object/${endpoint}?${params.toString()}`
 }

package/package.json

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