bfg-common 1.4.198 → 1.4.200

package/assets/localization/local_be.json

@@ -2628,6 +2628,15 @@
     "logoutDescription": "Вы ўпэўнены, што хочаце выйсці з Zabbix Server?",
     "vmDisk": "Дыск ВМ",
     "vmMemory": "Памяць ВМ",
-    "vmCpu": "Працэсар ВМ"
+    "vmCpu": "Працэсар ВМ",
+    "createdHosts": "Створаны хасты",
+    "availableZabbixServer": "Даступна на серверы Zabbix",
+    "addNew": "Дадаць новы",
+    "main": "Асноўны",
+    "useIp": "Выкарыстоўвайце IP",
+    "ip": "IP",
+    "hostIp": "IP хаста",
+    "groupId": "ID групы",
+    "editHost": "Рэдагаваць хост"
   }
 }

package/assets/localization/local_en.json

@@ -2632,6 +2632,15 @@
     "logoutDescription": "Are you sure you want to log out from Zabbix Server?",
     "vmDisk": "VM Disk",
     "vmMemory": "VM Memory",
-    "vmCpu": "VM Cpu"
+    "vmCpu": "VM Cpu",
+    "createdHosts": "Created Hosts",
+    "availableZabbixServer": "Available in Zabbix Server",
+    "addNew": "Add New",
+    "main": "Main",
+    "useIp": "Use IP",
+    "ip": "IP",
+    "hostIp": "Host IP",
+    "groupId": "Group ID",
+    "editHost": "Edit Host"
   }
 }

package/assets/localization/local_hy.json

@@ -2632,6 +2632,15 @@
     "logoutDescription": "Վստա՞հ եք, որ ցանկանում եք դուրս գալ Zabbix սերվերից:",
     "vmDisk": "VM սկավառակ",
     "vmMemory": "VM հիշողություն",
-    "vmCpu": "VM պրոցեսոր"
+    "vmCpu": "VM պրոցեսոր",
+    "createdHosts": "Ստեղծված Հոսթեր",
+    "availableZabbixServer": "Հասանելի է Zabbix սերվերում",
+    "addNew": "Ավելացնել նոր",
+    "main": "Հիմնական",
+    "useIp": "Օգտագործվող IP",
+    "ip": "IP",
+    "hostIp": "Հոսթի IP",
+    "groupId": "Խմբի ID",
+    "editHost": "Խմբագրել Հոսթ"
   }
 }

package/assets/localization/local_kk.json

@@ -2631,6 +2631,15 @@
     "logoutDescription": "Zabbix серверінен шынымен шыққыңыз келе ме?",
     "vmDisk": "VM дискі",
     "vmMemory": "VM жады",
-    "vmCpu": "VM Cpu"
+    "vmCpu": "VM Cpu",
+    "createdHosts": "Жасалған хосттар",
+    "availableZabbixServer": "Zabbix серверінде қол жетімді",
+    "addNew": "Жаңа қосу",
+    "main": "Негізгі",
+    "useIp": "IP пайдаланыңыз",
+    "ip": "IP",
+    "hostIp": "Хост IP",
+    "groupId": "Топ идентификаторы",
+    "editHost": "Хостты өңдеу"
   }
 }

package/assets/localization/local_ru.json

@@ -2634,6 +2634,15 @@
     "logoutDescription": "Вы уверены, что хотите выйти из Zabbix Server?",
     "vmDisk": "Диск ВМ",
     "vmMemory": "Память ВМ",
-    "vmCpu": "Процессор ВМ"
+    "vmCpu": "Процессор ВМ",
+    "createdHosts": "Созданные хосты",
+    "availableZabbixServer": "Доступно на Zabbix сервере",
+    "addNew": "Добавить",
+    "main": "Основной",
+    "useIp": "Использовать IP",
+    "ip": "IP",
+    "hostIp": "IP-адрес хоста",
+    "groupId": "Идентификатор группы",
+    "editHost": "Изменить хост"
   }
 }

package/assets/localization/local_zh.json

@@ -2630,6 +2630,15 @@
     "logoutDescription": "您确定要从 Zabbix Server 注销吗？",
     "vmDisk": "虚拟机磁盘",
     "vmMemory": "虚拟机内存",
