bfg-common 1.3.452 → 1.3.453

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

@@ -144,22 +144,26 @@
 </template>
 
 <script lang="ts" setup>
+import type { UI_T_Project } from '~/lib/models/types'
 import { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_Localization,
+  UI_I_ArbitraryObject,
+} from '~/lib/models/interfaces'
+import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 import {
   UI_I_DataServersListItem,
   UI_I_FormValidationConfiguration,
 } from '~/components/common/wizards/datastore/add/nfs/configuration/serversList/lib/models/interfaces'
-import {
-  UI_T_NfsType,
-  UI_T_WizardDatastoreMode,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
+import { UI_T_NfsType } from '~/components/common/wizards/datastore/add/lib/models/types'
 import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
 import { defaultFormFunc } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/config/defaultForm'
 import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
 
 const props = defineProps<{
-  mode: UI_T_WizardDatastoreMode
+  project: UI_T_Project
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   nfsVersion: UI_T_NfsType
   nfsConfigurationSubmit: number
 }>()
@@ -263,7 +267,7 @@ const dataServers = ref<UI_I_DataServersListItem[]>([])
 //   // if (nfsVersion === 'nfs-4.1') server.value = ''
 // }
 
-const alertInfo = ref<boolean>(props.mode === 'procurator')
+const alertInfo = ref<boolean>(props.project === 'procurator')
 
 const resetValidation = (): void => {
   isInitNameValidation.value =
@@ -295,7 +299,7 @@ const submit = async (): Promise<void> => {
 
   emits('loading', true)
 
-  const { valid, msg } = await checkValidityName(name.value, props.mode)
+  const { valid, msg } = await checkValidityName(name.value, props.project)
 
   emits('loading', false)
 

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

@@ -142,6 +142,9 @@ const form = ref<any>({
   lunDisk: [],
   type_code: E_DatastoreTypeKode[datastoreType.value],
   nfsVersion: 'nfs-3',
+  readonly: false,
+  server: '',
+  folder: '',
 })
 const datastoreForm = ref<UI_I_CreateDatastoreForm>({
   local: {

package/components/common/wizards/datastoreNew/add/lib/config/steps.ts

@@ -66,7 +66,20 @@ export const stepsFunc = (
     title: localization.nameAndConfiguration,
     subTitle: localization.nameAndConfigurationDesc,
     status: UI_E_WIZARD_STATUS.INACTIVE,
-    fields: {},
+    fields: {
+      name: {
+        alert: '',
+        field: '',
+      },
+      folder: {
+        alert: '',
+        field: '',
+      },
+      server: {
+        alert: '',
+        field: '',
+      },
+    },
     isValid: true,
     testId: 'select-name-and-configuration',
   },

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

@@ -40,10 +40,7 @@ import type {
   UI_I_Localization,
   UI_I_ArbitraryObject,
 } from '~/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 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[]
@@ -55,35 +52,25 @@ const emits = defineEmits<{
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $validation } = useNuxtApp()
-
-const validation = $validation.call({})
-const defaultForm: UI_I_FormValidationDataStore = defaultFormFunc(
-  localization.value
-)
-const form = ref<UI_I_FormValidationDataStore>(useDeepCopy(defaultForm))
-
-const setForm = () => {
-  form.value = useDeepCopy(defaultForm)
-  validation.setForm(form)
-}
-setForm()
-
-const validForm = ref<UI_I_ValidationTouchResult | null>(null)
 
 /* Validation for Name input */
 const isInitNameValidation = ref<boolean>(false)
 const initValidation = (onlyBlur = false): void => {
-  validForm.value = validation.touch()
   onlyBlur && (isInitNameValidation.value = true)
 }
+
 const nameErrorText = computed<string>(() => {
-  if (props.messagesFields.datastoreName.field) {
+  if (
+    props.messagesFields?.datastoreName?.field &&
+    !createDatastoreNameLocal.value
+  ) {
     return props.messagesFields.datastoreName.field
   }
 
   if (!isInitNameValidation.value) return ''
-  return validForm.value?.errors?.name?.[0] || ''
+  return !createDatastoreNameLocal.value
+    ? localization.value.specifyDatastoreName
+    : ''
 })
 
 const onHideAlert = (): void => {

package/components/common/wizards/datastoreNew/add/nfs/Nfs.vue

@@ -7,7 +7,9 @@
 
     <common-wizards-datastore-add-nfs-configuration
       v-show="props.stepId === 5"
-      :mode="props.project"
+      :project="props.project"
+      :alert-messages="props.alertMessages"
+      :messages-fields="props.selectedStep"
       :nfs-version="model.nfsVersion"
       :nfs-configuration-submit="nfsConfigurationSubmit"
       @loading="(e) => emits('loading', e)"
@@ -35,10 +37,7 @@ import type {
 } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
-import {
-  UI_T_DatastoreType,
-  UI_T_NfsType,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
+import { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
 import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
 
 const props = defineProps<{
@@ -85,7 +84,7 @@ const onChangeAccessibilityAndNext = (hosts: string[]): void => {
 @import '~/assets/scss/common/mixins.scss';
 .nfs-container {
   @include flex($dir: column);
-  height: 100%;
+  height: inherit;
   &__desc {
   }
 }

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

@@ -21,8 +21,8 @@
             data-id="device-selection-input"
             type="text"
             class="clr-input"
-            @blur="initValidation"
-            @input="onInput"
+            @blur="initValidation(true)"
+            @input="initValidation(false)"
           />
           <atoms-the-icon class="error-icon" name="info-circle" />
         </div>
@@ -137,11 +137,8 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const { $store } = useNuxtApp()
 
 const isInitDatastoreNameValidation = ref<boolean>(false)
-const initValidation = (): void => {
-  isInitDatastoreNameValidation.value = true
-}
-const onInput = (): void => {
-  if (!isInitDatastoreNameValidation.value) return
+const initValidation = (onlyBlur: boolean): void => {
+  onlyBlur && (isInitDatastoreNameValidation.value = true)
 }
 
 const nameErrorText = computed<string>(() => {

package/package.json

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

package/components/common/wizards/datastoreNew/add/local/createName/lib/config/defaultForm.ts

@@ -1,15 +0,0 @@
-import { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const defaultFormFunc = (localization: UI_I_Localization): any => {
-  return {
-    name: {
-      value: '',
-      validations: [
-        {
-          value: 'required',
-          errorText: localization.specifyDatastoreName,
-        },
-      ],
-    },
-  }
-}