bfg-common 1.4.20 → 1.4.22

package/assets/localization/local_be.json

@@ -2304,8 +2304,8 @@
     "eventTypeDescription": "Апісанне тыпу падзеі",
     "possibleCauses": "Магчымыя прычыны",
     "importVms": "Імпарт віртуальных машын",
-    "selectSourceVCenterServer": "Выберыце зыходны сервер vCenter",
-    "selectSourceVCenterServerDesc": "Імпарт віртуальных машын з абранага зыходнага сервера vCenter.",
+    "selectSourceVCenterServer": "Esxi Хост көзін таңдаңыз",
+    "selectSourceVCenterServerDesc": "Імпарт віртуальнай машыны з абранага зыходнага вузла ESXI.",
     "importVirtualMachines": "Імпарт віртуальных машын",
     "importVirtualMachinesDesc": "Выберыце, якія віртуальныя машыны трэба імпартаваць.",
     "selectFolder": "Выберыце тэчку",

package/assets/localization/local_en.json

@@ -2308,7 +2308,7 @@
     "possibleCauses": "Possible Causes",
     "importVms": "Import VMs",
     "selectSourceVCenterServer": "Select a source ESXI Host",
-    "selectSourceVCenterServerDesc": "Import Virtual Machines from the selected source vCenter Server.",
+    "selectSourceVCenterServerDesc": "Import Virtual Machine from the selected source ESXI Host.",
     "importVirtualMachines": "Import Virtual Machines",
     "importVirtualMachinesDesc": "Select which Virtual Machines to be imported.",
     "selectFolder": "Select folder",

package/assets/localization/local_hy.json

@@ -2308,7 +2308,7 @@
     "possibleCauses": "Հնարավոր պատճառներ",
     "importVms": "Վիրտուալ մեքենաների ներմուծում",
     "selectSourceVCenterServer": "Ընտրեք ESXi աղբյուրի հյուրընկալողը",
-    "selectSourceVCenterServerDesc": "Ներմուծեք վիրտուալ մեքենաներ ընտրված աղբյուր vCenter սերվերից:",
+    "selectSourceVCenterServerDesc": "Ներմուծեք վիրտուալ մեքենան ընտրված ESXI աղբյուրի հանգույցից:",
     "importVirtualMachines": "Ներմուծեք վիրտուալ մեքենաներ",
     "importVirtualMachinesDesc": "Ընտրեք, թե որ վիրտուալ մեքենաները պետք է ներմուծվեն:",
     "selectFolder": "Ընտրեք թղթապանակ",

package/assets/localization/local_kk.json

@@ -2307,7 +2307,7 @@
     "possibleCauses": "Ықтимал себептері",
     "importVms": "Виртуалды Машиналарды Импорттау",
     "selectSourceVCenterServer": "Esxi Хост көзін таңдаңыз",
-    "selectSourceVCenterServerDesc": "Таңдалған көзден vCenter серверінен виртуалды машиналарды импорттаңыз.",
+    "selectSourceVCenterServerDesc": "Виртуалды Машинаны таңдалған ESXI Хост көзінен импорттаңыз.",
     "importVirtualMachines": "Виртуалды машиналарды импорттау",
     "importVirtualMachinesDesc": "Импортталатын виртуалды машиналарды таңдаңыз.",
     "selectFolder": "Қалтаны таңдаңыз",

package/assets/localization/local_ru.json

@@ -2310,7 +2310,7 @@
     "possibleCauses": "Возможные причины",
     "importVms": "Импорт виртуальных машин",
     "selectSourceVCenterServer": "Выберите исходный хост ESXI",
-    "selectSourceVCenterServerDesc": "Импортируйте виртуальные машины с выбранного исходного сервера vCenter.",
+    "selectSourceVCenterServerDesc": "Импортируйте виртуальную машину с выбранного исходного узла ESXI.",
     "importVirtualMachines": "Импортировать виртуальные машины",
     "importVirtualMachinesDesc": "Выберите, какие виртуальные машины нужно импортировать.",
     "selectFolder": "Выберите папку",

package/assets/localization/local_zh.json

@@ -2307,7 +2307,7 @@
     "possibleCauses": "可能的原因",
     "importVms": "导入虚拟机",
     "selectSourceVCenterServer": "选择源ESXI主机",
