bfg-common 1.4.197 → 1.4.199

package/assets/localization/local_be.json

@@ -2625,6 +2625,9 @@
     "zabbixVersions": "Zabbix версіі",
     "zabbixVersionsDesc": "Калі ласка, абярыце версію сервера Zabbix, на якой вы хочаце ўвайсці: 5.0 або 6.0.",
     "logoutConfirmation": "Пацвярджэнне выхаду",
-    "logoutDescription": "Вы ўпэўнены, што хочаце выйсці з Zabbix Server?"
+    "logoutDescription": "Вы ўпэўнены, што хочаце выйсці з Zabbix Server?",
+    "vmDisk": "Дыск ВМ",
+    "vmMemory": "Памяць ВМ",
+    "vmCpu": "Працэсар ВМ"
   }
 }

package/assets/localization/local_en.json

@@ -2629,6 +2629,9 @@
     "zabbixVersions": "Zabbix Versions",
     "zabbixVersionsDesc": "Please choose the Zabbix server version you would like to log in to: 5.0 or 6.0.",
     "logoutConfirmation": "Logout Confirmation",
-    "logoutDescription": "Are you sure you want to log out from Zabbix Server?"
+    "logoutDescription": "Are you sure you want to log out from Zabbix Server?",
+    "vmDisk": "VM Disk",
+    "vmMemory": "VM Memory",
+    "vmCpu": "VM Cpu"
   }
 }

package/assets/localization/local_hy.json

@@ -2629,6 +2629,9 @@
     "zabbixVersions": "Zabbix տարբերակները",
     "zabbixVersionsDesc": "Խնդրում ենք ընտրել Zabbix սերվերի տարբերակը, որում ցանկանում եք մուտք գործել՝ 5.0 կամ 6.0:",
     "logoutConfirmation": "Դուրս գալու հաստատում",
-    "logoutDescription": "Վստա՞հ եք, որ ցանկանում եք դուրս գալ Zabbix սերվերից:"
+    "logoutDescription": "Վստա՞հ եք, որ ցանկանում եք դուրս գալ Zabbix սերվերից:",
+    "vmDisk": "VM սկավառակ",
+    "vmMemory": "VM հիշողություն",
+    "vmCpu": "VM պրոցեսոր"
   }
 }

package/assets/localization/local_kk.json

@@ -2628,6 +2628,9 @@
     "zabbixVersions": "Zabbix нұсқалары",
     "zabbixVersionsDesc": "Жүйеге кіргіңіз келетін Zabbix сервер нұсқасын таңдаңыз: 5.0 немесе 6.0.",
     "logoutConfirmation": "Шығуды растау",
-    "logoutDescription": "Zabbix серверінен шынымен шыққыңыз келе ме?"
+    "logoutDescription": "Zabbix серверінен шынымен шыққыңыз келе ме?",
+    "vmDisk": "VM дискі",
+    "vmMemory": "VM жады",
+    "vmCpu": "VM Cpu"
   }
 }

package/assets/localization/local_ru.json

@@ -2631,6 +2631,9 @@
     "zabbixVersions": "Версии Забфикса",
     "zabbixVersionsDesc": "Пожалуйста, выберите версию сервера Zabbix, на которую вы хотите войти: 5.0 или 6.0.",
     "logoutConfirmation": "Подтверждение выхода из системы",
-    "logoutDescription": "Вы уверены, что хотите выйти из Zabbix Server?"
+    "logoutDescription": "Вы уверены, что хотите выйти из Zabbix Server?",
+    "vmDisk": "Диск ВМ",
+    "vmMemory": "Память ВМ",
+    "vmCpu": "Процессор ВМ"
   }
 }

package/assets/localization/local_zh.json

@@ -2627,6 +2627,9 @@
     "zabbixVersions": "Zabbix 版本",
     "zabbixVersionsDesc": "请选择您要登录的Zabbix服务器版本：5.0或6.0。",
     "logoutConfirmation": "退出确认",
-    "logoutDescription": "您确定要从 Zabbix Server 注销吗？"
+    "logoutDescription": "您确定要从 Zabbix Server 注销吗？",
+    "vmDisk": "虚拟机磁盘",
+    "vmMemory": "虚拟机内存",
+    "vmCpu": "虚拟机CPU"
   }
 }

package/components/atoms/DiagramIcon.vue

@@ -356,6 +356,35 @@
       </g>
     </svg>
   </template>
+  <template v-else-if="props.name === 'adapter-error'">
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      fill="#f84e30"
+      version="1.1"
+      class="has-solid"
+      preserveAspectRatio="xMidYMid meet"
+      focusable="false"
+      role="img"
+      viewBox="3 3 30 30"
+    >
+      <path
+        class="clr-i-outline clr-i-outline-path-1"
+        d="M18,6A12,12,0,1,0,30,18,12,12,0,0,0,18,6Zm0,22A10,10,0,1,1,28,18,10,10,0,0,1,18,28Z"
+      />
+      <path
+        class="clr-i-outline clr-i-outline-path-2"
+        d="M18,20.07a1.3,1.3,0,0,1-1.3-1.3v-6a1.3,1.3,0,1,1,2.6,0v6A1.3,1.3,0,0,1,18,20.07Z"
+      />
+      <circle
+        class="clr-i-outline clr-i-outline-path-3"
+        cx="17.95"
+        cy="23.02"
+        r="1.5"
+      />
+    </svg>
+  </template>
+  <template v-else><span></span></template>
 </template>
 
 <script setup lang="ts">

