bfg-common 1.3.538 → 1.3.540

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

@@ -42,8 +42,12 @@ export const checkValidityName = async (
   return { valid: true, msg: null }
 }
 
-export const validateNameAndGenerateDataId = (name: string, _errorMessage: string): string => {
-  let baseDataId = 'storage-name-alert-error'
+export const validateNameAndGenerateDataId = (
+  name: string,
+  _errorMessage: string,
+  defaultDataId?: string
+): string => {
+  let baseDataId = defaultDataId || 'storage-name-alert-error'
 
   const patterns = [
     {
@@ -55,14 +59,13 @@ export const validateNameAndGenerateDataId = (name: string, _errorMessage: strin
     {
       regex: /^.{3,64}$/,
       error_message:
-          /invalid name length, must be between: \d+ and \d+ characters/,
+        /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}`

package/components/common/wizards/datastore/add/sharedStorm/deviceSelection/DeviceSelection.vue

@@ -2,7 +2,7 @@
   <div class="device-selection">
     <atoms-alert
       v-show="errors.length"
-      test-id="device-selection-alert-error"
+      :test-id="errorAlertDataId"
       status="alert-danger"
       :items="errors"
       @remove="onCloseAlertDanger"
@@ -119,6 +119,7 @@ import {
 import { defaultFormFunc } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/config/defaultForm'
 import { hostsOptionsFunc } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/config/selectOptions'
 import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
+import { validateNameAndGenerateDataId } from '~/components/common/wizards/datastore/add/lib/utils'
 
 const props = defineProps<{
   mode: UI_T_WizardDatastoreMode
@@ -178,6 +179,7 @@ const onHideAlertInfo = (): void => {
 }
 
 const errors = ref<string[]>([])
+const errorAlertDataId = ref<string>('device-selection-alert-error')
 const formErrors = ref<UI_I_ValidationTouchResult[]>([])
 
 /* Lun disk table  */
@@ -246,7 +248,14 @@ const showValidationErrors = (
   errorText = '',
   alert = false
 ): void => {
-  if (alert) errors.value = [errorText]
+  if (alert) {
+    errors.value = [errorText]
+    errorAlertDataId.value = validateNameAndGenerateDataId(
+      form.value.name.value,
+      errorText,
+      errorAlertDataId.value
+    )
+  }
   formErrors.value = data
 }
 
@@ -326,11 +335,11 @@ const submit = async (): Promise<void> => {
       : validatePropertiesForSphere()
 
   if (!valid.isValid || isShowAlertDanger) {
-    const isModeSphere = mode === 'sphere' && props.datastoreType === 'local'
+    const isModeSphere = mode === 'sphere'
 
     const errorText =
       localization.value[
-        isModeSphere ? 'selectHostToContinueAlert' : validationTextForSphere()
+        isModeSphere ? validationTextForSphere() : 'selectDiskToContinueAlert'
       ]
 
     showValidationErrors(valid, errorText, isShowAlertDanger)

package/package.json

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