bfg-common 1.3.433 → 1.3.435

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

@@ -37,10 +37,13 @@
           :project="props.project"
           :step-id="selectedStep.id"
           :datastore-type="datastoreType"
+          :alert-messages="alertMessages[selectedStep.id]"
+          :messages-fields="selectedStep.fields"
           :device-selection-submit="deviceSelectionSubmit"
           :datacenter-hosts="props.datacenterHosts"
           :is-main-filter="props.isMainFilter"
           :host-id="props.hostId"
+          @hide-alert="onHideAlert"
           @loading="(e) => (loading = e)"
           @submit="onSaveAndNextSharedStorm"
           @main-filter="emits('main-filter', $event)"
@@ -137,7 +140,7 @@ const stepPosition = ref<number>(0)
 
 const form = ref({
   name: '',
-  lunDisk: []
+  lunDisk: [],
 })
 const datastoreForm = ref<UI_I_CreateDatastoreForm>({
   local: {
@@ -213,6 +216,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 +288,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,14 +3,17 @@
     <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"
+      :alert-messages="props.alertMessages"
+      :messages-fields="props.messagesFields"
       :device-selection-submit="0"
       :datastore-type="props.datastoreType"
       :project="props.project"
       :datacenter-hosts="props.datacenterHosts"
       :is-main-filter="props.isMainFilter"
       :host-id="props.hostId"
+      @hide-alert="(e) => emits('hide-alert', e)"
       @loading="(e) => emits('loading', e)"
       @main-filter="emits('main-filter', $event)"
     />
@@ -30,21 +33,27 @@
 </template>
 
 <script lang="ts" setup>
-import { UI_I_Localization } from '~/lib/models/interfaces'
+import {
+  UI_I_Localization,
+  UI_I_ArbitraryObject,
+} from '~/lib/models/interfaces'
 import { 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_VmfsType,
 } from '~/components/common/wizards/datastore/add/lib/models/types'
 import {
   UI_I_SelectHostOptions,
-  UI_I_CreateStorageLunDiskItem,
+  // UI_I_CreateStorageLunDiskItem,
 } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 
 const props = defineProps<{
   project: UI_T_Project
   stepId: number
   datastoreType: UI_T_DatastoreType
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   datacenterHosts?: UI_I_SelectHostOptions[]
   isMainFilter?: boolean
   hostId?: string
@@ -52,6 +61,7 @@ const props = defineProps<{
 const model = defineModel<any>()
 const emits = defineEmits<{
   // (event: 'submit', value: { name: string; lunDisk: string[] }): void
+  (event: 'hide-alert', value: boolean): void
   (event: 'loading', value: boolean): void
   (event: 'main-filter', value: string): void
 }>()
@@ -59,15 +69,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 (!selectedLunDisk.value.length) return 0
+  if (!model.value.lunDisk.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

@@ -1,11 +1,11 @@
 <template>
   <div class="device-selection">
     <atoms-alert
-      v-show="errors.length"
+      v-show="props.alertMessages.length"
       test-id="device-selection-errors"
       status="alert-danger"
-      :items="errors"
-      @remove="onCloseAlertDanger"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
     />
 
     <div class="clr-form-control clr-row">
@@ -99,7 +99,10 @@
 import { UI_T_Project } from '~/lib/models/types'
 import { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
 // import { UI_I_SchemaTablePayload } from '~/lib/models/store/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
+import {
+  UI_I_Localization,
+  UI_I_ArbitraryObject,
+} from '~/lib/models/interfaces'
 import {
   API_UI_I_DataTable,
   UI_I_Pagination,
@@ -112,18 +115,20 @@ import {
   UI_I_LunDiskSpherePayload,
   UI_I_SelectHostOptions,
 } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 // import { Ui_T_HostSelectedType } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/types'
 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
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   deviceSelectionSubmit: number
   lunDisk: UI_I_CreateStorageLunDiskItem[]
-  stepPosition: number
   datastoreType: UI_T_DatastoreType
   datacenterHosts?: UI_I_SelectHostOptions[] | undefined
   isMainFilter?: boolean
@@ -132,6 +137,7 @@ const props = defineProps<{
 const model = defineModel<any>()
 const emits = defineEmits<{
   (event: 'loading', value: boolean): void
+  (event: 'hide-alert', value: number): void
   (event: 'submit', value: UI_I_DeviceSelectionSendData): void
   (event: 'main-filter', value: string): void
 }>()
@@ -184,7 +190,7 @@ const pagination = ref<UI_I_Pagination>({
 })
 const sort = ref<string | null>(null)
 
-const selectedLunDisk = ref<number[]>([])
+// const selectedLunDisk = ref<number[]>([])
 
 const updatePagination = (event: UI_I_Pagination): void => {
   pagination.value = event
@@ -239,9 +245,6 @@ const resetValidation = (): void => {
 const removeInputValidation = (): void => {
   formErrors.value = []
 }
-const onCloseAlertDanger = (): void => {
-  errors.value = []
-}
 const validatePropertiesForSphere = (): boolean => {
   if (props.datastoreType === 'local') {
     return !selectedHost.value
@@ -370,9 +373,14 @@ const initLunDisksDataTable = async (): Promise<void> => {
   } as UI_I_DataTableQuery)
 }
 
-if (props.project === 'procurator' && props.stepId === 2) {
+if (props.project === 'procurator') {
+  // && props.stepId === 2
   initLunDisksDataTable()
 }
+
+const onHideAlert = (): void => {
+  emits('hide-alert', props.stepId)
+}
 </script>
 
 <style lang="scss" scoped>

package/package.json

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