bfg-common 1.3.421 → 1.3.423

package/assets/localization/local_be.json

@@ -2377,5 +2377,6 @@
   "useUnidirectionalChap": "Выкарыстоўвайце аднанакіраваны CHAP",
   "useBiderectionalChap": "Выкарыстоўвайце двухнакіраваны CHAP",
   "usernameIsRequired": "Патрабуецца імя карыстальніка",
-  "passwordIsRequired": "Патрабуецца пароль"
+  "passwordIsRequired": "Патрабуецца пароль",
+  "source": "Крыніца"
 }

package/assets/localization/local_en.json

@@ -2381,5 +2381,6 @@
   "useUnidirectionalChap": "Use unidirectional CHAP",
   "useBiderectionalChap": "Use biderectional CHAP",
   "usernameIsRequired": "Username is required",
-  "passwordIsRequired": "Password is required"
+  "passwordIsRequired": "Password is required",
+  "source": "Source"
 }

package/assets/localization/local_hy.json

@@ -2381,5 +2381,6 @@
   "useUnidirectionalChap": "Օգտագործեք միակողմանի CHAP",
   "useBiderectionalChap": "Օգտագործեք երկու ուղղիչ CHAP",
   "usernameIsRequired": "Օգտվողի անունը պարտադիր է",
-  "passwordIsRequired": "Գաղտնաբառը պարտադիր է"
+  "passwordIsRequired": "Գաղտնաբառը պարտադիր է",
+  "source": "Աղբյուր"
 }

package/assets/localization/local_kk.json

@@ -2380,5 +2380,6 @@
   "useUnidirectionalChap": "Бір бағытты CHAP пайдаланыңыз",
   "useBiderectionalChap": "Екі жақты CHAP пайдаланыңыз",
   "usernameIsRequired": "Пайдаланушы аты қажет",
-  "passwordIsRequired": "Құпия сөз қажет"
+  "passwordIsRequired": "Құпия сөз қажет",
+  "source": "Дереккөз"
 }

package/assets/localization/local_ru.json

@@ -2386,5 +2386,6 @@
   "useUnidirectionalChap": "Используйте однонаправленный CHAP",
   "useBiderectionalChap": "Используйте двунаправленный CHAP",
   "usernameIsRequired": "Требуется имя пользователя",
-  "passwordIsRequired": "Требуется пароль"
+  "passwordIsRequired": "Требуется пароль",
+  "source": "Источник"
 }

package/assets/localization/local_zh.json

@@ -2380,5 +2380,6 @@
   "useUnidirectionalChap": "使用单向 CHAP",
   "useBiderectionalChap": "使用双向 CHAP",
   "usernameIsRequired": "用户名是必需的",
-  "passwordIsRequired": "密码是必需的"
+  "passwordIsRequired": "密码是必需的",
+  "source": "来源"
 }

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

@@ -21,17 +21,20 @@
 
         <common-wizards-datastore-new-add-local
           v-show="selectedStep.id === 1"
-          :mode="props.project"
+          :project="props.project"
           :datastore-type="datastoreType"
+          :alert-messages="alertMessages[1]"
+          :messages-fields="selectedStep.fields"
           :local-create-name-submit="localCreateNameSubmit"
           :datacenter-hosts="props.datacenterHosts"
           :is-main-filter="props.isMainFilter"
+          @hide-alert="onHideAlert"
           @loading="(e) => (loading = e)"
           @submit="onSaveNameAndNextLocal"
           @main-filter="emits('main-filter', $event)"
         />
 
-        <common-wizards-datastore-add-new-shared-storm
+        <common-wizards-datastore-new-add-shared-storm
           v-show="datastoreType === 'shared-storm'"
           :mode="props.project"
           :step-id="selectedStep.id"
@@ -155,13 +158,111 @@ const datastoreForm = ref<UI_I_CreateDatastoreForm>({
   },
 })
 
