bfg-common 1.3.336 → 1.3.338

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

@@ -95,7 +95,7 @@ const props = defineProps<{
     version: UI_T_NfsType
   ) => Promise<void>
   datacenterHosts?: UI_I_SelectHostOptions[]
-  nfsHosts?: any[]
+  nfsHosts?: any
   isMainFilter?: boolean
 }>()
 const emits = defineEmits<{
@@ -135,6 +135,7 @@ const datastoreForm = ref<UI_I_CreateDatastoreForm>({
     readonly: false,
     version: nfsVersion.value,
     type_code: 4,
+    hosts: []
   },
 })
 
@@ -187,8 +188,8 @@ const onHideModal = (): void => {
 
 const updateNfsVersion = (event: UI_T_NfsType): void => {
   nfsVersion.value = event
-  const { name, server, folder } = datastoreForm.value.nfs
-  saveChangesAndNextNfs({ name, server, folder }, false)
+  const { name, server, folder, hosts } = datastoreForm.value.nfs
+  saveChangesAndNextNfs({ name, server, folder, hosts }, false)
 }
 
 const localCreateNameSubmit = ref<number>(0)
@@ -280,6 +281,7 @@ const saveChangesAndNextNfs = (event: any, next = true): void => {
   nfs.name = event.name
   nfs.folder = event.folder
   nfs.server = event.server
+  nfs.hosts = event.hosts
 
   dataReadyView.value = constructDataReadyViewFunc(
     localization.value,

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

@@ -1,36 +1,38 @@
-import { UI_T_NfsType } from '~/components/common/wizards/datastore/add/lib/models/types'
-
-export interface UI_I_NfsPoolNameForm<T = number> {
-  server: string
-  folder: string
-  version: T
-  readonly: boolean
-}
-export interface UI_I_CreateDatastoreBodyRequest {
-    name: string
-    pool_name: string
-    type_code: number
-}
-interface I_NfsForm extends UI_I_NfsPoolNameForm<UI_T_NfsType>{
-  name: string
-  type_code: number
-}
-interface I_SharedStorm extends UI_I_CreateDatastoreBodyRequest {
-  dev_names: string[]
-  hosts: string[]
-}
-
-export interface UI_I_CreateDatastoreForm {
-  local: {
-    name: string
-    hosts: string[]
-    type_code: number
-  }
-  sharedStorm: I_SharedStorm
-  nfs: I_NfsForm
-}
-
-export interface UI_I_CreateStorageUuid {
-  code: number
-  pool_name: string
-}
+import { UI_T_NfsType } from '~/components/common/wizards/datastore/add/lib/models/types'
+
+// TODO refactoring
+export interface UI_I_NfsPoolNameForm<T = number> {
+  server: string
+  folder: string
+  version: T
+  readonly: boolean
+  hosts: string[]
+}
+export interface UI_I_CreateDatastoreBodyRequest {
+  name: string
+  pool_name: string
+  type_code: number
+}
+interface I_NfsForm extends UI_I_NfsPoolNameForm<UI_T_NfsType> {
+  name: string
+  type_code: number
+}
+interface I_SharedStorm extends UI_I_CreateDatastoreBodyRequest {
+  dev_names: string[]
+  hosts: string[]
+}
+
+export interface UI_I_CreateDatastoreForm {
+  local: {
+    name: string
+    hosts: string[]
+    type_code: number
+  }
+  sharedStorm: I_SharedStorm
+  nfs: I_NfsForm
+}
+
+export interface UI_I_CreateStorageUuid {
+  code: number
+  pool_name: string
+}

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

@@ -13,7 +13,7 @@
       :nfs-version="nfsVersion"
       :nfs-configuration-submit="nfsConfigurationSubmit"
       @loading="(e) => emits('loading', e)"
-      @next="applyChangesAndNext"
+      @next="onChangeConfiguration"
     />
 
     <!--    <templates-home-datastore-actions-add-nfs-kerberos-authentication-->
@@ -24,8 +24,8 @@
     <common-wizards-datastore-add-nfs-accessibility
       v-if="showHostAccessibility"
       :host-accessibility-submit="props.hostAccessibilitySubmit"
-      :datacenter-hosts="props.hosts"
-      @next="applyChangesAndNext"
+      :hosts="props.hosts"
+      @next="onChangeAccessibilityAndNext"
     />
     <!-- TODO Он будет когда будем делать групповое  -->
   </div>
@@ -39,7 +39,6 @@ import {
   UI_T_WizardDatastoreMode,
 } from '~/components/common/wizards/datastore/add/lib/models/types'
 import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
-import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 import { subTitleFunc } from '~/components/common/wizards/datastore/add/lib/config/stepItems'
 
 const props = defineProps<{
@@ -48,7 +47,7 @@ const props = defineProps<{
   datastoreType: UI_T_DatastoreType
   nfsConfigurationSubmit: number
   hostAccessibilitySubmit: number
-  hosts?: UI_I_SelectHostOptions[]
+  hosts?: any
 }>()
 const emits = defineEmits<{
   (event: 'loading', value: boolean): void
@@ -91,8 +90,19 @@ watch(nfsVersion, (newValue: UI_T_NfsType) => {
   emits('change-nfs-version', newValue)
 })
 
-const applyChangesAndNext = (event: UI_I_ConfigurationSendDataNfs): void => {
-  emits('submit', event)
+let configuration: any = null
+const onChangeConfiguration = (event: UI_I_ConfigurationSendDataNfs): void => {
+  configuration = {
+    name: event.name,
+    folder: event.folder,
+    server: event.server
+  }
+}
+const onChangeAccessibilityAndNext = (hosts: string[]): void => {
+  emits('submit', {
+    ...configuration,
+    hosts
+  })
 }
 </script>
 

package/components/common/wizards/datastore/add/nfs/accessibility/Accessibility.vue

@@ -18,7 +18,7 @@
     </div>
     <div>
       <common-wizards-datastore-add-nfs-accessibility-tables-view
-        v-model:selected-row="selectedHost"
+        v-model:selected-row="selectedHosts"
         :data-table="dataTable?.items || []"
         :total-items="dataTable?.total_items || 0"
         :total-pages="dataTable?.total_pages || 1"
@@ -34,20 +34,18 @@
 <script lang="ts" setup>
 import { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
 import { UI_I_Localization } from '~/lib/models/interfaces'
-import { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
 import { UI_I_Pagination } from '~/lib/models/table/interfaces'
 import { T_HostsAccessibilityTab } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
-import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 import { hostAccessibilityTabsFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/config/tabsPannel'
 // import { hostsAccessibilityTablesFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/hostsTableItems'
 
 const props = defineProps<{
   hostAccessibilitySubmit: number
-  hosts?: UI_I_SelectHostOptions[]
+  hosts?: any
 }>()
 const localization = computed<UI_I_Localization>(() => useLocal())
 const emits = defineEmits<{
-  (event: 'next', value: string): void
+  (event: 'next', value: string[]): void
 }>()
 
 const activeTab = ref<T_HostsAccessibilityTab>('compatible-hosts')
@@ -55,17 +53,9 @@ const tabs = computed<UI_I_CollapseNavItem[]>(() =>
   hostAccessibilityTabsFunc(localization.value, ['5', '3'])
 )
 
-console.log(444444)
-
 // const dataTable = computed(() => hostsAccessibilityTablesFunc(activeTab.value))
 // TODO refactoring
-const dataTable = computed<API_UI_I_DataTable<UI_I_SelectHostOptions[]>>(() => {
-  return {
-    items: props.hosts,
-    total_items: props.hosts.length,
-    total_pages: 1,
-  }
-})
+const dataTable = computed<any>(() => props.hosts)
 
 const pagination = ref<UI_I_Pagination>({
   page: 1,
@@ -73,7 +63,7 @@ const pagination = ref<UI_I_Pagination>({
 })
 const sort = ref<string | null>(null)
 
-const selectedHost = ref<number[]>([])
+const selectedHosts = ref<string[]>([])
 
 const updatePagination = (event: UI_I_Pagination): void => {
   pagination.value = event
@@ -91,14 +81,14 @@ const removeValidationErrors = (): void => {
   errors.value = []
 }
 const submit = async () => {
-  if (!selectedHost.value.length) {
+  if (!selectedHosts.value.length) {
     const text = localization.value.selectLeastEntityContinue
     showValidationErrors(text)
     return
   }
 
   removeValidationErrors()
-  emits('next', '')
+  emits('next', selectedHosts.value)
 }
 watch(
   () => props.hostAccessibilitySubmit,

package/package.json

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