bfg-common 1.4.192 → 1.4.193

package/components/common/context/recursion/RecursionOld.vue

@@ -1,213 +1,213 @@
-<template>
-  <ul class="context-wrap">
-    <span v-if="props.isLoading">
-      <atoms-loader-pre-loader
-        id="loader"
-        class="absolute-center context-menu__loading"
-        :show="true"
-      />
-    </span>
-    <li
-      v-for="(item, key) in props.items"
-      :key="key"
-      :class="[
-        'menu-item',
-        { disabled: item.disabled || isLoading },
-        { 'item-header': item.isHeader },
-        { 'has-border-top': item.hasBorderTop },
-      ]"
-      @mouseenter="emits('toggle-items', [item, true, $event])"
-      @mouseleave="emits('toggle-items', [item, false, $event])"
-    >
-      <span
-        class="context-link"
-        :style="item.style"
-        :data-id="`${item.testId}-context-link`"
-        @mousedown="emits('select-item', item)"
-      >
-        <span :class="['context-icon', item.iconClassName]" />
-        <span class="menu-item-text">{{ item.name }}</span>
-        <span v-if="item.items.length" class="arrow-icon" />
-        <span v-if="item.shortcut" class="shortcut">{{ item.shortcut }}</span>
-      </span>
-
-      <div class="context-children">
-        <common-context-recursion
-          v-show="item.isShowItems"
-          :action-loading="props.actionLoading"
-          :class="[{ 'child-show': item.isShowItems }]"
-          :items="item.items"
-          @select-item="emits('select-item', $event)"
-        />
-      </div>
-    </li>
-  </ul>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_ContextMenuItem } from '~/components/common/context/lib/models/interfaces'
-import type { I_HTMLLiElement } from '~/components/common/context/recursion/lib/models/interfaces'
-
-const props = defineProps<{
-  items: UI_I_ContextMenuItem[]
-  actionLoading: string | null
-  isLoading: boolean
-  testId?: string
-}>()
-
-const emits = defineEmits<{
-  (event: 'select-item', value: UI_I_ContextMenuItem): void
-  (
-    event: 'toggle-items',
-    value: [UI_I_ContextMenuItem, boolean, I_HTMLLiElement]
-  ): void
-}>()
-</script>
-
-<style scoped lang="scss">
-.loader-wrapper {
-  width: 100%;
-  height: 100%;
-  z-index: 100;
-}
-
-.context-menu__loading {
-  :deep(.spinner) {
-    width: 45px;
-    height: 45px;
-    min-width: 45px;
-    min-height: 45px;
-    z-index: 1000;
-  }
-}
-.context-wrap {
-  width: auto;
-  max-width: 400px;
-  background: var(--global-bg-color);
-  border-radius: 0;
-  color: #333;
-  border: 1px solid var(--context-menu-border-color);
-  user-select: none;
-  list-style: none;
-  max-height: 100vh;
-  overflow-y: auto;
-
-  .menu-item {
-    position: relative;
-    color: #565656;
-    border-bottom: 1px solid transparent;
-    cursor: pointer;
-    padding: 5px 0 3px;
-
-    &.has-border-top {
-      border-top: 1px solid var(--context-menu-inset-border-color);
-    }
-
-    &.item-header {
-      font-size: 11px;
-      background-color: var(--context-menu-item-header-color);
-      cursor: default;
-    }
-    &:not(.item-header):not(.disabled):hover {
-      background-color: var(--context-menu-hover-bg-color);
-      color: #454545;
-      border-bottom: 1px solid var(--context-menu-hover-border-color);
-    }
-    &.disabled {
-      opacity: 0.5;
-      user-select: none;
-      cursor: default;
-    }
-    &.left {
-      :deep(.context-children) {
-        left: 0;
-        background: red;
-
-        .context-wrap {
-          transform: translateX(-100%);
-          left: auto;
-        }
-      }
-    }
-
-    .context-link {
-      position: relative;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      display: flex;
-      align-items: center;
-      user-select: none;
-      padding: 3px 20px 4px 10px;
-
-      .menu-item-text {
-        flex: 1 1 0;
-      }
-
-      .context-icon {
-        display: inline-block;
-        margin: -2px 4px 0 0;
-        vertical-align: middle;
-        width: 18px;
-        height: 18px;
-      }
-
-      .arrow-icon {
-        position: absolute;
-        top: 50%;
-        margin-top: -8px;
-        right: 4px;
-        background-image: url('assets/img/icons/sprite.png');
-        display: inline-block;
-        width: 16px;
-        height: 16px;
-        overflow: hidden;
-        background-repeat: no-repeat;
-        font-size: 0;
-        line-height: 0;
-        text-align: center;
-        transform: rotate(90deg);
-      }
-
-      .shortcut {
-        padding-left: 10px;
-      }
-    }
-
-    .context-children {
-      position: absolute;
-      top: 0;
-      left: 100%;
-
-      .context-wrap {
-        position: fixed;
-      }
-    }
-  }
-}
-.context-menu__loading {
-  :deep(.spinner) {
-    width: 45px;
-    height: 45px;
-    min-width: 45px;
-    min-height: 45px;
-    z-index: 1000;
-  }
-}
-</style>
-<style>
-:root {
-  --context-menu-hover-bg-color: #e8e8e8;
-  --context-menu-border-color: #949494;
-  --context-menu-inset-border-color: #d4d5d6;
-  --context-menu-item-header-color: #eceff2;
-  --context-menu-hover-border-color: #666;
-}
-:root.dark-theme {
-  --context-menu-hover-bg-color: #324f61;
-  --context-menu-border-color: #495865;
-  --context-menu-inset-border-color: #485764;
-  --context-menu-item-header-color: #29414e;
-  --context-menu-hover-border-color: #fff;
-}
-</style>
+<template>
+  <ul class="context-wrap">
+    <span v-if="props.isLoading">
+      <atoms-loader-pre-loader
+        id="loader"
+        class="absolute-center context-menu__loading"
+        :show="true"
+      />
+    </span>
+    <li
+      v-for="(item, key) in props.items"
+      :key="key"
+      :class="[
+        'menu-item',
+        { disabled: item.disabled || isLoading },
+        { 'item-header': item.isHeader },
+        { 'has-border-top': item.hasBorderTop },
+      ]"
+      @mouseenter="emits('toggle-items', [item, true, $event])"
+      @mouseleave="emits('toggle-items', [item, false, $event])"
+    >
+      <span
+        class="context-link"
+        :style="item.style"
+        :data-id="`${item.testId}-context-link`"
+        @mousedown="emits('select-item', item)"
+      >
+        <span :class="['context-icon', item.iconClassName]" />
+        <span class="menu-item-text">{{ item.name }}</span>
+        <span v-if="item.items.length" class="arrow-icon" />
+        <span v-if="item.shortcut" class="shortcut">{{ item.shortcut }}</span>
+      </span>
+
+      <div class="context-children">
+        <common-context-recursion
+          v-show="item.isShowItems"
+          :action-loading="props.actionLoading"
+          :class="[{ 'child-show': item.isShowItems }]"
+          :items="item.items"
+          @select-item="emits('select-item', $event)"
+        />
+      </div>
+    </li>
+  </ul>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ContextMenuItem } from '~/components/common/context/lib/models/interfaces'
+import type { I_HTMLLiElement } from '~/components/common/context/recursion/lib/models/interfaces'
+
+const props = defineProps<{
+  items: UI_I_ContextMenuItem[]
+  actionLoading: string | null
+  isLoading: boolean
+  testId?: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'select-item', value: UI_I_ContextMenuItem): void
+  (
+    event: 'toggle-items',
+    value: [UI_I_ContextMenuItem, boolean, I_HTMLLiElement]
+  ): void
+}>()
+</script>
+
+<style scoped lang="scss">
+.loader-wrapper {
+  width: 100%;
+  height: 100%;
+  z-index: 100;
+}
+
+.context-menu__loading {
+  :deep(.spinner) {
+    width: 45px;
+    height: 45px;
+    min-width: 45px;
+    min-height: 45px;
+    z-index: 1000;
+  }
+}
+.context-wrap {
+  width: auto;
+  max-width: 400px;
+  background: var(--global-bg-color);
+  border-radius: 0;
+  color: #333;
+  border: 1px solid var(--context-menu-border-color);
+  user-select: none;
+  list-style: none;
+  max-height: 100vh;
+  overflow-y: auto;
+
+  .menu-item {
+    position: relative;
+    color: #565656;
+    border-bottom: 1px solid transparent;
+    cursor: pointer;
+    padding: 5px 0 3px;
+
+    &.has-border-top {
+      border-top: 1px solid var(--context-menu-inset-border-color);
+    }
+
+    &.item-header {
+      font-size: 11px;
+      background-color: var(--context-menu-item-header-color);
+      cursor: default;
+    }
+    &:not(.item-header):not(.disabled):hover {
+      background-color: var(--context-menu-hover-bg-color);
+      color: #454545;
+      border-bottom: 1px solid var(--context-menu-hover-border-color);
+    }
+    &.disabled {
+      opacity: 0.5;
+      user-select: none;
+      cursor: default;
+    }
+    &.left {
+      :deep(.context-children) {
+        left: 0;
+        background: red;
+
+        .context-wrap {
+          transform: translateX(-100%);
+          left: auto;
+        }
+      }
+    }
+
+    .context-link {
+      position: relative;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      display: flex;
+      align-items: center;
+      user-select: none;
+      padding: 3px 20px 4px 10px;
+
+      .menu-item-text {
+        flex: 1 1 0;
+      }
+
+      .context-icon {
+        display: inline-block;
+        margin: -2px 4px 0 0;
+        vertical-align: middle;
+        width: 18px;
+        height: 18px;
+      }
+
+      .arrow-icon {
+        position: absolute;
+        top: 50%;
+        margin-top: -8px;
+        right: 4px;
+        background-image: url('assets/img/icons/sprite.png');
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        overflow: hidden;
+        background-repeat: no-repeat;
+        font-size: 0;
+        line-height: 0;
+        text-align: center;
+        transform: rotate(90deg);
+      }
+
+      .shortcut {
+        padding-left: 10px;
+      }
+    }
+
+    .context-children {
+      position: absolute;
+      top: 0;
+      left: 100%;
+
+      .context-wrap {
+        position: fixed;
+      }
+    }
+  }
+}
+.context-menu__loading {
+  :deep(.spinner) {
+    width: 45px;
+    height: 45px;
+    min-width: 45px;
+    min-height: 45px;
+    z-index: 1000;
+  }
+}
+</style>
+<style>
+:root {
+  --context-menu-hover-bg-color: #e8e8e8;
+  --context-menu-border-color: #949494;
+  --context-menu-inset-border-color: #d4d5d6;
+  --context-menu-item-header-color: #eceff2;
+  --context-menu-hover-border-color: #666;
+}
+:root.dark-theme {
+  --context-menu-hover-bg-color: #324f61;
+  --context-menu-border-color: #495865;
+  --context-menu-inset-border-color: #485764;
+  --context-menu-item-header-color: #29414e;
+  --context-menu-hover-border-color: #fff;
+}
+</style>

