bfg-common 1.5.112 → 1.5.114

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

@@ -146,8 +146,9 @@
           <common-wizards-datastore-add-steps-ready-complete
             v-if="selectedStep.id === dynamicSteps.readyComplete"
             :form="formModelLocal"
-            :hosts="props.nfsHosts"
             :project="props.project"
+            :hosts="props.nfsHosts"
+            :host-id="props.hostId"
           />
         </template>
       </ui-wizard-block>

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

@@ -52,6 +52,7 @@
           v-if="selectedStep.id === dynamicSteps.readyComplete"
           :form="formModelLocal"
           :hosts="props.nfsHosts"
+          :host-id="props.hostId"
           :project="props.project"
         />
       </template>

package/components/common/wizards/datastore/add/steps/hostAccessibility/table/new/New.vue

@@ -1,9 +1,5 @@
 <template>
   <div class="host-accessibility-table">
-    <h2>
-      {{ tableHeadline }}
-    </h2>
-
     <ui-data-table
       test-id="accessibility-table"
       :data="data"
@@ -12,6 +8,7 @@
       :total-pages="props.totalPages"
       :total-items="props.totalItems"
       :texts="texts"
+      :default-layout="false"
       class="accessibility-host-table"
       size="sm"
       @select-row="onSelectRow"
@@ -30,14 +27,14 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   UI_I_DataTable,
-  UI_I_DataTableHeader,
   UI_I_DataTableBody,
+  UI_I_DataTableHeader,
   UI_I_TableTexts,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import {
-  options,
-  getHeaderDataFunc,
   getBodyDataFunc,
+  getHeaderDataFunc,
+  options,
 } from '~/components/common/wizards/datastore/add/steps/hostAccessibility/table/new/lib/config/compatibleTable'
 import { UI_I_CompatibleHostsTableItem } from '~/components/common/wizards/datastore/add/steps/hostAccessibility/table/lib/models/interfaces'
 
@@ -90,25 +87,23 @@ watch(
   { deep: true, immediate: true }
 )
 