-    "selectSourceVCenterServerDesc": "从选定的源 vCenter Server 导入虚拟机。",
+    "selectSourceVCenterServerDesc": "从选定的源ESXI主机导入虚拟机。",
     "importVirtualMachines": "导入虚拟机",
     "importVirtualMachinesDesc": "选择要导入的虚拟机。",
     "selectFolder": "选择文件夹",

package/components/common/mainNavigationPanel/MainNavigationPanelNew.vue

@@ -18,14 +18,21 @@
             :disabled="props.disabledPin"
             @change="emits('change-menu-pin')"
           />
-          <label for="pin-menu-control" class="pointer flex-align-center">
+          <label
+            for="pin-menu-control"
+            class="pointer flex-align-center pin-unpin-label"
+          >
             <ui-icon-main-navigation-panel
               :name="menuPined ? 'unpin' : 'pin'"
-              width="12px"
-              height="12px"
+              width="16px"
+              height="16px"
             />
-            <span v-if="!menuPined">{{ localization.common.pinMenu }}</span>
-            <span v-else>{{ localization.common.unpinMenu }}</span>
+            <span v-if="!menuPined" class="pin-unpin-text">{{
+              localization.common.pinMenu
+            }}</span>
+            <span v-else class="pin-unpin-text">{{
+              localization.common.unpinMenu
+            }}</span>
           </label>
         </div>
 
@@ -37,7 +44,11 @@
           @click="emits('collapse-menu')"
         >
           <span class="nav-trigger-icon flex">
-            <ui-icon-main-navigation-panel name="doubleArrow" width="16px" height="16px" />
+            <ui-icon-main-navigation-panel
+              name="doubleArrow"
+              width="16px"
+              height="16px"
+            />
           </span>
         </button>
       </div>
@@ -55,7 +66,11 @@
             :title="item2.title"
             @click="emits('hide-main-menu')"
           >
-            <ui-icon-main-navigation-panel :name="item2.iconName" width="20px" height="20px" />
+            <ui-icon-main-navigation-panel
+              :name="item2.iconName"
+              width="20px"
+              height="20px"
+            />
             <span class="nav-text">{{ item2.title }}</span>
           </nuxt-link>
           <div
@@ -151,17 +166,23 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
         &:hover {
           background-color: var(--vertical-nav-hover-bg-color);
+
+          .pin-unpin-label {
+            color: #008fd6;
+          }
         }
 
         input {
           display: none;
         }
-        label {
+        .pin-unpin-label {
           color: var(--vertical-nav-item-color);
           font-size: 12px;
           font-weight: 500;
 
-          span {
+          .pin-unpin-text {
+            font-size: 12px;
+            font-weight: 500;
             margin-left: 6px;
           }
         }
@@ -178,6 +199,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
         &:hover {
           background-color: var(--vertical-nav-hover-bg-color);
+          color: #008fd6;
         }
       }
     }
