bfg-common 1.4.48 → 1.4.50

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

@@ -21,7 +21,7 @@
         />
 
         <common-wizards-datastore-new-add-local
-          v-show="selectedStep.id === 1"
+          v-if="selectedStep.id === 1"
           v-model="form"
           :project="props.project"
           :step-id="selectedStep.id"

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

@@ -6,7 +6,7 @@ export const checkValidityName = async (
   name: string,
   wizard: Wizard,
   project: UI_T_Project,
-  sendMessage: (message: string) => void,
+  sendMessage: (message: string) => void
 ): Promise<void> => {
   // TODO move to projects!!!
 
@@ -29,3 +29,36 @@ export const checkValidityName = async (
   }
   sendMessage('')
 }
+
+export const validateNameAndGenerateDataId = (
+  name: string,
+  _errorMessage: string,
+  defaultDataId?: string
+): string => {
+  let baseDataId = defaultDataId || 'storage-name-alert-error'
+
+  const patterns = [
+    {
+      regex: /^[a-zA-Z0-9_\-\.]+$/,
+      error_message:
+        /invalid name, must only contain letters, numbers, and '_', '-' '.' symbols/,
+      suffix: '-invalid-name-symbols',
+    },
+    {
+      regex: /^.{3,64}$/,
+      error_message:
+        /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}`
+    }
+  }
+
+  return baseDataId
+}

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

@@ -10,7 +10,7 @@
 
     <div class="clr-form-control clr-row">
       <label for="datastore-name" class="clr-control-label clr-col-md-2">
-        {{ localization.datastoreName }}
+        {{ localization.common.datastoreName }}
       </label>
 
       <div class="clr-control-container" :class="nameErrorText && 'clr-error'">
@@ -69,7 +69,7 @@ const nameErrorText = computed<string>(() => {
 
   if (!isInitNameValidation.value) return ''
   return !createDatastoreNameLocal.value
-    ? localization.value.specifyDatastoreName
+    ? localization.value.common.specifyDatastoreName
     : ''
 })
 

package/components/common/wizards/datastoreNew/add/nfs/configuration/Configuration.vue

@@ -3,7 +3,7 @@
     <div>
       <atoms-alert
         v-show="props.alertMessages?.length"
-        test-id="configure-information-alert"
+        test-id="configure-error-alert"
         status="alert-danger"
         :items="props.alertMessages"
         @remove="onHideAlert"

package/components/common/wizards/datastoreNew/add/sharedStorm/SharedStorm.vue

@@ -17,7 +17,7 @@
 
     <!--    <templates-home-datastore-actions-add-vmfs-version-->
     <!--      v-show="props.stepPosition === 2"-->
-    <!--      v-models:version="vmfsVersion"-->
+    <!--      v-models="vmfsVersion"-->
     <!--    />-->
     <!-- TODO в shared-storm пока верси не будет  -->
 

package/components/common/wizards/datastoreNew/add/sharedStorm/{version → _version}/Version.vue

@@ -1,36 +1,25 @@
 <template>
   <section class="nfs-version">
     <common-select-radio-group
-      v-model="selectedVersion"
+      v-model="selectedVersionLocal"
       :options="vmfsVersion"
     />
   </section>
 </template>
 
 <script lang="ts" setup>
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
-import { UI_T_VmfsType } from '~/components/common/wizards/datastore/add/lib/models/types'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
+import type { UI_T_VmfsType } from '~/components/common/wizards/datastore/add/lib/models/types'
 import { vmfsVersionFunc } from '~/components/common/wizards/datastore/add/sharedStorm/version/lib/config/versionOptions'
 
 const props = defineProps<{
   version: UI_T_VmfsType
 }>()
+const selectedVersionLocal = defineModel<UI_T_VmfsType>({required: true})
 const localization = computed<UI_I_Localization>(() => useLocal())
-const emits = defineEmits<{
-  (event: 'update:version', value: UI_T_VmfsType): void
-}>()
 
 const vmfsVersion = ref<UI_I_RadioOption[]>(vmfsVersionFunc(localization.value))
-
-const selectedVersion = computed<UI_T_VmfsType>({
-  get() {
-    return props.version
-  },
-  set(newValue) {
-    emits('update:version', newValue)
-  },
-})
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/datastoreNew/add/sharedStorm/{version → _version}/lib/config/versionOptions.ts

@@ -1,5 +1,5 @@
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
 
 export const vmfsVersionFunc = (
   localization: UI_I_Localization
@@ -9,13 +9,13 @@ export const vmfsVersionFunc = (
       label: 'VMFS 6',
       value: 'vmfs-6',
       disabled: false,
-      description: localization.vmfsVersionDesc1,
+      description: localization.common.vmfsVersionDesc1,
     },
     {
       label: 'VMFS 5',
       value: 'vmfs-5',
       disabled: false,
-      description: localization.vmfsVersionDesc2,
+      description: localization.common.vmfsVersionDesc2,
     },
   ]
 }

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

@@ -2,7 +2,7 @@
   <div class="device-selection-step">
     <atoms-alert
       v-show="props.alertMessages?.length"
-      test-id="device-selection-alert-error"
+      :test-id="errorAlertDataId"
       status="alert-danger"
       :items="props.alertMessages"
       @remove="onHideAlert"
@@ -110,8 +110,9 @@ import type {
 } from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/lib/models/interfaces'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastoreNew/add/nfs/accessibility/tablesView/lib/models/interfaces'
-import { UI_T_DatastoreType } from '~/components/common/wizards/datastoreNew/add/lib/models/types'
+import type { UI_T_DatastoreType } from '~/components/common/wizards/datastoreNew/add/lib/models/types'
 import { hostsOptionsFunc } from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/lib/config/selectOptions'
+import { validateNameAndGenerateDataId } from '~/components/common/wizards/datastoreNew/add/lib/utils'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -146,6 +147,17 @@ const nameErrorText = computed<string>(() => {
   return !model.value.name ? localization.value.common.specifyDatastoreName : ''
 })
 
+const defaultDataId = ref<string>('device-selection-alert-error')
+const errorAlertDataId = computed<string>(() => {
+  return !model.value.lunDisk.length
+    ? `${defaultDataId.value}-not-selected-lundisk`
+    : validateNameAndGenerateDataId(
+        model.value.name,
+        props.alertMessages[0],
+        defaultDataId.value
+      )
+})
+
 const alertInfo = ref<boolean>(true)
 const onHideAlertInfo = (): void => {
   alertInfo.value = false

package/components/common/wizards/datastoreNew/add/types/Types.vue

@@ -19,7 +19,7 @@
           test-id="select-datastore-type"
           @hide="isShowTypeHelp = false"
         >
-          <p class="help-desc">{{ localization.datastoreTypeHelpDesc }}</p>
+          <p class="help-desc">{{ localization.common.datastoreTypeHelpDesc }}</p>
         </atoms-tooltip-signpost>
       </div>
     </div>

package/package.json

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