bfg-common 1.4.58 → 1.4.60

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

@@ -1,15 +1,17 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
-import type { UI_I_LunDisk } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import type { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
-import type { UI_I_ReadyDataForLocal } from '~/components/common/wizards/datastore/add/readyComplete/lib/models/interfaces'
-
-const constructLunDiskItems = (disks: any): string => {
-  const { $binary } = useNuxtApp()
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
+const constructLunDiskItems = (
+  disks: UI_I_CreateStorageLunDiskItem[]
+): string => {
+  const { $binary } = useNuxtApp() as any
 
   let result = ''
-  disks.forEach((disk: UI_I_LunDisk) => {
-    const capacity = $binary.round(disk.capacity)
+  disks.forEach((disk: UI_I_CreateStorageLunDiskItem) => {
+    const capacity = $binary.round(disk.capacity_mb)
     result += `${disk.name} - ${capacity} \n`
   })
   return result
@@ -17,23 +19,23 @@ const constructLunDiskItems = (disks: any): string => {
 
 const nfsDetailsFunc = (
   localization: UI_I_Localization,
-  data: any,
-  isSphereWizard: boolean
+  data: UI_I_CreateDatastoreForm,
+  project: UI_T_Project,
+  nfsHosts: UI_I_CreateDatastoreHosts
 ): UI_I_DetailsItem[] => {
-  const { name, server, folder, version, hosts } = data
+  const { name, server, folder, nfsVersion, hosts } = data
   // const accessMode = readonly ? 'Read-only' : 'Read-write'
 
   const details: UI_I_DetailsItem[] = [
     {
       label: localization.common.vmfsVersion,
       value: '',
-      testId: 'view-vmfs-version',
       items: [
         {
           label: localization.common.version,
-          value: version.toUpperCase(),
-          testId: 'view-selected-nfs-version-in-complete',
+          value: nfsVersion.toUpperCase(),
           items: [],
+          testId: 'view-selected-nfs-version-in-complete',
         },
       ],
       actions: [],
@@ -41,25 +43,24 @@ const nfsDetailsFunc = (
     {
       label: localization.common.nameAndConfiguration,
       value: '',
-      testId: 'view-name-and-configuration',
       items: [
         {
           label: localization.common.datastoreName,
           value: name,
-          testId: 'view-storage-name-in-complete',
           items: [],
+          testId: 'view-storage-name-in-complete',
         },
         {
           label: localization.common.server,
           value: server,
-          testId: 'view-server-name-in-complete',
           items: [],
+          testId: 'view-server-name-in-complete',
         },
         {
           label: localization.common.folder,
           value: folder,
-          testId: 'view-folder-name-in-complete',
           items: [],
+          testId: 'view-folder-name-in-complete',
         },
         // {
         //   label: localization.accessMode,
@@ -71,18 +72,22 @@ const nfsDetailsFunc = (
     },
   ]
 
-  if (isSphereWizard) {
+  if (project === 'sphere') {
+    const hostsNames = nfsHosts
+      ? nfsHosts.items
+          .filter((host) => data.hosts.includes(host.id))
+          .map((host) => host.host)
+      : []
     details.push({
       label: localization.common.hostsAccessibility,
       value: '',
-      testId: 'view-hosts-accessibility',
       items: [
         {
           label: localization.common.hosts,
           value: '',
-          data: hosts,
-          testId: 'view-hosts',
+          data: hostsNames,
           items: [],
+          testId: '',
         },
       ],
       actions: [],
@@ -91,43 +96,9 @@ const nfsDetailsFunc = (
 
   return details
 }
-
-const localDetailsFunc = (
-  localization: UI_I_Localization,
-  event: UI_I_ReadyDataForLocal | string,
-  isSphereWizard: boolean
-): UI_I_DetailsItem[] => {
-  const data = [
-    {
-      label: localization.common.selectName,
-      value: '',
-      testId: 'view-select-name',
-      items: [
-        {
-          label: localization.common.datastoreName,
-          value: isSphereWizard ? event.name : event,
-          testId: 'view-storage-name-in-complete',
-          items: [],
-        },
-      ],
-      actions: [],
-    },
-  ]
-
-  if (isSphereWizard) {
-    data[0].items.push({
-      label: localization.common.host,
-      value: event.host,
-      testId: 'view-host',
-      items: [],
-    })
-  }
-  return data
-}
-
 const sharedStormDetailsFunc = (
   localization: UI_I_Localization,
-  data: { name: string; lunDisk: string[] } // пока так ставляем тип но надо будет поменять когда будем добавлять осталние настройки
+  data: UI_I_CreateDatastoreForm
 ): UI_I_DetailsItem[] => {
   const { name, lunDisk } = data
 
@@ -135,64 +106,35 @@ const sharedStormDetailsFunc = (
     {
       label: localization.common.nameAndDeviceSelection,
       value: '',
-      testId: 'name-and-device-selection',
       items: [
         {
           label: localization.common.datastoreName,
           value: name,
-          testId: 'view-storage-name-in-complete',
           items: [],
+          testId: 'view-storage-name-in-complete',
         },
         {
           label: localization.common.diskLun,
           value: constructLunDiskItems(lunDisk),
-          testId: 'view-selected-lun-disks-in-complete',
           items: [],
+          testId: 'view-selected-lun-disks-in-complete',
         },
       ],
       actions: [],
     },
-    // {
-    //   label: localization.common.partitionConfiguration,
-    //   value: '',
-    //   items: [
-    //     {
-    //       label: localization.common.method,
-    //       value: 'None',
-    //       items: [],
-    //     },
-    //     {
-    //       label: localization.common.partitionFormat,
-    //       value: 'None',
-    //       items: [],
-    //     },
-    //     {
-    //       label: localization.common.blockSize,
-    //       value: 'None',
-    //       items: [],
-    //     },
-    //     {
-    //       label: localization.common.spaceReclamationGranularity,
-    //       value: 'None',
-    //       items: [],
-    //     },
-    //   ],
-    //   actions: [],
-    // }, /*  TODO  данные с нее пока никуда не вставляем */
   ]
 }
 
-export const constructDataReadyViewFunc = <T>(
+export const constructDataReadyViewFunc = (
   localization: UI_I_Localization,
-  type: UI_T_DatastoreType,
-  data: T,
-  isSphereWizard: boolean
+  data: UI_I_CreateDatastoreForm,
+  project: UI_T_Project,
+  nfsHosts: UI_I_CreateDatastoreHosts
 ): UI_I_DetailsItem[] => {
   const details = {
-    local: localDetailsFunc, // TODO remove
-    'shared-storm': sharedStormDetailsFunc,
-    nfs: nfsDetailsFunc,
+    2: sharedStormDetailsFunc,
+    4: nfsDetailsFunc,
   }
 
-  return details[type](localization, data, isSphereWizard)
+  return details[data.type_code as 2 | 4](localization, data, project, nfsHosts)
 }

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

@@ -1,30 +1,22 @@
 <template>
-  <div class="vmfs-container">
-    <span class="vmfs-container__desc">{{ stepSubTitle }}</span>
-
+  <div class="shared-storm-container">
     <common-wizards-datastore-add-shared-storm-device-selection
-      v-show="props.stepPosition === 1"
-      v-model:lun-disk="selectedLunDisk"
-      :device-selection-submit="props.deviceSelectionSubmit"
-      :step-position="props.stepPosition"
+      v-show="props.stepId === 2"
+      v-model="model"
+      :step-id="props.stepId"
+      :alert-messages="props.alertMessages"
+      :messages-fields="props.messagesFields"
       :datastore-type="props.datastoreType"
-      :mode="props.mode"
-      :datacenter-hosts="props.datacenterHosts"
+      :project="props.project"
+      :hosts="props.hosts"
       :is-main-filter="props.isMainFilter"
       :host-id="props.hostId"
-      @loading="(e) => emits('loading', e)"
-      @submit="(e) => emits('submit', e)"
+      @hide-alert="(e) => emits('hide-alert', e)"
       @main-filter="emits('main-filter', $event)"
     />
 
-    <!--    <templates-home-datastore-actions-add-vmfs-version-->
-    <!--      v-show="props.stepPosition === 2"-->
-    <!--      v-models:version="vmfsVersion"-->
-    <!--    />-->
-    <!-- TODO в shared-storm пока верси не будет  -->
-
     <common-wizards-datastore-add-shared-storm-partition-configuration
-      v-show="props.mode === 'procurator' && props.stepPosition === 2"
+      v-show="props.project === 'procurator' && props.stepId === 3"
       :vmfs-version="vmfsVersion"
       :selected-lun-disk-size="lunDiskTotalCapacity"
     />
@@ -32,60 +24,55 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import {
-  UI_T_WizardDatastoreMode,
+import type {
+  UI_I_Localization,
+  UI_I_ArbitraryObject,
+} 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 type {
   UI_T_DatastoreType,
   UI_T_VmfsType,
 } from '~/components/common/wizards/datastore/add/lib/models/types'
-import {
-  UI_I_SelectHostOptions,
-  UI_I_CreateStorageLunDiskItem,
-} from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import { subTitleFunc } from '~/components/common/wizards/datastore/add/lib/config/stepItems'
+import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 
 const props = defineProps<{
-  mode: UI_T_WizardDatastoreMode
-  stepPosition: number
-  deviceSelectionSubmit: number
+  project: UI_T_Project
+  stepId: number
   datastoreType: UI_T_DatastoreType
-  datacenterHosts?: UI_I_SelectHostOptions[]
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  hosts?: UI_I_CreateDatastoreHosts
   isMainFilter?: boolean
   hostId?: string
 }>()
+const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const emits = defineEmits<{
-  (event: 'submit', value: { name: string; lunDisk: string[] }): void
-  (event: 'loading', value: boolean): void
+  (event: 'hide-alert', value: boolean): void
   (event: 'main-filter', value: string): void
 }>()
 
 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>(() => {
-  if (!selectedLunDisk.value.length) return 0
+  if (!model.value.lunDisk.length) return 0
 
-  return +selectedLunDisk.value
-    .map((disk) => disk.capacity_mb)
+  return +model.value.lunDisk
+    .map((disk: UI_I_CreateStorageLunDiskItem) => disk.capacity_mb)
     .reduce((acc, cur) => acc + cur)
 })
-
-const stepSubTitle = computed<string>(() => {
-  const { datastoreType, stepPosition } = props
-  return subTitleFunc(localization.value, datastoreType, stepPosition)
-})
 </script>
 
 <style lang="scss" scoped>
-.vmfs-container {
+.shared-storm-container {
   display: flex;
   flex-direction: column;
   overflow-y: auto;
   overflow-x: hidden;
-  height: 100%;
-  &_desc {
-  }
+  height: inherit;
 }
 </style>