@@ -212,6 +234,8 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
         .nav-text {
           margin-left: 12px;
+          font-size: 14px;
+          font-weight: 400;
         }
       }
       .nav-link + .nav-link {
@@ -231,14 +255,14 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
 <style>
 :root.is-new-view {
-  --vertical-nav-bg-color: rgba(233, 235, 237, 0.96);
+  --vertical-nav-bg-color: rgba(233, 235, 237, 0.92);
   --vertical-nav-item-color: #4d5d69;
-  --vertical-nav-hover-bg-color: #d3d6da;
+  --vertical-nav-hover-bg-color: rgba(211, 214, 218, 0.48);
   --vertical-active-nav-bg-color: #213444;
   --vertical-active-nav-color: #ffffff;
 }
 :root.is-new-view.dark-theme {
-  --vertical-nav-bg-color: rgba(33, 52, 68, 0.96);
+  --vertical-nav-bg-color: rgba(51, 68, 83, 0.92);
   --vertical-nav-item-color: #ffffff;
   --vertical-nav-hover-bg-color: #485865;
   --vertical-active-nav-bg-color: rgba(233, 235, 237, 0.96);

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

@@ -152,7 +152,15 @@ watch(
       newValue[0] === 'host' &&
       ['disk', 'network'].includes(newValue[1])
     ) {
-      items = props.currentItems
+      let newItems = [
+        {
+          id: 'total',
+          target_object: localization.value.common.total,
+        },
+      ]
+      newItems = [...newItems, ...props.currentItems]
+
+      items = newItems
     }
 
     bodyItems.value = table.bodyItems(items)

package/components/common/pages/hardwareHealth/historyTestimony/Graph.vue

@@ -34,7 +34,7 @@
         :data="powerDataLocal"
         :update="updatePowerHelper"
         :chart="powerChart"
-        :selected-row="props.mainSelectedRow"
+        :selected-row="selectedRowPower"
       />
       <div v-else-if="props.powerLoading" class="graphic-loader-block">
         <div class="spinner"></div>
@@ -47,7 +47,7 @@
         :data="temperatureDataLocal"
         :update="updateTemperatureHelper"
         :chart="temperatureChart"
-        :selected-row="props.mainSelectedRow"
+        :selected-row="selectedRowTemperature"
       />
       <div v-else-if="props.temperatureLoading" class="graphic-loader-block">
         <div class="spinner"></div>
@@ -64,7 +64,7 @@ import type {
   I_LineGraph,
 } from '~/node_modules/bfg-nuxt-3-graph/graph/lib/models/interfaces'
 import { graphDataFunc } from '~/node_modules/bfg-nuxt-3-graph/graph/lib/utils/renderGraph'
-import type { UI_I_OptionsForm } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/interfaces'
+import type { UI_I_OptionsForm } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Chart } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/lib/models/types'
 import type { UI_I_HardwareHealthSensors } from '~/components/common/pages/hardwareHealth/tableView/lib/models/interfaces'
@@ -84,10 +84,6 @@ const props = defineProps<{
   mainSelectedRow: number[]
 }>()
 
-const emits = defineEmits<{
-  (event: 'update:selected-timespan-type', value: string): void
-}>()
-
 const { $store }: any = useNuxtApp()
 
 const selectedChartOptionName = ref<string>('')
@@ -101,6 +97,32 @@ const customDateTo = ref<string>('')
 const customTimeFrom = ref<string>('')
 const customTimeTo = ref<string>('')
 
+const selectedRowPower = ref<number[]>([])
+const selectedRowTemperature = ref<number[]>([])
+const updateAllSelectedSelectedRow = (): void => {
+  selectedRowPower.value = []
+  selectedRowTemperature.value = []
+  props.mainSelectedRow.forEach((key) => {
+    const category = props.countersTableData[key].category.toLowerCase()
+
+    switch (category) {
+      case 'power':
+        selectedRowPower.value.push(key)
+        break
+      case 'temperature':
+        selectedRowTemperature.value.push(key)
+        break
+    }
+  })
+}
+watch(
+  () => props.mainSelectedRow,
+  () => {
+    updateAllSelectedSelectedRow()
+  },
+  { deep: true, immediate: true }
+)
+
 const unitsCount = ref<number>(0)
 const powerCountersTableData = ref<UI_I_HardwareHealthSensorsGraph[]>([])
 const temperatureCountersTableData = ref<UI_I_HardwareHealthSensorsGraph[]>([])
@@ -261,6 +283,7 @@ const tools = {
 }
 
 const onSubmitOptions = (data: UI_I_OptionsForm): void => {
+  selectedTimespanType.value = data.periodName
   updateSelectedCountersKeys(data.metric)
   if (data.metric === 'power')
     $store.dispatch(

package/components/common/pages/hardwareHealth/historyTestimony/tools/Tools.vue

@@ -212,8 +212,8 @@ const onUpdateTools = (): void => {
     : ''
   const validPeriodData = getValidDateByOptionFunc(
     periodValue,
-    null,
-    null,
+    selectedValue,
+    props.unitsCount,
     null
   )
 

package/lib/models/interfaces.ts

@@ -30,6 +30,7 @@ export interface UI_I_Localization {
   inventoryMonitor: UI_I_ArbitraryObject<string>
   inventoryTabs: UI_I_ArbitraryObject<string>
   snapshots: UI_I_ArbitraryObject<string>
+  importVms: UI_I_ArbitraryObject<string>
 }
 export interface UI_I_SendTaskParams {
   method: string

package/package.json

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