bfg-common 1.5.784 → 1.5.786

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

@@ -27,6 +27,7 @@
 <script setup lang="ts">
 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'
 import type { UI_I_NameTestIds } from '~/components/common/wizards/common/steps/name/lib/models/interfaces'
 
@@ -107,9 +108,7 @@ const submit = async (cb: Function): Promise<void> => {
       (location.value &&
         !props.allowedLocationKinds.includes(location.value.kind))
     ) {
-      showValidationErrors([
-        props.validationDescription,
-      ])
+      showValidationErrors([props.validationDescription])
       cb(false)
       isDisabledField.value = false
       return
@@ -122,7 +121,13 @@ const submit = async (cb: Function): Promise<void> => {
 }
 // TODO use for import vms
 const checkNameIsValid = async (nameLocal: string): Promise<boolean> => {
-  const nameRequestUrlLocal = props.nameRequestUrl.replace('{name}', nameLocal)
+  const nameRequestUrlLocal: string = props.nameRequestUrl.replace('{name}', nameLocal)
+
+
+  const { statusCode } = await validateObjectName({ url: nameRequestUrlLocal })
+
+  console.log(statusCode, 11)
+
   const { error } = await useMyFetch<null, API_UI_I_Error>(
     nameRequestUrlLocal,
     {
@@ -147,9 +152,7 @@ const checkNameIsValid = async (nameLocal: string): Promise<boolean> => {
       ])
       return false
     case 409: // Name exist
-      showValidationErrors([
-        props.nameExistValidationDescription,
-      ])
+      showValidationErrors([props.nameExistValidationDescription])
       return false
   }
 

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

@@ -1,7 +1,8 @@
 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 { 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'
+import { UI_E_ObjectNodeKind } from '~/lib/models/enums'
+import { validateObjectName } from '~/lib/utils/validation'
 
 export const checkValidityName = async ({
   name,
@@ -17,39 +18,47 @@ export const checkValidityName = async ({
   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',
+  const { error } = await validateObjectName({
+    name,
+    project,
+    kind: UI_E_ObjectNodeKind.DATASTORE,
+    datacenterId,
   })
 
+  // const url = buildValidationUrl(name, project, datacenterId)
+  // const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
+  //   method: 'GET',
+  // })
+
   wizard.setLoader(false)
+  sendMessage(error)
 
-  if (error.value && error.value.data.error_code !== 0) {
-    const existError = error.value.data?.error_message || error.value.data
-    sendMessage(existError)
-    return
-  }
-  sendMessage('')
+  // 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()}`
-}
+// 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_ObjectNodeKind.DATASTORE))
+//   if (datacenterId) params.set('datacenter', datacenterId)
+//
+//   return `/ui/object/validate_name_datacenter?${params.toString()}`
+// }
 
 export const validateNameAndGenerateDataId = (
   name: string,

package/lib/models/interfaces.ts

@@ -1,6 +1,7 @@
 import type { UI_I_ModalPayloadSchedulerData } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
 import type { UI_T_NotificationStatus } from '~/components/atoms/alert/lib/models/types'
-import { UI_E_State } from '~/lib/models/enums'
+import type { UI_T_Project } from '~/lib/models/types'
+import { UI_E_ObjectNodeKind, UI_E_State } from '~/lib/models/enums'
 
 export interface UI_I_ItemView {
   value: number | string
@@ -96,3 +97,14 @@ export interface UI_I_ModalPayload<T = any> {
   isShow: boolean
   scheduler: UI_I_ModalPayloadSchedulerData<T>
 }
+
+export interface UI_I_ValidateNameByParams {
+  name: string
+  project: UI_T_Project
+  kind?: UI_E_ObjectNodeKind
+  datacenterId?: string
+}
+
+export interface UI_I_ValidateNameByUrl {
+  url: string
+}

package/lib/utils/validation.ts

@@ -1,40 +1,23 @@
 import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+import type {
+  UI_I_ValidateNameByParams,
+  UI_I_ValidateNameByUrl,
+} from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import { UI_E_ObjectNodeKind } from '~/lib/models/enums'
 
-// const onChangeName = async (name: string): Promise<void> => {
-//
-//
-//   isLoading.value = true
-//   const { statusCode } = await checkName(name, 'sphere', UI_E_ObjectNodeKind.DATASTORE)
-//   isLoading.value = false
-//
-//   /* TODO: сделать глобально */
-//   switch (statusCode) {
-//     case 200: // OK
-//       alertErrorText.value = null
-//       break
-//     case 405: // Invalid kind
-//       break
-//     case 406: // Invalid name
-//       break
-//     case 409: // Name exist
-//       alertErrorText.value =
-//         localization.value.common.datastoreExistsTheSelectedLocation
-//       break
-//   }
-//
-//   if (alertErrorText.value) return
-//   onHide()
-// }
-
-const checkName = async (
-  name: string,
-  project: UI_T_Project,
-  kind?: UI_E_ObjectNodeKind,
-  datacenterId?: string
-): Promise<{ statusCode: number; error?: string }> => {
-  const url = buildValidationUrl(name, project, kind, datacenterId)
+export const validateObjectName = async (
+  args: UI_I_ValidateNameByParams | UI_I_ValidateNameByUrl
+): Promise<{ statusCode: number; error: string }> => {
+  const url =
+    'url' in args
+      ? args.url
+      : buildValidationUrl(
+          args.name,
+          args.project,
+          args.kind,
+          args.datacenterId
+        )
   console.log(url, 'checkName URL')
 
   const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
@@ -44,6 +27,7 @@ const checkName = async (
   if (!error.value) {
     return {
       statusCode: 200,
+      error: '',
     }
   }
 

package/package.json

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