bfg-common 1.4.683 → 1.4.685

package/assets/localization/local_be.json

@@ -2284,7 +2284,8 @@
     "leave": "Пакідаць",
     "export": "Экспарт",
     "allRowsCount": "Усе радкі ({0})",
-    "selectedRowsCount": "Выбраныя радкі ({0})"
+    "selectedRowsCount": "Выбраныя радкі ({0})",
+    "viewZone": "View Zone"
   },
   "auth": {
     "welcomeTo": "Сардэчна запрашаем у",

package/assets/localization/local_en.json

@@ -2288,7 +2288,8 @@
     "leave": "Leave",
     "export": "Export",
     "allRowsCount": "All rows ({0})",
-    "selectedRowsCount": "Selected rows ({0})"
+    "selectedRowsCount": "Selected rows ({0})",
+    "viewZone": "View Zone"
   },
   "auth": {
     "welcomeTo": "Welcome to",

package/assets/localization/local_hy.json

@@ -2288,7 +2288,8 @@
     "leave": "Հեռանալ",
     "export": "Արտահանում",
     "allRowsCount": "Բոլոր տողերը ({0})",
-    "selectedRowsCount": "Ընտրված տողերը ({0})"
+    "selectedRowsCount": "Ընտրված տողերը ({0})",
+    "viewZone": "Դիտել գոտին"
   },
   "auth": {
     "welcomeTo": "Բարի գալուստ",

package/assets/localization/local_kk.json

@@ -2287,7 +2287,8 @@
     "leave": "Тастау",
     "export": "Сыртқа шығару",
     "allRowsCount": "Барлық жолдар ({0})",
-    "selectedRowsCount": "Таңдалған жолдар ({0})"
+    "selectedRowsCount": "Таңдалған жолдар ({0})",
+    "viewZone": "Қарау аймағы"
   },
   "auth": {
     "welcomeTo": "Қош келдіңіз",

package/assets/localization/local_ru.json

@@ -2289,7 +2289,8 @@
     "leave": "Покинуть",
     "export": "Экспорт",
     "allRowsCount": "Все строки ({0})",
-    "selectedRowsCount": "Выбранные строки ({0})"
+    "selectedRowsCount": "Выбранные строки ({0})",
+    "viewZone": "Просмотр зоны"
   },
   "auth": {
     "welcomeTo": "Добро пожаловать в",

package/assets/localization/local_zh.json

@@ -2286,7 +2286,8 @@
     "leave": "离开",
     "export": "出口",
     "allRowsCount": "所有行（{0}）",
-    "selectedRowsCount": "选定的行（{0}）"
+    "selectedRowsCount": "选定的行（{0}）",
+    "viewZone": "查看区域"
   },
   "auth": {
     "welcomeTo": "欢迎来到",

package/components/common/pages/tasks/Tasks.vue

@@ -86,6 +86,7 @@ onUnmounted(() => {
     font-size: 22px;
     line-height: 26.63px;
     color: var(--title-form-first-color);
+    margin-bottom: 22px;
   }
 }
 </style>

package/components/common/pages/tasks/table/Table.vue

@@ -46,7 +46,7 @@
           :test-id="`resent-task-item-${item.data.id}-action`"
           is-without-height
           is-without-sizes
-          @click="onToggleActions(item.data.id)"
+          @click.stop="onToggleActions(item.data.id)"
         >
           <span
             :class="['action-icon', { active: actionsIsShow[item.data.id] }]"
@@ -90,7 +90,6 @@ import type {
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_RecentTaskItem } from '~/lib/models/store/tasks/interfaces'
-import type { I_DataTargetForTable } from '~/components/common/pages/tasks/table/lib/models/interfaces'
 import type { T_TypeNodes } from '~/lib/models/types'
 
 import {
@@ -125,7 +124,7 @@ const taskHeadItems = computed<UI_I_DataTableHeader[]>(() =>
 const taskBodyItems = ref<UI_I_DataTableBody[]>([])
 watch(
   () => props.tableData,
-  (newValue: any) => {
+  (newValue: UI_I_RecentTaskItem<T_TypeNodes>[]) => {
     if (!newValue?.length) {
       taskBodyItems.value = []
       return
@@ -141,22 +140,28 @@ const onSorting = (value: string): void => {
 
 const actions = computed<UI_I_Dropdown[]>(() => [
   {
-    value: 'view',
+    value: 'view-target',
     text: localization.value.common.viewTarget,
     iconName: 'hide',
     selected: false,
   },
+  {
+    value: 'view-zone',
+    text: localization.value.common.viewZone,
+    iconName: 'hide',
+    selected: false,
+  },
 ])
 const onToggleActions = (id: number): void => {
   actionsIsShow.value[id] = !actionsIsShow.value[id]
 }
 const onSelectAction = (
-  data: I_DataTargetForTable,
-  action: 'view',
+  data: any,
+  action: 'view-target' | 'view-zone',
   actionId: number
 ): void => {
   switch (action) {
-    case 'view':
+    case 'view-target':
       onSelectNodeOfTree(data)
       break
   }
@@ -166,7 +171,7 @@ const onHideActionsDropdown = (id: number): void => {
   actionsIsShow.value[id] = false
 }
 
-const onSelectNodeOfTree = (data: I_DataTargetForTable): void => {
+const onSelectNodeOfTree = (data: any): void => {
   if (!data.isLink) return
 
   const { type, id, nav } = data

package/components/common/pages/tasks/table/lib/config/config.ts

@@ -141,7 +141,7 @@ export const options: UI_I_DataTableOptions = {
     { text: '50', value: 50 },
     { text: '100', value: 100 },
   ],
-  isSelectable: false,
+  isSelectable: true,
   isFocusable: false,
   showPagination: true,
   showPageInfo: true,
@@ -182,6 +182,15 @@ export const getBodyDataFunc = (
       testId: `${task.taskName}-progress`,
     }
 
+    const zoneNodeParams = taskConfig.zoneNodeFunc(task, nav)
+    const zoneData = {
+      ...zoneNodeParams,
+      nav,
+      icon: 'vsphere-icon-vcenter',
+      type: 'zone',
+      testId: `${task.targetType}-zone`,
+    }
+
     const formattedStartTime =
       task.startTime === '--'
         ? '--'
@@ -194,7 +203,7 @@ export const getBodyDataFunc = (
 
     return {
       row: index,
-      collapse: false,
+      collapse: true,
       isHiddenCollapse: false,
       collapseToggle: false,
       data: [
@@ -222,7 +231,7 @@ export const getBodyDataFunc = (
           key: 'icon',
           col: 10,
           text: task.zone,
-          data: { icon: 'vsphere-icon-vcenter', isLink: false },
+          data: zoneData,
         },
         {
           key: 'default-actions',

package/package.json

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