bfg-common 1.3.434 → 1.3.436

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)"

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

@@ -3,14 +3,16 @@
     <common-wizards-datastore-new-add-shared-storm-device-selection
       v-show="props.stepId === 2"
       v-model="model"
-      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 +32,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 +60,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
 }>()

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,6 +115,7 @@ 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'
@@ -121,8 +125,9 @@ import { checkValidityName } from '~/components/common/wizards/datastoreNew/add/
 const props = defineProps<{
   project: UI_T_Project
   stepId: number
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   deviceSelectionSubmit: number
-  lunDisk: UI_I_CreateStorageLunDiskItem[]
   datastoreType: UI_T_DatastoreType
   datacenterHosts?: UI_I_SelectHostOptions[] | undefined
   isMainFilter?: boolean
@@ -131,6 +136,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
 }>()
@@ -183,7 +189,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
@@ -238,9 +244,6 @@ const resetValidation = (): void => {
 const removeInputValidation = (): void => {
   formErrors.value = []
 }
-const onCloseAlertDanger = (): void => {
-  errors.value = []
-}
 const validatePropertiesForSphere = (): boolean => {
   if (props.datastoreType === 'local') {
     return !selectedHost.value
@@ -287,7 +290,7 @@ const collectDataForReview = (
 
     if (props.datastoreType === 'shared-storm') {
       data.host = selectedHost.value
-      data.lunDisk = props.lunDisk.map((lun) => {
+      data.lunDisk = model.value.lunDisk.map((lun) => {
         return { name: lun.name, capacity: lun.capacity_mb }
       })
     }
@@ -369,9 +372,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.434",
+  "version": "1.3.436",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",