bfg-common 1.3.433 → 1.3.434

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

@@ -137,7 +137,7 @@ const stepPosition = ref<number>(0)
 
 const form = ref({
   name: '',
-  lunDisk: []
+  lunDisk: [],
 })
 const datastoreForm = ref<UI_I_CreateDatastoreForm>({
   local: {
@@ -213,6 +213,58 @@ const checkNameAsync = async (
   }
 }
 
+const checkNetwork2 = async (
+  form: any,
+  localization: UI_I_Localization
+  // emits: UI_I_AddNetworkingEmits
+): Promise<UI_I_AsyncCheckReturn> => {
+  console.log(form, 'sdsdf')
+  if (form.name && form.lunDisk.length) {
+    return new Promise((resolve, _reject) =>
+      checkValidityName(form.name, (message: string) => {
+        resolve({
+          isValid: message === '',
+          message: message === '' ? '' : message,
+        })
+      })
+    )
+  } else {
+    return {
+      isValid: false,
+      message: !form.lunDisk.length
+        ? localization.selectHostToContinueAlert
+        : localization.specifyDatastoreName,
+    }
+  }
+}
+const checkName2Async = async (
+  localization: UI_I_Localization,
+  value: UI_I_WizardStep[],
+  form: any,
+  wizard: Wizard
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+
+  const labelValidation: {
+    isValid: boolean
+    message: string
+  } = await checkNetwork2(form, localization)
+
+  if (!labelValidation.isValid) {
+    stepHasError = wizard.setValidation(1, 'datastoreName', {
+      fieldMessage: labelValidation.message,
+      alertMessage: form.name ? labelValidation.message : '',
+    })
+  } else if (wizard.hasMessage(1, 'datastoreName')) {
+    value = wizard.removeValidation(1, 'datastoreName', value)
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
 const validationFunc = async (
   value: UI_I_WizardStep[],
   currentStep: UI_I_WizardStep,
@@ -233,6 +285,19 @@ const validationFunc = async (
     stepHasError = nameValidation.stepHasError
   }
 
+  if (wizard.isValidateForStep(2, currentStep.id, nextStep.id)) {
+    const nameValidation = await checkName2Async(
+      localization.value,
+      value,
+      form.value,
+      wizard
+    )
+
+    value = nameValidation.newValue
+
+    stepHasError = nameValidation.stepHasError
+  }
+
   return {
     newValue: value,
     stepHasError,

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

@@ -3,7 +3,7 @@
     <common-wizards-datastore-new-add-shared-storm-device-selection
       v-show="props.stepId === 2"
       v-model="model"
-      v-model:lun-disk="selectedLunDisk"
+      v-model:lun-disk="[]"
       :step-id="props.stepId"
       :device-selection-submit="0"
       :datastore-type="props.datastoreType"
@@ -59,15 +59,11 @@ const emits = defineEmits<{
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const vmfsVersion = ref<UI_T_VmfsType>('vmfs-6')
-const selectedLunDisk = ref<UI_I_CreateStorageLunDiskItem[]>([])
 
 const lunDiskTotalCapacity = computed<number>(() => {
-  console.log(model.value, 'model.value')
-  console.log(selectedLunDisk.value, 'selectedLunDisk.value')
+  if (!model.value.lunDisk.length) return 0
 
-  if (!selectedLunDisk.value.length) return 0
-
-  return +selectedLunDisk.value
+  return +model.value.lunDisk
     .map((disk) => disk.capacity_mb)
     .reduce((acc, cur) => acc + cur)
 })

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

@@ -116,14 +116,13 @@ import {
 import { UI_T_DatastoreType } from '~/components/common/wizards/datastoreNew/add/lib/models/types'
 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 { checkValidityName } from '~/components/common/wizards/datastoreNew/add/lib/utils'
 
 const props = defineProps<{
   project: UI_T_Project
   stepId: number
   deviceSelectionSubmit: number
   lunDisk: UI_I_CreateStorageLunDiskItem[]
-  stepPosition: number
   datastoreType: UI_T_DatastoreType
   datacenterHosts?: UI_I_SelectHostOptions[] | undefined
   isMainFilter?: boolean
@@ -370,7 +369,7 @@ const initLunDisksDataTable = async (): Promise<void> => {
   } as UI_I_DataTableQuery)
 }
 
-if (props.project === 'procurator' && props.stepId === 2) {
+if (props.project === 'procurator' ) {  // && props.stepId === 2
   initLunDisksDataTable()
 }
 </script>

package/package.json

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