bfg-common 1.3.457 → 1.3.459

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

@@ -172,7 +172,16 @@ const checkName = async (
   wizard: Wizard
   // emits: UI_I_AddNetworkingEmits
 ): Promise<UI_I_AsyncCheckReturn> => {
-  if (label) {
+  const typeCode = form.value.type_code
+
+  let help = typeCode === 1
+  if (typeCode === 2) {
+    help = form.value.lunDisk.length
+  }
+  if (typeCode === 4) {
+    help = form.value.folder && form.value.server
+  }
+  if (label && help) {
     return new Promise((resolve, _reject) =>
       checkValidityName(label, wizard, (message: string) => {
         resolve({
@@ -184,7 +193,7 @@ const checkName = async (
   } else {
     return {
       isValid: false,
-      message: localization.specifyDatastoreName,
+      message: !label ? localization.specifyDatastoreName : '',
     }
   }
 }
@@ -217,51 +226,21 @@ const checkDatastoreNameAsync = async (
     stepHasError,
   }
 }
-
-const checkNameAndDevice = async (
-  form: any,
-  localization: UI_I_Localization,
-  wizard: Wizard
-  // emits: UI_I_AddNetworkingEmits
-): Promise<UI_I_AsyncCheckReturn> => {
-  if (form.name && form.lunDisk.length) {
-    return new Promise((resolve, _reject) =>
-      checkValidityName(form.name, wizard, (message: string) => {
-        resolve({
-          isValid: message === '',
-          message: message === '' ? '' : message,
-        })
-      })
-    )
-  } else {
-    return {
-      isValid: false,
-      message: !form.name
-        ? localization.specifyDatastoreName
-        : localization.selectHostToContinueAlert,
-    }
-  }
-}
-const checkNameAndDeviceAsync = async (
+const checkNfsFolderSync = (
   localization: UI_I_Localization,
-  value: UI_I_WizardStep[],
-  form: any,
-  wizard: Wizard
-): Promise<UI_I_ValidationReturn> => {
+  name: string,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
   let stepHasError = false
 
-  const labelValidation: {
-    isValid: boolean
-    message: string
-  } = await checkNameAndDevice(form, localization, wizard)
-
-  if (!labelValidation.isValid) {
-    stepHasError = wizard.setValidation(2, 'datastoreName', {
-      fieldMessage: labelValidation.message,
-      alertMessage: form.name ? labelValidation.message : '',
+  if (!name) {
+    stepHasError = wizard.setValidation(5, 'folder', {
+      fieldMessage: localization.specifyFolderName,
+      alertMessage: '',
     })
-  } else if (wizard.hasMessage(2, 'datastoreName')) {
-    value = wizard.removeValidation(2, 'datastoreName', value)
+  } else if (wizard.hasMessage(5, 'folder')) {
+    value = wizard.removeValidation(5, 'folder', value)
   }
 
   return {
@@ -269,8 +248,7 @@ const checkNameAndDeviceAsync = async (
     stepHasError,
   }
 }
-
-const checkNfsFolderSync = (
+const checkNfsServerSync = (
   localization: UI_I_Localization,
   name: string,
   wizard: Wizard,
@@ -279,12 +257,12 @@ const checkNfsFolderSync = (
   let stepHasError = false
 
   if (!name) {
-    stepHasError = wizard.setValidation(5, 'folder', {
-      fieldMessage: localization.noHostOrClusterSelected,
+    stepHasError = wizard.setValidation(5, 'server', {
+      fieldMessage: localization.specifyServerName,
       alertMessage: '',
     })
-  } else if (wizard.hasMessage(5, 'folder')) {
-    value = wizard.removeValidation(5, 'folder', value)
+  } else if (wizard.hasMessage(5, 'server')) {
+    value = wizard.removeValidation(5, 'server', value)
   }
 
   return {
@@ -316,15 +294,19 @@ const validationFunc = async (
   }
 
   if (wizard.isValidateForStep(2, currentStep.id, nextStep.id)) {
-    const nameValidation = await checkNameAndDeviceAsync(
+    const nameValidation = await checkDatastoreNameAsync(
       localization.value,
       value,
-      form.value,
+      form.value.name,
+      2,
+      'datastoreName',
       wizard
     )
 
     value = nameValidation.newValue
 
+    //selectHostToContinueAlert
+
     stepHasError = nameValidation.stepHasError
   }
 
@@ -347,7 +329,17 @@ const validationFunc = async (
       value
     )
 
-    stepHasError = folderValidation.stepHasError || nameValidation.stepHasError
+    const serverValidation = checkNfsServerSync(
+      localization.value,
+      form.value.server,
+      wizard,
+      value
+    )
+
+    stepHasError =
+      nameValidation.stepHasError ||
+      folderValidation.stepHasError ||
+      serverValidation.stepHasError
   }
 
   return {

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

@@ -11,6 +11,7 @@
       :project="props.project"
       :alert-messages="props.alertMessages"
       :messages-fields="props.messagesFields"
+      @hide-alert="(e) => emits('hide-alert', e)"
       @next="onChangeConfigurationAndNext"
     />
 
@@ -49,6 +50,7 @@ const props = defineProps<{
 }>()
 const model = defineModel<any>()
 const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
   (event: 'submit', value: UI_I_ConfigurationSendDataNfs): void
 }>()
 

package/package.json

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