bfg-common 1.3.456 → 1.3.458

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

@@ -166,13 +166,22 @@ const datastoreForm = ref<UI_I_CreateDatastoreForm>({
   },
 })
 
-const checkNetwork = async (
+const checkName = async (
   label: string,
   localization: UI_I_Localization,
   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({
@@ -188,11 +197,12 @@ const checkNetwork = async (
     }
   }
 }
-
-const checkNameAsync = async (
+const checkDatastoreNameAsync = async (
   localization: UI_I_Localization,
   value: UI_I_WizardStep[],
   label: string,
+  stepId: number,
+  fieldName: string,
   wizard: Wizard
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
@@ -200,15 +210,15 @@ const checkNameAsync = async (
   const labelValidation: {
     isValid: boolean
     message: string
-  } = await checkNetwork(label, localization, wizard)
+  } = await checkName(label, localization, wizard)
 
   if (!labelValidation.isValid) {
-    stepHasError = wizard.setValidation(1, 'datastoreName', {
+    stepHasError = wizard.setValidation(stepId, fieldName, {
       fieldMessage: labelValidation.message,
       alertMessage: label ? labelValidation.message : '',
     })
-  } else if (wizard.hasMessage(1, 'datastoreName')) {
-    value = wizard.removeValidation(1, 'datastoreName', value)
+  } else if (wizard.hasMessage(stepId, fieldName)) {
+    value = wizard.removeValidation(stepId, fieldName, value)
   }
 
   return {
@@ -269,50 +279,43 @@ const checkNameAndDeviceAsync = async (
   }
 }
 
-const checkNameAndConfiguration = async (
-  form: any,
+const checkNfsFolderSync = (
   localization: UI_I_Localization,
-  wizard: Wizard
-  // emits: UI_I_AddNetworkingEmits
-): Promise<UI_I_AsyncCheckReturn> => {
-  if (form.name && form.folder && form.server) {
-    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,
-    }
+  name: string,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (!name) {
+    stepHasError = wizard.setValidation(5, 'folder', {
+      fieldMessage: localization.specifyFolderName,
+      alertMessage: '',
+    })
+  } else if (wizard.hasMessage(5, 'folder')) {
+    value = wizard.removeValidation(5, 'folder', value)
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
   }
 }
-const checkNameAndNfsConfigurationAsync = async (
+const checkNfsServerSync = (
   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 checkNameAndConfiguration(form, localization, wizard)
-
-  if (!labelValidation.isValid) {
-    stepHasError = wizard.setValidation(5, 'name', {
-      fieldMessage: labelValidation.message,
-      alertMessage: form.name ? labelValidation.message : '',
+  if (!name) {
+    stepHasError = wizard.setValidation(5, 'server', {
+      fieldMessage: localization.specifyServerName,
+      alertMessage: '',
     })
-  } else if (wizard.hasMessage(5, 'name')) {
-    value = wizard.removeValidation(5, 'name', value)
+  } else if (wizard.hasMessage(5, 'server')) {
+    value = wizard.removeValidation(5, 'server', value)
   }
 
   return {
@@ -329,10 +332,12 @@ const validationFunc = async (
   let stepHasError = false
 
   if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
-    const nameValidation = await checkNameAsync(
+    const nameValidation = await checkDatastoreNameAsync(
       localization.value,
       value,
       form.value.name,
+      1,
+      'datastoreName',
       wizard
     )
 
@@ -355,16 +360,35 @@ const validationFunc = async (
   }
 
   if (wizard.isValidateForStep(5, currentStep.id, nextStep.id)) {
-    const nameValidation = await checkNameAndNfsConfigurationAsync(
+    const nameValidation = await checkDatastoreNameAsync(
       localization.value,
       value,
-      form.value,
+      form.value.name,
+      5,
+      'name',
       wizard
     )
 
     value = nameValidation.newValue
 
-    stepHasError = nameValidation.stepHasError
+    const folderValidation = checkNfsFolderSync(
+      localization.value,
+      form.value.folder,
+      wizard,
+      value
+    )
+
+    const serverValidation = checkNfsServerSync(
+      localization.value,
+      form.value.folder,
+      wizard,
+      value
+    )
+
+    stepHasError =
+      folderValidation.stepHasError ||
+      nameValidation.stepHasError ||
+      serverValidation.stepHasError
   }
 
   return {

package/package.json

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