package/components/common/diagramMain/adapter/AdapterItem.vue

@@ -40,7 +40,7 @@
     </foreignObject>
 
     <foreignObject
-      v-if="!props.adapter.carrier"
+      v-if="!props.adapter.carrier && props.adapter.status !== 'error'"
       data-title="adapter-connection-icon"
       width="18"
       height="18"
@@ -50,6 +50,17 @@
       <atoms-diagram-icon name="adapter-carrier" />
     </foreignObject>
 
+    <foreignObject
+      v-if="props.adapter.status === 'error'"
+      data-title="adapter-connection-icon"
+      width="15"
+      height="15"
+      x="447"
+      :y="adapterSelectionPosition"
+    >
+      <atoms-diagram-icon name="adapter-error" />
+    </foreignObject>
+
     <common-diagram-main-highlights
       data-title="adapter-item-line"
       type="line-orange"
@@ -76,6 +87,7 @@
     </foreignObject>
 
     <foreignObject
+      v-if="props.adapter.status !== 'error'"
       data-title="adapter-action-icon"
       width="18"
       height="18"
@@ -97,7 +109,7 @@
     </foreignObject>
 
     <foreignObject
-      v-if="props.adapter.carrier"
+      v-if="props.adapter.carrier && props.adapter.status !== 'error'"
       data-title="adapter-second-connected-icon"
       width="18"
       height="18"
@@ -110,7 +122,7 @@
     </foreignObject>
 
     <foreignObject
-      v-else
+      v-if="!props.adapter.carrier && props.adapter.status !== 'error'"
       data-title="adapter-second-not-connected-icon"
       width="18"
       height="18"
@@ -127,6 +139,7 @@
 <script setup lang="ts">
 import {
   UI_I_Adapter,
+  UI_I_AdapterWithError,
   UI_I_ModalsInitialData,
   UI_I_SelectedAdapter,
   UI_I_SelectedPort,
@@ -137,7 +150,7 @@ import { adapterPopupFieldsFunc } from '~/components/common/diagramMain/modals/l
 import { dataForSelectedAdapterFunc } from '~/components/common/diagramMain/lib/config'
 
 const props = defineProps<{
-  adapter: UI_I_Adapter & { adapterPosition: number }
+  adapter: (UI_I_Adapter | UI_I_AdapterWithError) & { adapterPosition: number }
   selectedPort: UI_I_SelectedPort
   selectedAdapter: UI_I_SelectedAdapter
   networksWithPositions: UI_I_NetworksWithPositions[]

package/components/common/diagramMain/lib/models/interfaces.ts

@@ -41,7 +41,7 @@ export interface UI_I_Adapter {
 
 export interface UI_I_PhysicalAdapters {
   toggle: boolean
-  adapters: UI_I_Adapter[]
+  adapters: (UI_I_Adapter | UI_I_AdapterWithError)[]
 }
 export interface UI_I_MainRectHeights {
   networksHeight: number
@@ -341,6 +341,11 @@ export interface UI_I_AdapterStatus {
   inherit?: boolean
 }
 
+export interface UI_I_AdapterNameWithStatus {
+  adapterName: string
+  status: string
+}
+
 export interface UI_I_SwitchPropertiesFields {
   mtu: number
   num_ports: string
@@ -445,6 +450,18 @@ export interface UI_I_ModalsInitialData<T = string | number | boolean> {
   tcpIp?: string
 }
 
+export interface UI_I_AdapterWithError {
+  name: string
+  id: string
+  testId: string
+  fullName: string
+  state: UI_I_State
+  carrier: boolean
+  networks: string[]
+  switch: string
+  status: string
+}
+
 export interface UI_I_SwitchAdapterItem {
   name: string
   id: string
@@ -466,6 +483,12 @@ export interface UI_I_SwitchAdapterItem {
   mac: string
 }
 
+export interface UI_I_AvailableAdapters {
+  activeAdapters: string[]
+  standbyAdapters: string[]
+  unusedAdapters: string[]
+}
+
 export interface API_UI_I_SwitchAdapterItem {
   id: string
   state: UI_I_State

package/components/common/diagramMain/lib/models/types.ts

@@ -1,4 +1,7 @@
-import type { UI_I_Adapter } from '~/components/common/diagramMain/lib/models/interfaces'
+import type {
+  UI_I_Adapter,
+  UI_I_AdapterWithError,
+} from '~/components/common/diagramMain/lib/models/interfaces'
 
 export type UI_T_AdapterStatusNames = 'active' | 'standby' | 'unused'
 export type UI_T_PropertiesFieldName = 'vlanId' | 'networkLabel'
@@ -13,4 +16,6 @@ export type UI_T_LoadBalancingMode =
 export type UI_T_IYN = 'inherit' | 'yes' | 'no'
 export type UI_T_Carier = 'inherit' | 'carier' | 'beakon'
 
-export type UI_T_Adapters = UI_I_Adapter & { adapterPosition: number }
+export type UI_T_Adapters = (UI_I_Adapter | UI_I_AdapterWithError) & {
+  adapterPosition: number
+}