bfg-common 1.3.464 → 1.3.466

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

@@ -52,11 +52,9 @@
           v-model="form"
           :project="props.project"
           :step-id="selectedStep.id"
-          :datastore-type="datastoreType"
           :alert-messages="alertMessages[selectedStep.id]"
           :messages-fields="selectedStep.fields"
           :hosts="props.nfsHosts"
-          @submit="saveChangesAndNextNfs"
         />
 
         <common-wizards-datastore-new-add-ready-complete
@@ -362,7 +360,6 @@ const validationFunc = async (
       'name',
       wizard
     )
-
     value = nameValidation.newValue
 
     const folderValidation = checkNfsFolderSync(
@@ -371,6 +368,7 @@ const validationFunc = async (
       wizard,
       value
     )
+    value = folderValidation.newValue
 
     const serverValidation = checkNfsServerSync(
       localization.value,
@@ -378,6 +376,7 @@ const validationFunc = async (
       wizard,
       value
     )
+    value = serverValidation.newValue
 
     stepHasError =
       nameValidation.stepHasError ||
@@ -438,10 +437,13 @@ watch(
 )
 
 const dataReadyView = computed<UI_I_DetailsItem>(() =>
-  constructDataReadyViewFunc(localization.value, form.value, props.project)
+  constructDataReadyViewFunc(
+    localization.value,
+    form.value,
+    props.project,
+    props.nfsHosts
+  )
 )
-const onNextStep = (_force = false): void => {}
-
 const onSaveAndNextSharedStorm = (event: any): void => {
   const { sharedStorm } = datastoreForm.value
   sharedStorm.name = event.name
@@ -453,30 +455,6 @@ const onSaveAndNextSharedStorm = (event: any): void => {
     'shared-storm',
     event
   )
-
-  onNextStep(true)
-}
-const saveChangesAndNextNfs = (event: any, next = true): void => {
-  const { nfs } = datastoreForm.value
-  nfs.name = event.name
-  nfs.folder = event.folder
-  nfs.server = event.server
-  nfs.hosts = event.hosts
-
-  // TODO refactoring
-  const hostsNames = props.nfsHosts
-    ? props.nfsHosts.items
-        .filter((host) => event.hosts.includes(host.id))
-        .map((host) => host.host)
-    : []
-
-  dataReadyView.value = constructDataReadyViewFunc(localization.value, 'nfs', {
-    ...event,
-    hosts: hostsNames,
-    version: ' nfsVersion.value',
-  })
-
-  next && onNextStep(true)
 }
 
 const onHideAlert = (stepId: number): void => {

package/components/common/wizards/datastoreNew/add/lib/models/interfaces.ts

@@ -2,7 +2,7 @@ import type { UI_T_NfsType } from '~/components/common/wizards/datastoreNew/add/
 import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/lib/models/interfaces'
 export interface UI_I_CreateDatastoreForm {
   name: string
-  lunDisk: UI_I_CreateStorageLunDiskItem
+  lunDisk: UI_I_CreateStorageLunDiskItem[]
   nfsVersion: UI_T_NfsType
   type_code: 1 | 2 | 4
   readonly: boolean

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

@@ -12,7 +12,6 @@
       :alert-messages="props.alertMessages"
       :messages-fields="props.messagesFields"
       @hide-alert="(e) => emits('hide-alert', e)"
-      @next="onChangeConfigurationAndNext"
     />
 
     <!--    <templates-home-datastore-actions-add-nfs-kerberos-authentication-->
@@ -37,13 +36,10 @@ import type {
 } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
-import { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
-import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/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>
   hosts?: any
@@ -51,7 +47,6 @@ const props = defineProps<{
 const model = defineModel<any>()
 const emits = defineEmits<{
   (event: 'hide-alert', value: number): void
-  (event: 'submit', value: UI_I_ConfigurationSendDataNfs): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -59,19 +54,6 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const showHostAccessibility = computed<boolean>(() => {
   return props.project === 'sphere' && props.stepId === 6
 })
-
-let sendData: any = null
-const onChangeConfigurationAndNext = (
-  event: UI_I_ConfigurationSendDataNfs
-): void => {
-  sendData = {
-    name: event.name,
-    folder: event.folder,
-    server: event.server,
-    hosts: [],
-  }
-  emits('submit', sendData)
-}
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/datastoreNew/add/nfs/configuration/lib/models/interfaces.ts

@@ -1,15 +1,5 @@
-import { UI_I_DataServersListItem } from '~/components/common/wizards/datastore/add/nfs/configuration/serversList/lib/models/interfaces'
-
 export interface UI_I_InitialValidationFields {
   name: boolean
   folder: boolean
   server: boolean
 }
-
-export interface UI_I_ConfigurationSendDataNfs {
-  name: string
-  folder: string
-  server: UI_I_DataServersListItem[]
-
-  // readonly: boolean
-}

package/components/common/wizards/datastoreNew/add/readyComplete/lib/config/propertiesDetails.ts

@@ -19,7 +19,8 @@ const constructLunDiskItems = (
 const nfsDetailsFunc = (
   localization: UI_I_Localization,
   data: UI_I_CreateDatastoreForm,
-  project: UI_T_Project
+  project: UI_T_Project,
+  nfsHosts: any
 ): UI_I_DetailsItem[] => {
   const { name, server, folder, nfsVersion, hosts } = data
   // const accessMode = readonly ? 'Read-only' : 'Read-write'
@@ -67,6 +68,11 @@ const nfsDetailsFunc = (
   ]
 
   if (project === 'sphere') {
+    const hostsNames = nfsHosts
+      ? nfsHosts.items
+          .filter((host) => data.hosts.includes(host.id))
+          .map((host) => host.host)
+      : []
     details.push({
       label: localization.hostsAccessibility,
       value: '',
@@ -74,7 +80,7 @@ const nfsDetailsFunc = (
         {
           label: localization.hosts,
           value: '',
-          data: hosts,
+          data: hostsNames,
           items: [],
         },
       ],
@@ -164,7 +170,8 @@ const sharedStormDetailsFunc = (
 export const constructDataReadyViewFunc = (
   localization: UI_I_Localization,
   data: UI_I_CreateDatastoreForm,
-  project: UI_T_Project
+  project: UI_T_Project,
+  nfsHosts: any
 ): UI_I_DetailsItem[] => {
   const details = {
     1: localDetailsFunc,
@@ -172,5 +179,5 @@ export const constructDataReadyViewFunc = (
     4: nfsDetailsFunc,
   }
 
-  return details[data.type_code](localization, data, project)
+  return details[data.type_code](localization, data, project, nfsHosts)
 }

package/package.json

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