bfg-common 1.4.904 → 1.5.1

package/assets/localization/local_en.json

@@ -2095,7 +2095,7 @@
     "deleteBackupDescription": "Do you want to remove backup?",
     "removeDatastoreDescription": "Do you want to remove datastore?",
     "useUnidirectionalChap": "Use unidirectional CHAP",
-    "useBiderectionalChap": "Use biderectional CHAP",
+    "useBiderectionalChap": "Use bidirectional CHAP",
     "usernameIsRequired": "Username is required",
     "passwordIsRequired": "Password is required",
     "source": "Source",

package/components/common/tools/Actions.vue

@@ -1,9 +1,6 @@
 <template>
-  <div
-    :id="id"
-    class="btn-group"
-    :style="{ 'padding-right': rightSpace + 'px' }"
-  >
+  <!--  :style="{ 'padding-right': rightSpace + 'px' }"-->
+  <div :id="id" class="btn-group">
     <div v-for="(button, key) in props.actions" :key="button.type">
       <label v-if="button.uploaded" v-development="button.development">
         <span
@@ -42,6 +39,7 @@
       :test-id="`${props.testId}-item`"
       :items="collapsedItems"
       close-after-click
+      class="nav-tabs"
       @change="onClickButton"
       @select-file="onSelectFiles"
     />
@@ -96,40 +94,51 @@ const collapsedItems = computed<UI_I_CollapseNavItem[]>(() => {
       }
     })
 })
-
-const rightSpace = ref<number>(0)
 watch(
-  collapsedItems,
+  () => props.actions,
   (newValue) => {
-    let space = 0
-    const element: any = document.getElementById(id.value)
-    if (!element || !newValue.length) space = 0
-    else if (element.lastChild?.className?.includes('tabs-overflow')) {
-      space =
-        element.getBoundingClientRect().right -
-        element.lastChild.getBoundingClientRect().left
-    }
-
-    rightSpace.value = space
+    visibleCount.value = newValue.length
   },
   { deep: true }
 )
 
+// const rightSpace = ref<number>(0)
+// watch(
+//   collapsedItems,
+//   (newValue) => {
+//     let space = 0
+//     const element: any = document.getElementById(id.value)
+//     if (!element || !newValue.length) space = 0
+//     else if (element.lastChild?.className?.includes('tabs-overflow')) {
+//       space =
+//         element.getBoundingClientRect().right -
+//         element.lastChild.getBoundingClientRect().left
+//     }
+//
+//     rightSpace.value = space
+//   },
+//   { deep: true }
+// )
+
 const outputSize = (): void => {
   const el = document.getElementById(id.value)
   if (!el) return
 
   const elWidth = el.clientWidth
-  const elItems = el.children
+  // const elItems = el.children
+  const elItems = Array.from(el.children).filter(
+    (item) => !item.classList.contains('nav-tabs')
+  )
   const elItemsMarginLeft = parseInt(getComputedStyle(elItems[0]).marginLeft)
   const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
   const childrenMarginY = elItemsMarginLeft + elItemsMarginRight
 
-  let childrenWidth = 0
+  let childrenWidth = -10 // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
   let count = 0
   for (let i = 0; i < elItems.length; i++) {
     childrenWidth += elItems[i].clientWidth + childrenMarginY
-    const isWrap = elWidth - rightSpace.value < childrenWidth
+    // const isWrap = elWidth - rightSpace.value < childrenWidth
+    const isWrap = elWidth < childrenWidth
 
     if (isWrap) break
     count++

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

@@ -8,23 +8,20 @@
       @remove="onHideAlert"
     />
 
-    <div>
-      <atoms-tabs
-        v-model="activeTab"
-        test-id="accessibility"
-        :items="tabs"
-        size="small"
-      />
-    </div>
-    <div>
-      <common-wizards-datastore-add-nfs-accessibility-tables-view
-        v-model="modelHosts"
-        :data-table="dataTable?.items || []"
-        :total-items="dataTable?.total_items || 0"
-        :total-pages="dataTable?.total_pages || 1"
-        :table-type="activeTab"
-      />
-    </div>
+    <atoms-tabs
+      v-model="activeTab"
+      test-id="accessibility"
+      :items="tabs"
+      size="small"
+      class="w-100"
+    />
+    <common-wizards-datastore-add-nfs-accessibility-tables-view
+      v-model="modelHosts"
+      :data-table="dataTable?.items || []"
+      :total-items="dataTable?.total_items || 0"
+      :total-pages="dataTable?.total_pages || 1"
+      :table-type="activeTab"
+    />
   </div>
 </template>
 

package/components/common/wizards/datastore/add/nfs/accessibility/tablesView/TablesView.vue

@@ -14,6 +14,7 @@
         :total-pages="props.totalPages"
         hide-page-size
         :loading="loading"
+        server-off
       >
         <template #icon="{ item }">
           <span :class="['datagrid-cell-icon', item.data.iconClassName]" />

package/package.json

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