-const tableHeadline = computed<string>(() => {
-  const { selected } = localization.value.common
-  return ` ${props.totalItems} ${selected}`
-})
-
 const onSelectRow = (value: UI_I_DataTableBody[]): void => {
-  // TODO поправить сейчас работает неправильно < selectedHostsIdLocal >
-  selectedHostsIdLocal.value = value?.[0].row
+  selectedHostsIdLocal.value = value.map((item) => item.row)
 }
 </script>
 
 <style lang="scss" scoped>
 .host-accessibility-table {
-  h2 {
-    font-family: Inter, serif;
-    color: var(--title-form-first-color);
-    font-weight: 400;
-    font-size: 12px;
-    line-height: 100%;
+  :deep(.bottom-grid-content) {
+    border: 1px solid var(--select-storage-border-color);
+    border-radius: 8px;
+    padding: 12px;
+    background-color: var(--select-storage-bg-color);
+  }
+  :deep(.select-row-item) {
+    background-color: var(--select-storage-bg-color);
+  }
+  :deep(.table-container .table-title) {
     margin-bottom: 12px;
   }
   .icon {

package/components/common/wizards/datastore/add/steps/hostAccessibility/table/new/lib/config/compatibleTable.ts

@@ -37,21 +37,14 @@ export const getHeaderDataFunc = (
 export const options: UI_I_DataTableOptions = {
   perPageOptions: [{ text: '10', value: 100, default: true }],
   isSelectable: true,
-  isFocusable: false,
+  selectType: 'checkbox',
   showPagination: false,
-  showPaginationOnTop: false,
   showPageInfo: false,
   isSortable: true,
   server: true,
   isResizable: true,
-  showSearch: false,
-  showSelectedRows: false,
+  showSelectedRows: true,
   showColumnManager: false,
-  withActions: false,
-  selectType: 'checkbox',
-  inBlock: true,
-  showExport: false,
-  withCollapse: false,
 }
 
 export const getBodyDataFunc = (
@@ -59,7 +52,7 @@ export const getBodyDataFunc = (
 ): UI_I_DataTableBody[] => {
   return bodyData.map((host, _index: number) => {
     return {
-      row: Number(host.id),
+      row: host.id as any,
       collapse: false,
       isHiddenCollapse: false,
       collapseToggle: false,

package/components/common/wizards/datastore/add/steps/readyComplete/ReadyComplete.vue

@@ -19,9 +19,10 @@ import type { UI_I_CompatibleHosts } from '~/components/common/wizards/datastore
 import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/steps/readyComplete/lib/config/propertiesDetails'
 
 const props = defineProps<{
+  project: UI_T_Project
   form: UI_I_CreateDatastoreForm
   hosts: UI_I_CompatibleHosts
-  project: UI_T_Project
+  hostId: string
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -34,7 +35,8 @@ const dataReadyView = computed<UI_I_DetailsItem>(() =>
     localization.value,
     props.form,
     props.project,
-    props.hosts
+    props.hosts,
+      props.hostId
   )
 )
 </script>

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

@@ -5,18 +5,6 @@ import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_I_CompatibleHosts } from '~/components/common/wizards/datastore/add/steps/hostAccessibility/table/lib/models/interfaces'
 
-// const constructLunDiskItems = (
-//   disks: UI_I_CreateStorageLunDiskItem[]
-// ): string => {
-//   const { $binary } = useNuxtApp() as any
-//
-//   let result = ''
-//   disks.forEach((disk: UI_I_CreateStorageLunDiskItem) => {
-//     const capacity = $binary.round(disk.capacity_mb)
-//     result += `${disk.name} - ${capacity} \n`
-//   })
-//   return result
-// }
 const constructLunDiskItems = (
   disks: UI_I_CreateStorageLunDiskItem[]
 ): { label: string; iconClassName?: string }[] => {
@@ -35,7 +23,8 @@ const nfsDetailsFunc = (
   localization: UI_I_Localization,
   data: UI_I_CreateDatastoreForm,
   project: UI_T_Project,
-  nfsHosts: UI_I_CompatibleHosts
+  nfsHosts: UI_I_CompatibleHosts,
+  hostId: string
 ): UI_I_DetailsItem[] => {
   const { name, server, folder, version, hosts } = data
   // const accessMode = readonly ? 'Read-only' : 'Read-write'
@@ -91,11 +80,14 @@ const nfsDetailsFunc = (
     },
   ]
 
-  if (project === 'sphere') {
-    const hostsNames = nfsHosts
+  if (project === 'sphere' && !hostId) {
+    const hostsData = nfsHosts
       ? nfsHosts.items
-          .filter((host) => data.hosts.includes(host.id))
-          .map((host) => host.host)
+          .filter((host) => hosts.includes(host.id))
+          .map((host) => ({
+            label: host.host,
+            iconClassName: 'vsphere-icon-host',
+          }))
       : []
     details.push({
       label: localization.common.hostsAccessibility,
@@ -103,8 +95,7 @@ const nfsDetailsFunc = (
       items: [
         {
           label: localization.common.hosts,
-          value: '',
-          data: hostsNames,
+          value: hostsData as any,
           items: [],
           testId: 'view-hosts-name-in-complete',
           iconClassName: 'vsphere-icon-host',
@@ -136,7 +127,7 @@ const sharedStormDetailsFunc = (
         },
         {
           label: localization.common.diskLun,
-          value: constructLunDiskItems(dev_names),
+          value: constructLunDiskItems(dev_names) as any,
           items: [],
           testId: 'view-selected-lun-disks-in-complete',
         },
@@ -150,12 +141,19 @@ export const constructDataReadyViewFunc = (
   localization: UI_I_Localization,
   data: UI_I_CreateDatastoreForm,
   project: UI_T_Project,
-  nfsHosts: UI_I_CompatibleHosts
+  nfsHosts: UI_I_CompatibleHosts,
+  hostId: string
 ): UI_I_DetailsItem[] => {
   const details = {
     2: sharedStormDetailsFunc,
     4: nfsDetailsFunc,
   }
 
-  return details[data.type_code as 2 | 4](localization, data, project, nfsHosts)
+  return details[data.type_code as 2 | 4](
+    localization,
+    data,
+    project,
+    nfsHosts,
+    hostId
+  )
 }

package/package.json

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