-    "vmCpu": "虚拟机CPU"
+    "vmCpu": "虚拟机CPU",
+    "createdHosts": "创建的主机",
+    "availableZabbixServer": "在 Zabbix 服务器中可用",
+    "addNew": "添加新内容",
+    "main": "主要的",
+    "useIp": "使用IP",
+    "ip": "IP",
+    "hostIp": "主机IP",
+    "groupId": "组号",
+    "editHost": "编辑主机"
   }
 }

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
+}

package/components/common/diagramMain/lib/utils/utils.ts

@@ -1,3 +1,4 @@
+import type { UI_I_ItemsWithTotalCounts } from '~/lib/models/interfaces'
 import type {
   UI_I_Network,
   UI_I_SelectedPort,
@@ -10,6 +11,9 @@ import type {
   UI_I_AdaptersPositions,
   UI_I_AdapterStatus,
   API_UI_I_SwitchItem,
+  UI_I_AvailableAdapters,
+  UI_I_SwitchAdapterItem,
+  UI_I_AdapterWithError,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import type { UI_T_Adapters } from '~/components/common/diagramMain/lib/models/types'
 import {
@@ -276,3 +280,52 @@ export const makeSwitchSendData = (
     },
   }
 }
+
+export const getAvailableAdapters = (
+  nics: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>,
+  networkOrSwitchNics: UI_I_AdapterStatus
+): UI_I_AvailableAdapters => {
+  const availableAdapters: UI_I_AvailableAdapters = {
+    activeAdapters: [],
+    standbyAdapters: [],
+    unusedAdapters: [],
+  }
+
+  if (nics?.items) {
+    networkOrSwitchNics?.active?.forEach(
+      (nic) =>
+        nics?.items.find(
+          (a: UI_I_SwitchAdapterItem): boolean => a.id === nic
+        ) && availableAdapters.activeAdapters.push(nic)
+    )
+    networkOrSwitchNics?.standby?.forEach(
+      (nic) =>
+        nics?.items.find(
+          (a: UI_I_SwitchAdapterItem): boolean => a.id === nic
+        ) && availableAdapters.standbyAdapters.push(nic)
+    )
+    networkOrSwitchNics?.unused?.forEach(
+      (nic) =>
+        nics?.items.find(
+          (a: UI_I_SwitchAdapterItem): boolean => a.id === nic
+        ) && availableAdapters.unusedAdapters.push(nic)
+    )
+  }
+
+  return availableAdapters
+}
+
+export const createAdapterWithError = (
+  nic: string,
+  switchId: string
+): UI_I_AdapterWithError => ({
+  fullName: nic,
+  id: nic,
+  name: nic,
+  networks: [],
+  state: { state: 1, errors: [] },
+  switch: switchId,
+  testId: `adapter-${nic}`,
+  carrier: false,
+  status: 'error',
+})

package/components/common/diagramMain/modals/editSettings/tabs/NetworkProperties.vue

@@ -93,7 +93,7 @@ import type {
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import type { UI_T_PropertiesFieldName } from '~/components/common/diagramMain/lib/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/lib/utils'
-import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config'
+import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config/config'
 
 // Props from up
 const props = withDefaults(

package/components/common/diagramMain/modals/migrateVmkernelAdapter/steps/ConnectionSettings.vue

@@ -94,7 +94,7 @@ import type {
 } from '~/lib/models/interfaces'
 import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
-import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config'
+import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config/config'
 import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {
   validateNetworkConnectionSettingsLocal,

package/components/common/wizards/network/add/Add.vue

@@ -128,14 +128,16 @@ import {
   UI_I_SwitchAdapterItem,
   UI_I_DiagramData,
   API_UI_I_SwitchItem,
+  UI_I_AvailableAdapters,
 } from '~/components/common/diagramMain/lib/models/interfaces'
+import { getAvailableAdapters } from '~/components/common/diagramMain/lib/utils/utils'
 import {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
   UI_I_WizardStepNavigation,
 } from '~/components/atoms/wizard/lib/models/interfaces'
 import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
-import { getVlanId } from '~/components/common/wizards/network/add/lib/utils'
+import { getVlanId } from '~/components/common/wizards/network/add/lib/utils/utils'
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {
   createZeroSchemeReadyCompleteFunc,
@@ -152,7 +154,7 @@ import {
   addNetworkingZeroOrFirstSchemeDataFunc,
   addNetworkingSecondOrThirdSchemeDataFunc,
   addNetworkingFourthOrFifthSchemeDataFunc,
-} from '~/components/common/wizards/network/add/lib/config'
+} from '~/components/common/wizards/network/add/lib/config/config'
 import {
   checkTargetDeviceSync,
   checkAdaptersSync,
@@ -310,7 +312,10 @@ let flagSwitch = ''
 // Choosing Scheme
 watch(
   [connectionTypeLocal, targetDevice],
-  (newValues, oldValues) => {
+  (
+    newValues: [string, UI_I_TargetDevice],
+    oldValues: [string, UI_I_TargetDevice]
+  ) => {
     const newCT = newValues[0] // -> newConnectionType
     const oldCT = oldValues[0] // -> oldConnectionType
     const newTD = newValues[1] // -> newTargetDevice
@@ -366,14 +371,20 @@ watch(
       onGetTcpStacks()
     }
     if (newSelectedStep === 6 && flagSwitch !== targetDevice.value.switch) {
-      const nics = props.standardSwitchesInitial.find(
+      const nics: UI_I_AdapterStatus = props.standardSwitchesInitial.find(
         (currentSwitch: UI_I_Switch) =>
           currentSwitch.id === targetDevice.value.switch
       ).nics
+
+      const availableAdapters: UI_I_AvailableAdapters = getAvailableAdapters(
+        props.adapters,
+        nics
+      )
+
       adapterStatus.value = {
-        active: nics.active || [],
-        standby: nics.standby || [],
-        unused: nics.unused || [],
+        active: availableAdapters.activeAdapters || [],
+        standby: availableAdapters.standbyAdapters || [],
+        unused: availableAdapters.unusedAdapters || [],
       }
       coreAdapters.value = [
         ...adapterStatus.value.active,

package/components/common/wizards/network/add/modals/SelectNetwork.vue

@@ -67,7 +67,7 @@ import type {
   UI_I_NetworkForAdding,
   UI_I_SelectedNetwork,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import { selectStandardSwitchTableHeadFunc } from '~/components/common/wizards/network/add/lib/config'
+import { selectStandardSwitchTableHeadFunc } from '~/components/common/wizards/network/add/lib/config/config'
 
 const props = withDefaults(
   defineProps<{

package/components/common/wizards/network/add/modals/SelectStandardSwitch.vue

@@ -51,7 +51,7 @@ import type {
   UI_I_SelectedSwitch,
   UI_I_BodyItems,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import { selectStandardSwitchTableHeadFunc } from '~/components/common/wizards/network/add/lib/config'
+import { selectStandardSwitchTableHeadFunc } from '~/components/common/wizards/network/add/lib/config/config'
 
 interface I_SelectSwitchModalProps {
   show: boolean

package/components/common/wizards/network/add/modals/SelectSwitch.vue

@@ -51,7 +51,7 @@ import type {
   UI_I_SelectedSwitch,
   UI_I_BodyItems,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import { selectSwitchTableHeadFunc } from '~/components/common/wizards/network/add/lib/config'
+import { selectSwitchTableHeadFunc } from '~/components/common/wizards/network/add/lib/config/config'
 
 interface I_SelectSwitchModalProps {
   show: boolean

package/components/common/wizards/network/add/steps/ConnectionSettings.vue

@@ -93,7 +93,7 @@ import type {
   UI_I_Localization,
 } from '~/lib/models/interfaces'
 import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config'
+import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config/config'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {

package/components/common/wizards/network/add/steps/PortProperties.vue

@@ -226,7 +226,7 @@ import {
   servicesInitial,
   vlanIdSelectData,
   portPropertiesEnabledServicesFunc,
-} from '~/components/common/wizards/network/add/lib/config'
+} from '~/components/common/wizards/network/add/lib/config/config'
 import type {
   UI_I_PortProperties,
   UI_I_TCPStack,

package/package.json

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