bfg-common 1.3.426 → 1.3.428

package/components/common/wizards/datastoreNew/add/Add.vue

@@ -29,7 +29,6 @@
           :alert-messages="alertMessages[1]"
           :messages-fields="selectedStep.fields"
           @hide-alert="onHideAlert"
-          @loading="(e) => (loading = e)"
         />
 
         <common-wizards-datastore-new-add-shared-storm
@@ -72,6 +71,7 @@
 import type {
   UI_I_WizardStep,
   UI_I_ValidationReturn,
+  UI_I_AsyncCheckReturn,
 } from '~/components/atoms/wizard/lib/models/interfaces'
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {
@@ -94,6 +94,7 @@ import {
 } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 // import { stepItemsFunc } from '~/components/common/wizards/datastore/add/lib/config/stepItems'
 import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/readyComplete/lib/config/propertiesDetails'
+import { checkValidityName } from '~/components/common/wizards/datastoreNew/add/lib/utils'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -159,18 +160,45 @@ const datastoreForm = ref<UI_I_CreateDatastoreForm>({
   },
 })
 
-const checkIpFourSettingsSync = (
+const checkNetwork = async (
+  label: string,
+  localization: UI_I_Localization
+  // emits: UI_I_AddNetworkingEmits
+): Promise<UI_I_AsyncCheckReturn> => {
+  if (label) {
+    return new Promise((resolve, _reject) =>
+      checkValidityName(label, (message: string) => {
+        resolve({
+          isValid: message === '',
+          message: message === '' ? '' : message,
+        })
+      })
+    )
+  } else {
+    return {
+      isValid: false,
+      message: localization.specifyDatastoreName,
+    }
+  }
+}
+
+const checkNameAsync = async (
   localization: UI_I_Localization,
-  data: string,
-  wizard: Wizard,
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
+  value: UI_I_WizardStep[],
+  label: string,
+  wizard: Wizard
+): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
-  if (!data) {
+  const labelValidation: {
+    isValid: boolean
+    message: string
+  } = await checkNetwork(label, localization)
+
+  if (!labelValidation.isValid) {
     stepHasError = wizard.setValidation(1, 'datastoreName', {
-      fieldMessage: localization.specifyDatastoreName,
-      alertMessage: '',
+      fieldMessage: labelValidation.message,
+      alertMessage: label ? labelValidation.message : '',
     })
   } else if (wizard.hasMessage(1, 'datastoreName')) {
     value = wizard.removeValidation(1, 'datastoreName', value)
@@ -182,68 +210,6 @@ const checkIpFourSettingsSync = (
   }
 }
 
-// const checkNetwork = async (
-//     label: string,
-//     localization: UI_I_Localization,
-//     emits: UI_I_AddNetworkingEmits
-// ): Promise<UI_I_AsyncCheckReturn> => {
-//   if (label) {
-//     return new Promise((resolve, _reject) =>
-//         emits('check-network-label', label, (message: string) => {
-//           if (message === '') {
-//             resolve({
-//               isValid: true,
-//               message: '',
-//             })
-//           }
-//
-//           if (message !== '') {
-//             resolve({
-//               isValid: false,
-//               message,
-//             })
-//           }
-//         })
-//     )
-//   } else {
-//     return {
-//       isValid: false,
-//       message: localization.networkLabelInvalidMessage,
-//     }
-//   }
-// }
-
-// export const checkNetworkAsync = async (
-//     value: UI_I_WizardStep[],
-//     label: string,
-//     stepId: number,
-//     fieldName: string,
-//     emits: UI_I_AddNetworkingEmits,
-//     localization: UI_I_Localization,
-//     wizard: Wizard
-// ): Promise<UI_I_ValidationReturn> => {
-//   let stepHasError = false
-//
-//   const labelValidation: {
-//     isValid: boolean
-//     message: string
-//   } = await checkNetwork(label, localization, emits)
-//
-//   if (!labelValidation.isValid) {
-//     stepHasError = wizard.setValidation(stepId, fieldName, {
-//       fieldMessage: labelValidation.message,
-//       alertMessage: labelValidation.message,
-//     })
-//   } else if (wizard.hasMessage(stepId, fieldName)) {
-//     value = wizard.removeValidation(stepId, fieldName, value)
-//   }
-//
-//   return {
-//     newValue: value,
-//     stepHasError,
-//   }
-// }
-
 const validationFunc = async (
   value: UI_I_WizardStep[],
   currentStep: UI_I_WizardStep,
@@ -252,11 +218,11 @@ const validationFunc = async (
   let stepHasError = false
 
   if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
-    const nameValidation = checkIpFourSettingsSync(
+    const nameValidation = await checkNameAsync(
       localization.value,
+      value,
       form.value.name,
-      wizard,
-      value
+      wizard
     )
 
     value = nameValidation.newValue

package/components/common/wizards/datastoreNew/add/lib/models/types.ts

@@ -8,7 +8,7 @@ export type UI_T_KerberosAuthentication =
 
 export type UI_T_WizardDatastoreMode = 'procurator' | 'sphere'
 
-export interface UI_I_DatastoreValidityName {
-  valid: boolean
-  msg: any
-}
+// export interface UI_I_DatastoreValidityName {
+//   valid: boolean
+//   msg: any
+// }

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

@@ -1,8 +1,8 @@
 import { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import {
-  UI_I_DatastoreValidityName,
+  // UI_I_DatastoreValidityName,
   UI_T_WizardDatastoreMode,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
+} from '~/components/common/wizards/datastoreNew/add/lib/models/types'
 // import {
 //   UI_I_CreateDatastoreBodyRequest,
 //   I_CreateStorageUuid,
@@ -19,8 +19,9 @@ import {
 
 export const checkValidityName = async (
   name: string,
+  sendMessage: (message: string) => void,
   mode: UI_T_WizardDatastoreMode = 'procurator'
-): Promise<UI_I_DatastoreValidityName> => {
+): Promise<void> => {
   // TODO move to projects!!!
 
   const kind = 10 // TODO move in global space
@@ -35,11 +36,12 @@ export const checkValidityName = async (
 
   if (error.value && error.value.data.error_code !== 0) {
     const existError = error.value.data?.error_message || error.value.data
-
-    return { valid: false, msg: existError }
+    sendMessage(existError)
+    return
+    // return { valid: false, msg: existError }
   }
-
-  return { valid: true, msg: null }
+  sendMessage('')
+  // return { valid: true, msg: null }
 }
 
 // export const getStoragePoolName = async <T>(

package/components/common/wizards/datastoreNew/add/local/Local.vue

@@ -2,10 +2,10 @@
   <div class="local-step">
     <common-wizards-datastore-new-add-local-create-name
       v-if="isShowCreateLocalNameBlock"
+      v-model="model.name"
       :alert-messages="props.alertMessages"
       :messages-fields="props.messagesFields"
       @hide-alert="(e) => emits('hide-alert', e)"
-      @loading="(e) => emits('loading', e)"
     />
   </div>
 </template>
@@ -25,9 +25,7 @@ const props = defineProps<{
 }>()
 const model = defineModel<any>()
 const emits = defineEmits<{
-  (event: 'loading', value: boolean): void
   (event: 'hide-alert', value: number): void
-  (event: 'main-filter', value: string): void
 }>()
 
 const isShowCreateLocalNameBlock = computed<boolean>(

package/components/common/wizards/datastoreNew/add/local/createName/CreateName.vue

@@ -9,20 +9,20 @@
     />
 
     <div class="clr-form-control clr-row">
-      <label for="datastore-name" class="clr-control-label clr-col-md-2">{{
-        localization.datastoreName
-      }}</label>
+      <label for="datastore-name" class="clr-control-label clr-col-md-2">
+        {{ localization.datastoreName }}
+      </label>
 
       <div class="clr-control-container" :class="nameErrorText && 'clr-error'">
         <div class="flex-align-center">
           <input
             id="datastore-name"
-            v-model.trim="form.name.value"
+            v-model.trim="createDatastoreNameLocal"
             data-id="datastore-name-input"
             type="text"
             class="clr-input"
-            @blur="onBlurInputName"
-            @input="onInputName"
+            @blur="initValidation(true)"
+            @input="initValidation"
           />
           <atoms-the-icon class="error-icon" name="info-circle" />
         </div>
@@ -36,24 +36,22 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
 import type {
   UI_I_Localization,
   UI_I_ArbitraryObject,
 } from '~/lib/models/interfaces'
-import type { UI_I_FormValidationDataStore } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import type { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
-import { defaultFormFunc } from '~/components/common/wizards/datastore/add/local/createName/lib/config/defaultForm'
-// import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
+import type { UI_I_FormValidationDataStore } from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import { defaultFormFunc } from '~/components/common/wizards/datastoreNew/add/local/createName/lib/config/defaultForm'
 
 const props = defineProps<{
   alertMessages: string[]
   messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
 }>()
+const createDatastoreNameLocal = defineModel<string>()
 const emits = defineEmits<{
   (event: 'hide-alert', value: number): void
-  (event: 'loading', value: boolean): void
-  (event: 'submit', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -75,40 +73,18 @@ const validForm = ref<UI_I_ValidationTouchResult | null>(null)
 
 /* Validation for Name input */
 const isInitNameValidation = ref<boolean>(false)
-const onBlurInputName = (): void => {
-  validForm.value = validation.touch()
-  isInitNameValidation.value = true
-}
-const onInputName = () => {
+const initValidation = (onlyBlur = false): void => {
   validForm.value = validation.touch()
+  onlyBlur && (isInitNameValidation.value = true)
 }
 const nameErrorText = computed<string>(() => {
+  if (props.messagesFields.datastoreName.field) {
+    return props.messagesFields.datastoreName.field
+  }
+
   if (!isInitNameValidation.value) return ''
   return validForm.value?.errors?.name?.[0] || ''
 })
-/* Validation Name input end */
-// const submit = async (): Promise<void> => {
-//   const name = form.value.name.value
-//
-//   if (!name) {
-//     validForm.value = validation.touch()
-//     isInitNameValidation.value = true
-//     if (nameErrorText.value) return
-//   }
-//
-//   if (name) {
-//     emits('loading', true)
-//
-//     const { valid } = await checkValidityName(name)
-//
-//     emits('loading', false)
-//
-//     if (!valid) {
-//       return
-//     }
-//   }
-//   emits('submit', name)
-// }
 
 const onHideAlert = (): void => {
   emits('hide-alert', 1)

package/package.json

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