+const checkIpFourSettingsSync = (
+  localization: UI_I_Localization,
+  data: string,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (!data) {
+    stepHasError = wizard.setValidation(1, 'datastoreName', {
+      fieldMessage: localization.specifyDatastoreName,
+      alertMessage: '',
+    })
+  } else if (wizard.hasMessage(1, 'datastoreName')) {
+    value = wizard.removeValidation(1, 'datastoreName', value)
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
+// 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,
-  _nextStep: UI_I_WizardStep
+  currentStep: UI_I_WizardStep,
+  nextStep: UI_I_WizardStep
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
+  if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
+    const nameValidation = checkIpFourSettingsSync(
+      localization.value,
+      datastoreForm.value.local.name,
+      wizard,
+      value
+    )
+
+    value = nameValidation.newValue
+
+    stepHasError = nameValidation.stepHasError
+  }
+
   return {
     newValue: value,
     stepHasError,
@@ -462,6 +563,9 @@ const onAddDatastore = async (): Promise<void> => {
 //   return await createDatastore(sendDataTwo)
 // }
 
+const onHideAlert = (stepId: number): void => {
+  wizard.hideAlertMessagesByStepId(stepId)
+}
 const onFinish = async (): Promise<void> => {
   loading.value = true
 

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

@@ -1,18 +1,21 @@
 <template>
   <div class="local-step">
-    <span v-if="mode === 'sphere'" class="vmfs-container__desc">
+    <span v-if="props.project === 'sphere'" class="vmfs-container__desc">
       {{ localization.nameAndDeviceSelectionDesc }}
     </span>
 
     <common-wizards-datastore-new-add-local-create-name
-      v-show="mode === 'procurator'"
+      v-show="props.project === 'procurator'"
+      :alert-messages="props.alertMessages"
+      :messages-fields="props.messagesFields"
       :local-create-name-submit="props.localCreateNameSubmit"
+      @hide-alert="(e) => emits('hide-alert', e)"
       @loading="(e) => emits('loading', e)"
       @submit="(e) => emits('submit', e)"
     />
 
     <common-wizards-datastore-new-add-shared-storm-device-selection
-      v-show="mode === 'sphere'"
+      v-show="props.project === 'sphere'"
       v-model:lun-disk="selectedLunDisk"
       mode="sphere"
       :device-selection-submit="props.localCreateNameSubmit"
@@ -28,25 +31,30 @@
 </template>
 
 <script lang="ts" setup>
-import {
+import type { UI_T_Project } from '~/lib/models/types'
+import type {
+  UI_I_Localization,
+  UI_I_ArbitraryObject,
+} from '~/lib/models/interfaces'
+import type {
   UI_I_CreateStorageLunDiskItem,
   UI_I_SelectHostOptions,
 } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import {
-  UI_T_WizardDatastoreMode,
-  UI_T_DatastoreType,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
-import { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
+import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 
 const props = defineProps<{
   localCreateNameSubmit: number
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   datastoreType: UI_T_DatastoreType
-  mode: UI_T_WizardDatastoreMode
+  project: UI_T_Project
   datacenterHosts?: UI_I_SelectHostOptions[]
   isMainFilter?: boolean
 }>()
 const emits = defineEmits<{
   (event: 'loading', value: boolean): void
+  (event: 'hide-alert', value: number): void
   (event: 'submit', value: string): void
   (event: 'main-filter', value: string): void
 }>()

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

@@ -1,11 +1,11 @@
 <template>
   <div class="create-datastore-name">
     <atoms-alert
-      v-show="errors.length"
+      v-show="props.alertMessages.length"
       test-id="datastore-creat-name"
       status="alert-danger"
-      :items="errors"
-      @remove="onRemoveValidationErrors"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
     />
 
     <div class="clr-form-control clr-row">
@@ -36,16 +36,23 @@
 </template>
 
 <script lang="ts" setup>
-import { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { 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_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_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'
 
 const props = defineProps<{
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   localCreateNameSubmit: number
 }>()
 const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
   (event: 'loading', value: boolean): void
   (event: 'submit', value: string): void
 }>()
@@ -81,14 +88,6 @@ const nameErrorText = computed<string>(() => {
   return validForm.value?.errors?.name?.[0] || ''
 })
 /* Validation Name input end */
-
-const errors = ref<string[]>([])
-const showValidationErrors = (data: string[]): void => {
-  errors.value = data
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
 const submit = async (): Promise<void> => {
   const name = form.value.name.value
 
@@ -101,19 +100,20 @@ const submit = async (): Promise<void> => {
   if (name) {
     emits('loading', true)
 
-    const { valid, msg } = await checkValidityName(name)
+    const { valid } = await checkValidityName(name)
 
     emits('loading', false)
 
     if (!valid) {
-      showValidationErrors([msg])
       return
     }
   }
-
-  onRemoveValidationErrors()
   emits('submit', name)
 }
+
+const onHideAlert = (): void => {
+  emits('hide-alert', 1)
+}
 watch(
   () => props.localCreateNameSubmit,
   () => {

package/package.json

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