package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModal.vue

@@ -272,9 +272,21 @@ const localSelectedObjects = ref<string>('')
 
 const currentFieldsByArray = (data: UI_I_AdvancedCounterItem[]): string => {
   const result: string[] = []
+
   data.forEach((item) => {
-    result.push(item.nameEn)
+    if (props.type === 'vm' && selectedMetric.value === 'network') {
+      const currentFields = []
+      const objectArray = localSelectedObjects.value.split(', ')
+      if (objectArray.length) {
+        objectArray.forEach((item2) => {
+          currentFields.push(`${item.nameEn} ${item2}`)
+        })
+      } else currentFields.push(item.nameEn)
+
+      result.push(currentFields.join(', '))
+    } else result.push(item.nameEn)
   })
+
   return result.join(',')
 }
 

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/config/utils.ts

@@ -12,8 +12,7 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const hostItemsFunc = (
   chart: UI_T_ChartHost,
-  localization: UI_I_Localization,
-  totalCores: number
+  localization: UI_I_Localization
 ): UI_I_AdvancedCounterItem[] => {
   const cpu: UI_I_AdvancedCounterItem[] = [
     {
@@ -401,7 +400,8 @@ const hostItemsFunc = (
     {
       id: 8,
       name: localization.inventoryMonitor.writeRate,
-      description: localization.inventoryMonitor.averageNumberKilobytesWrittenDisk,
+      description:
+        localization.inventoryMonitor.averageNumberKilobytesWrittenDisk,
       measurement: localization.common.write,
       units: localization.inventoryMonitor.kBps,
       nameEn: 'write rate',
@@ -428,7 +428,8 @@ const hostItemsFunc = (
     {
       id: 11,
       name: localization.inventoryMonitor.queueCommandLatency,
-      description: localization.inventoryMonitor.averageAmountTimeSpentVMKernelQueue,
+      description:
+        localization.inventoryMonitor.averageAmountTimeSpentVMKernelQueue,
       measurement: localization.inventoryMonitor.queueLatency,
       units: localization.common.ms,
       nameEn: 'queue command latency',
@@ -529,8 +530,8 @@ const vmItemsFunc = (
       id: 0,
       name: localization.inventoryMonitor.packetsReceived,
       description: localization.inventoryMonitor.amountReceivedPackets,
-      measurement: localization.inventoryMonitor.usageInKb,
-      units: localization.common.kb,
+      measurement: localization.inventoryMonitor.measuresInPackets,
+      units: localization.inventoryMonitor.packets,
       nameEn: 'packets received',
       testId: 'counters-table-packets-received-item',
     },
@@ -538,11 +539,66 @@ const vmItemsFunc = (
       id: 1,
       name: localization.inventoryMonitor.packetsTransmitted,
       description: localization.inventoryMonitor.amountTransmittedPackets,
-      measurement: localization.inventoryMonitor.usageInKb,
-      units: localization.common.kb,
+      measurement: localization.inventoryMonitor.measuresInPackets,
+      units: localization.inventoryMonitor.packets,
       nameEn: 'packets transmitted',
       testId: 'counters-table-packets-transmitted-item',
     },
+    {
+      id: 2,
+      name: localization.inventoryMonitor.bytesReceived,
+      description: localization.inventoryMonitor.amountReceivedBytes,
+      measurement: localization.inventoryMonitor.measuresInKb,
+      units: localization.common.kb,
+      nameEn: 'bytes received',
+      testId: 'counters-table-bytes-received-item',
+    },
+    {
+      id: 3,
+      name: localization.inventoryMonitor.bytesTransmitted,
+      description: localization.inventoryMonitor.amountTransmittedBytes,
+      measurement: localization.inventoryMonitor.measuresInKb,
+      units: localization.common.kb,
+      nameEn: 'bytes transmitted',
+      testId: 'counters-table-bytes-transmitted-item',
+    },
+    {
+      id: 4,
+      name: localization.inventoryMonitor.receivedPacketsErrors,
+      description: localization.inventoryMonitor.amountReceivedPacketsError,
+      measurement: localization.inventoryMonitor.measuresInPackets,
+      units: localization.inventoryMonitor.packets,
+      nameEn: 'errors received',
+      testId: 'counters-table-errors-received-item',
+    },
+    {
+      id: 5,
+      name: localization.inventoryMonitor.transmittedPacketsErrors,
+      description: localization.inventoryMonitor.amountTransmittedPacketsError,
+      measurement: localization.inventoryMonitor.measuresInPackets,
+      units: localization.inventoryMonitor.packets,
+      nameEn: 'errors transmitted',
+      testId: 'counters-table-errors-transmitted-item',
+    },
+    {
+      id: 6,
+      name: localization.inventoryMonitor.receivedDroppedPackets,
+      description: localization.inventoryMonitor.amountReceivedDroppedPackets,
+      measurement: localization.inventoryMonitor.measuresInPackets,
+      units: localization.inventoryMonitor.packets,
+      nameEn: 'drop received',
+      testId: 'counters-table-drop-received-item',
+    },
+    {
+      id: 7,
+      name: localization.inventoryMonitor.transmittedDroppedPackets,
+      description:
+        localization.inventoryMonitor.amountTransmittedDroppedPackets,
+      measurement: localization.inventoryMonitor.measuresInPackets,
+      units: localization.inventoryMonitor.packets,
+      nameEn: 'drop transmitted',
+      testId: 'counters-table-drop-transmitted-item',
+    },
   ]
   const cpu: UI_I_AdvancedCounterItem[] = [
     {
@@ -696,7 +752,8 @@ const vmItemsFunc = (
     {
       id: 2,
       name: localization.inventoryMonitor.storageProvisionedSpaceMb,
-      description: localization.inventoryMonitor.amountProvisionedStorageSpaceInMB,
+      description:
+        localization.inventoryMonitor.amountProvisionedStorageSpaceInMB,
       measurement: localization.inventoryMonitor.usageInMb,
       units: localization.common.mb,
       nameEn: 'storage provisioned space mb',

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/Object.vue

@@ -63,9 +63,15 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const tableType = computed<UI_T_DataGridType>(() =>
-  ['disk', 'network'].includes(props.chart) ? 'radio' : 'checkbox'
-)
+const tableType = computed<UI_T_DataGridType>(() => {
+  let result = 'checkbox'
+
+  if (props.type === 'host') {
+    result = ['disk', 'network'].includes(props.chart) ? 'radio' : 'checkbox'
+  }
+
+  return result
+})
 
 const selectedRow = ref<number[] | number>([])
 const pagination = ref<UI_I_Pagination>({
@@ -163,6 +169,8 @@ watch(
       newItems = [...newItems, ...props.currentItems]
 
       items = newItems
+    } else if (newValue[0] === 'vm' && newValue[1] === 'network') {
+      items = [...props.currentItems]
     }
 
     bodyItems.value = table.bodyItems(items)
@@ -175,18 +183,36 @@ watch(
   (newValue) => {
     const selectedItems: string[] = []
 
-    if (['disk', 'network'].includes(props.chart)) {
+    if (props.type === 'host' && ['disk', 'network'].includes(props.chart)) {
       selectedItems.push(items[newValue]?.target_object)
+    } else if (props.type === 'vm' && ['network'].includes(props.chart)) {
+      newValue.forEach((key) => {
+        selectedItems.push(items[key].target_object)
+      })
     } else
       newValue.forEach((key) => {
         selectedItems.push(items[key].id)
       })
 
-    const selectedNames =
+    let selectedNames = ''
+
+    if (
       items.length === newValue.length &&
       props.selectedMetricsKeys.length === props.totalMetricItems
-        ? '*'
-        : selectedItems.join(', ')
+    ) {
+      selectedNames = '*'
+
+      if (props.type === 'vm') selectedNames = 'total'
+    } else selectedNames = selectedItems.join(', ')
+
+    if (props.type === 'vm' && ['network'].includes(props.chart)) {
+      if (
+        selectedItems.includes('total') ||
+        (!selectedItems.includes('total') &&
+          items.length === newValue.length + 1)
+      )
+        selectedNames = 'total'
+    }
 
     emits('select-objects', selectedNames)
   },