bfg-common 1.3.296 → 1.3.298

package/components/common/diagramMain/Diagram.vue

@@ -11,14 +11,15 @@
       @click.capture="onClickDiagram"
     >
       <common-diagram-main-switch
-        :networks-count="props.networksWithPositions.length"
+        :networks-count="networksCount"
         :main-rect-height="props.mainRectHeight"
         :main-switch-line="props.mainSwitchLine"
         :selected-main-line="props.selectedMainLine"
         :is-visible-line="hasActiveAdapter"
+        :is-selected-linked-with-adapter="isSelectedLinkedWithAdapter"
       />
       <common-diagram-main-adapter
-        :networks-count="props.networksWithPositions.length"
+        :networks-count="networksCount"
         :adapters-with-positions="props.adaptersWithPositions"
         :selected-main-line="props.selectedMainLine"
         :selected-port="props.selectedPort"
@@ -27,6 +28,7 @@
         :is-visible-line="hasActiveAdapter"
         :is-dark-mode="props.isDarkMode"
         :test-id="props.diagramData.testId"
+        :is-selected-linked-with-adapter="isSelectedLinkedWithAdapter"
         @toggle-adapters="onToggleAdapters"
         @select-adapter="onSelectAdapter"
         @show-modal="onShowModal"
@@ -56,7 +58,7 @@
       <common-diagram-main-network-no-network v-else />
       <common-diagram-main-switch-selected
         :selected-switch-line-y="props.selectedSwitchLineY"
-        :is-visible-line="hasActiveAdapter"
+        :is-visible-line="hasActiveAdapter && isSelectedLinkedWithAdapter"
       />
     </svg>
   </div>
@@ -143,6 +145,51 @@ const hasActiveAdapter = computed<boolean>(() => {
   ).length
 })
 
+const isSelectedLinkedWithAdapter = computed<boolean>(() => {
+  if (props.selectedNetwork && props.selectedNetwork !== '-1') {
+    const selectedNetworkData = props.networksWithPositions.find(
+      (network: UI_I_NetworksWithPositions) =>
+        network.id === props.selectedNetwork
+    )
+
+    if (!selectedNetworkData) return false
+
+    return (
+      selectedNetworkData.activeAdapters.length > 0 &&
+      selectedNetworkData.state.state !== 3
+    )
+  }
+
+  if (props.selectedPort.portId && props.selectedPort.portId !== '-1') {
+    const selectedNetworkData = props.networksWithPositions.find(
+      (network: UI_I_NetworksWithPositions) =>
+        network.id === props.selectedPort.networkId
+    )
+
+    if (!selectedNetworkData) return false
+
+    return (
+      selectedNetworkData.activeAdapters.length > 0 &&
+      selectedNetworkData.state.state !== 3
+    )
+  }
+
+  if (props.selectedAdapter.adapterId !== '-1' || props.selectedMainLine) {
+    return true
+  }
+
+  return false
+})
+
+const networksCount = computed<number>(
+  () =>
+    props.networksWithPositions.filter(
+      (networkWithPositions: UI_I_NetworksWithPositions) =>
+        networkWithPositions.activeAdapters.length > 0 &&
+        networkWithPositions.state.state !== 3
+    ).length
+)
+
 const onClickDiagram = (ev: MouseEvent) => emits('click-diagram', ev)
 const onToggleAdapters = () => emits('toggle-adapters')
 const onSelectAdapter = (adapterId: string) =>

package/components/common/diagramMain/DiagramMain.vue

@@ -256,7 +256,6 @@ import {
   UI_I_PortToggleFlag,
   UI_I_DiagramData,
   UI_I_SwitchAdapterItem,
-  API_UI_I_SwitchItem,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import {
   UI_I_ArbitraryObject,
@@ -264,12 +263,10 @@ import {
   UI_I_ItemsWithTotalCounts,
 } from '~/lib/models/interfaces'
 import {
-  UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
-  UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
-  UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
   UI_I_Switch,
   UI_I_TCPStack,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import { UI_T_EditData } from '~/components/common/wizards/network/add/lib/models/type'
 import {
   adapterViewSettingsFunc,
   adapterViewSettingsModalTabsFunc,
@@ -357,11 +354,7 @@ watch(
 )
 
 const onValidateBeforeSending = (
-  data:
-    | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-    | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
-    | API_UI_I_SwitchItem,
+  data: UI_T_EditData,
   type: string,
   setValidation: (messages: UI_I_ArbitraryObject<string>) => void
 ) => {
@@ -579,7 +572,6 @@ const onRemove = (id: string, type: string) => {
       : onHidePortRemoveModal
   emits('remove', id, type, hideModal)
 }
-
 const onChangeEditFieldsData = (newEditFieldsData: UI_I_EditFieldsData) => {
   emits('change-edit-fields-data', newEditFieldsData)
 }
@@ -599,11 +591,7 @@ const onGetFreeAdapters = (showModal: () => void) => {
   emits('get-free-adapters', showModal)
 }
 const onSendNetworkData = (
-  data:
-    | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-    | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
-    | API_UI_I_SwitchItem,
+  data: UI_T_EditData,
   type: string,
   hideModal: () => void
 ) => {
@@ -635,6 +623,7 @@ const selectedAdapter = ref<UI_I_SelectedAdapter>(
   useDeepCopy(selectedAdapterInitial)
 )
 const selectedNetwork = ref<string>('-1')
+
 const selectedSwitchLineY = ref<UI_I_SwitchLine>(
   useDeepCopy(selectedSwitchLineYInitial)
 )
@@ -650,6 +639,12 @@ const countNetworksPositions = (): UI_I_NetworksWithPositions[] => {
   let lastPosition = UI_E_PositionsY.DIAGRAM_TOP + UI_E_PositionsY.BETWEEN_RECTS
   mainRectHeights.value.networksHeight =
     UI_E_PositionsY.DIAGRAM_TOP + UI_E_PositionsY.BETWEEN_RECTS
+
+  const lastIndex = props.diagramData?.networks.findLastIndex(
+    (network: UI_I_Network) =>
+      network.activeAdapters.length > 0 && network.state.state !== 3
+  )
+
   return (
     props.diagramData?.networks?.map(
       (network: UI_I_Network, index: number, networks: UI_I_Network[]) => {
@@ -693,9 +688,9 @@ const countNetworksPositions = (): UI_I_NetworksWithPositions[] => {
             'Virtual Machines') ||
           ''
 
-        index === 0 && (switchLine.value.y1 = connectLineY)
-        networks &&
-          index === networks.length - 1 &&
+        lastIndex !== -1 && index === 0 && (switchLine.value.y1 = connectLineY)
+        lastIndex !== -1 &&
+          index === lastIndex &&
           (switchLine.value.y2 = connectLineY)
 
         mainRectHeights.value.networksHeight +=
@@ -826,12 +821,12 @@ const onSelectNetwork = (networkId: string): void => {
 
 const onSelectAdapter = (adapterId: string): void => {
   const selectedNetworks: UI_I_NetworksWithPositions[] =
-    networksWithPositions.value?.filter((network: UI_I_NetworksWithPositions) =>
-      network.activeAdapters.includes(adapterId)
+    networksWithPositions.value?.filter(
+      (network: UI_I_NetworksWithPositions) =>
+        network.activeAdapters.includes(adapterId) && network.state.state !== 3
     )
 
   let pos: number[] = selectedNetworks?.reduce(networksPositions, [])
-
   let selectedAdapterPosition: number | null =
     adaptersWithPositions.value.adapters?.find((ad) => ad.id === adapterId)
       ?.adapterPosition || null
@@ -879,21 +874,13 @@ const emits = defineEmits<{
   (event: 'get-existing-standard-switches'): void
   (
     event: 'send-add-networking-data',
-    data:
-      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
-      | API_UI_I_SwitchItem,
+    data: UI_T_EditData,
     type: string,
     hideModal: () => void
   ): void
   (
     event: 'add-networking-data-validate',
-    data:
-      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
-      | API_UI_I_SwitchItem,
+    data: UI_T_EditData,
     type: string,
     setValidation: (message: UI_I_ArbitraryObject<string>) => void
   ): void
@@ -941,12 +928,9 @@ const onTogglePorts = (
 const handlePortToggle = () => {
   selectedPort.value.portId !== '-1' &&
     onSelectPort(selectedPort.value.networkId, selectedPort.value.portId)
-
   selectedAdapter.value.adapterId !== '-1' &&
     onSelectAdapter(selectedAdapter.value.adapterId)
-
   selectedNetwork.value !== '-1' && onSelectNetwork(selectedNetwork.value)
-
   hasPortAndNetwork(selectedPort.value, isPortToggled.value.id) &&
     resetSelection()
 
@@ -958,7 +942,6 @@ const handlePortToggle = () => {
 
 const onToggleAdapters = (): void => {
   const newState = !adaptersWithPositions.value.toggle
-
   const payload: Omit<UI_I_ToggleDiagramAdaptersPayload, 'paths'> = {
     isToggle: newState,
     diagramId: props.diagramData?.id || '',
@@ -968,9 +951,7 @@ const onToggleAdapters = (): void => {
 
   selectedPort.value.portId !== '-1' &&
     onSelectPort(selectedPort.value.networkId, selectedPort.value.portId)
-
   selectedAdapter.value.adapterId !== '-1' && resetSelection()
-
   selectedNetwork.value !== '-1' && onSelectNetwork(selectedNetwork.value)
 }
 
@@ -1001,8 +982,6 @@ const onClickDiagram = (ev: MouseEvent): void => {
 </style>
 <style lang="scss">
 .diagram-main-actions__popup.navbar-dropdown-menu {
-  //transform: translate(-40px, -10px);
-  //width: 360px;
   .btn {
     border-radius: 3px;
     border-bottom: none;

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

@@ -53,6 +53,7 @@ const props = defineProps<{
   selectedPort: UI_I_SelectedPort
   selectedAdapter: UI_I_SelectedAdapter
   selectedNetwork: string
+  isSelectedLinkedWithAdapter: boolean
   isVisibleLine: boolean
   networksCount: number
   isDarkMode: boolean
@@ -77,6 +78,7 @@ const isHighlightedOptimizePart = computed(
 
 const isHighlightedAdapterLine = computed<boolean>(
   () =>
+    props.isSelectedLinkedWithAdapter &&
     !(
       isHighlightedOptimizePart.value &&
       !hasNoAdaptersAndNoSelectedNetwork.value
@@ -85,6 +87,7 @@ const isHighlightedAdapterLine = computed<boolean>(
 
 const isHighlightedClosedAdapterBlock = computed<boolean>(
   () =>
+    props.isSelectedLinkedWithAdapter &&
     !(
       isHighlightedOptimizePart.value &&
       !(hasNoAdaptersAndNoSelectedNetwork.value && props.isVisibleLine)

package/components/common/diagramMain/lib/config/index.ts

@@ -55,17 +55,9 @@ export const mode: UI_T_LoadBalancingMode[] = [
   'balance-tcp',
 ]
 
-export const iyn: UI_T_IYN[] = [
-  'inherit',
-  'yes',
-  'no',
-]
+export const iyn: UI_T_IYN[] = ['inherit', 'yes', 'no']
 
-export const carier: UI_T_Carier[] = [
-  'inherit',
-  'carier',
-  'beakon',
-]
+export const carier: UI_T_Carier[] = ['inherit', 'carier', 'beakon']
 
 export const {
   managePhysicalAdapterStatusInitial,
@@ -74,4 +66,5 @@ export const {
   selectedPortInitial,
   selectedAdapterInitial,
   selectedSwitchLineYInitial,
+  NETWORK_POSITIONS,
 } = initial

package/components/common/diagramMain/lib/config/initial.ts

@@ -1,7 +1,10 @@
 import {
   UI_I_AdapterStatus,
-  UI_I_MainRectHeights, UI_I_SelectedAdapter, UI_I_SelectedPort,
-  UI_I_SwitchLine
+  UI_I_MainRectHeights,
+  UI_I_SelectedAdapter,
+  UI_I_SelectedPort,
+  UI_I_SwitchLine,
+  UI_I_NetworkPositionsConst,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
 export const managePhysicalAdapterStatusInitial: UI_I_AdapterStatus = {
@@ -36,3 +39,12 @@ export const selectedSwitchLineYInitial: UI_I_SwitchLine = {
   y1: 0,
   y2: 0,
 }
+
+export const NETWORK_POSITIONS: UI_I_NetworkPositionsConst = {
+  EMPTY_PORTS_PADDING_BOTTOM: 7.5,
+  FROM_VLAN_ID_TO_GROUP_NAME: 22,
+  VMS_AND_PORTS_HEIGHT: 22,
+  V_CENTER_HEIGHT: 32,
+  BETWEEN_VMS_AND_PORTS: 7.5,
+  BETWEEN_V_CENTERS: 12.5,
+} as const

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

@@ -7,6 +7,7 @@ import {
   UI_E_ICBLinkDetectionMode,
   UI_E_IBSTLoadBalancingMode,
 } from '~/components/common/diagramMain/lib/models/enums'
+import { NETWORK_POSITIONS } from '#build/components/common/diagramMain/lib/config/initial'
 
 export interface UI_I_Port {
   id: string
@@ -147,6 +148,25 @@ export interface UI_I_Network extends UI_I_NetworkInfo {
   unusedAdapters?: string[]
   vlanId?: number | string
   testId: string
+  state: {
+    state: UI_E_State
+    errors?: string[]
+  }
+}
+
+export interface UI_I_NetworkWithError {
+  id: string
+  networkType: UI_E_NetworkType
+  ports?: UI_I_Port[]
+  sysx?: UI_I_Sysx
+  switchName: string
+  title: string
+  toggle: boolean
+  testId: string
+  state: {
+    state: UI_E_State
+    errors?: string[]
+  }
 }
 
 export interface UI_I_SwitchInfo extends UI_I_NetworkInfo {
@@ -694,3 +714,12 @@ export interface API_UI_I_Network {
   teaming: API_UI_I_Teaming
   nics: UI_I_AdapterStatus
 }
+
+export interface UI_I_NetworkPositionsConst {
+  readonly EMPTY_PORTS_PADDING_BOTTOM: 7.5
+  readonly FROM_VLAN_ID_TO_GROUP_NAME: 22
+  readonly VMS_AND_PORTS_HEIGHT: 22
+  readonly V_CENTER_HEIGHT: 32
+  readonly BETWEEN_VMS_AND_PORTS: 7.5
+  readonly BETWEEN_V_CENTERS: 12.5
+}

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

@@ -16,64 +16,91 @@ import {
   UI_E_PositionsY,
 } from '~/components/common/diagramMain/lib/models/enums'
 import { UI_T_Adapters } from '~/components/common/diagramMain/lib/models/types'
+import { NETWORK_POSITIONS } from '~/components/common/diagramMain/lib/config'
 
 export const hasPortAndNetwork = (
-    selectedPort: UI_I_SelectedPort,
-    id: string
+  selectedPort: UI_I_SelectedPort,
+  id: string
 ): boolean =>
-    selectedPort.portId !== '-1' &&
-    selectedPort.networkId !== '-1' &&
-    selectedPort.networkId === id
+  selectedPort.portId !== '-1' &&
+  selectedPort.networkId !== '-1' &&
+  selectedPort.networkId === id
 
 export const networksPositions = (
-    arr: number[],
-    net: UI_I_NetworksWithPositions
+  arr: number[],
+  net: UI_I_NetworksWithPositions
 ): number[] => {
   if (net.ports.length === 0) return [...arr, net.connectLineY]
-  if (!net.toggle) return [...arr, net.portsPosition + 7.5]
+  if (!net.toggle)
+    return [
+      ...arr,
+      net.portsPosition + NETWORK_POSITIONS.EMPTY_PORTS_PADDING_BOTTOM,
+    ]
 
   return [
     ...arr,
-    net.portsPosition + 22 + 7.5,
+    net.portsPosition +
+      NETWORK_POSITIONS.FROM_VLAN_ID_TO_GROUP_NAME +
+      NETWORK_POSITIONS.BETWEEN_VMS_AND_PORTS,
     net.networkType === UI_E_NetworkType.VCenter
-        ? net.portsPosition + 22 + 12.5 + 32 * (net.portsCount - 1)
-        : net.portsPosition + 22 + 7.5 + 22 * (net.portsCount - 1),
+      ? net.portsPosition +
+        NETWORK_POSITIONS.FROM_VLAN_ID_TO_GROUP_NAME +
+        NETWORK_POSITIONS.BETWEEN_V_CENTERS +
+        NETWORK_POSITIONS.V_CENTER_HEIGHT * (net.portsCount - 1)
+      : net.portsPosition +
+        NETWORK_POSITIONS.FROM_VLAN_ID_TO_GROUP_NAME +
+        NETWORK_POSITIONS.BETWEEN_VMS_AND_PORTS +
+        NETWORK_POSITIONS.VMS_AND_PORTS_HEIGHT * (net.portsCount - 1),
   ]
 }
 
 export const getSelectedPortLinePositions = (
-    selectedPortPosition: number | undefined,
-    selectedNetworkData: UI_I_Network
+  selectedPortPosition: number | undefined,
+  selectedNetworkData: UI_I_Network
 ) =>
-    selectedPortPosition
-        ? selectedNetworkData.networkType === UI_E_NetworkType.VCenter
-            ? selectedPortPosition + 12.5
-            : selectedPortPosition + 7.5
-        : 0
+  selectedPortPosition
+    ? selectedNetworkData.networkType === UI_E_NetworkType.VCenter
+      ? selectedPortPosition + 12.5
+      : selectedPortPosition + 7.5
+    : 0
 
 const selectedNetworkDataFunc = (
-    networkId: string,
-    networksWithPositions: UI_I_NetworksWithPositions[]
+  networkId: string,
+  networksWithPositions: UI_I_NetworksWithPositions[]
 ): UI_I_NetworksWithPositions | undefined =>
-    networksWithPositions?.find(
-        (network: UI_I_Network): boolean => network.id === networkId
-    )
+  networksWithPositions?.find(
+    (network: UI_I_Network): boolean => network.id === networkId
+  )
 
 export const getSelectNetworkDataFunc = (
-    networkId: string,
-    networksWithPositions: UI_I_NetworksWithPositions[],
-    adaptersWithPositions: UI_I_AdaptersWithPositions
+  networkId: string,
+  networksWithPositions: UI_I_NetworksWithPositions[],
+  adaptersWithPositions: UI_I_AdaptersWithPositions
 ): UI_I_SelectedSwitchPositions | undefined => {
   const selectedNetworkData: UI_I_NetworksWithPositions | undefined =
-      selectedNetworkDataFunc(networkId, networksWithPositions)
+    selectedNetworkDataFunc(networkId, networksWithPositions)
 
   if (!selectedNetworkData) return
 
+  if (selectedNetworkData.state.state === 3)
+    return {
+      selectedSwitchLineY: {
+        y1: 0,
+        y2: 0,
+      },
+      selectedPort: {
+        networkId,
+        portId: '-1',
+        activeAdapters: [],
+      },
+    }
+
   const activeAdapters: string[] = selectedNetworkData.activeAdapters
+
   const adaptersPositions: number[] =
-      adaptersWithPositions.adapters
-          ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
-          ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
+    adaptersWithPositions.adapters
+      ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
+      ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
   let selectedPositions: number[] = []
 
   if (!adaptersWithPositions.toggle) {
@@ -82,11 +109,11 @@ export const getSelectNetworkDataFunc = (
       selectedNetworkData.connectLineY,
     ]
   } else if (
-      adaptersWithPositions.adapters === null ||
-      adaptersWithPositions.adapters?.length === 0
+    adaptersWithPositions.adapters === null ||
+    adaptersWithPositions.adapters?.length === 0
   ) {
     selectedPositions = [47.5, selectedNetworkData.connectLineY].sort(
-        (y1: number, y2: number) => y1 - y2
+      (y1: number, y2: number) => y1 - y2
     )
   } else {
     selectedPositions = [
@@ -109,28 +136,28 @@ export const getSelectNetworkDataFunc = (
 }
 
 export const getSelectPortDataFunc = (
-    networkId: string,
-    portId: string,
-    networksWithPositions: UI_I_NetworksWithPositions[],
-    adaptersWithPositions: UI_I_AdaptersWithPositions
+  networkId: string,
+  portId: string,
+  networksWithPositions: UI_I_NetworksWithPositions[],
+  adaptersWithPositions: UI_I_AdaptersWithPositions
 ): UI_I_SelectedSwitchPositions | undefined => {
   const selectedNetworkData: UI_I_NetworksWithPositions | undefined =
-      selectedNetworkDataFunc(networkId, networksWithPositions)
+    selectedNetworkDataFunc(networkId, networksWithPositions)
 
   if (!selectedNetworkData) return
 
   const activeAdapters: string[] = selectedNetworkData.activeAdapters
   const adaptersPositions: number[] =
-      adaptersWithPositions.adapters
-          ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
-          ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
+    adaptersWithPositions.adapters
+      ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
+      ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
   const selectedPortPosition: number | undefined =
-      selectedNetworkData.ports.find(
-          (el): boolean => el.id === portId
-      )?.portPosition
+    selectedNetworkData.ports.find(
+      (el): boolean => el.id === portId
+    )?.portPosition
   const selectedPortLinePosition: number = getSelectedPortLinePositions(
-      selectedPortPosition,
-      selectedNetworkData
+    selectedPortPosition,
+    selectedNetworkData
   )
   let selectedPositions: number[] = []
 
@@ -142,7 +169,7 @@ export const getSelectPortDataFunc = (
     ]
   } else {
     selectedPositions = [...adaptersPositions, selectedPortLinePosition].sort(
-        (y1: number, y2: number) => y1 - y2
+      (y1: number, y2: number) => y1 - y2
     )
   }
 
@@ -160,55 +187,55 @@ export const getSelectPortDataFunc = (
 }
 
 export const countAdaptersHeight = (
-    diagramData: UI_I_DiagramData | null
+  diagramData: UI_I_DiagramData | null
 ): UI_I_AdaptersHeight => {
   const toggle: boolean = !!diagramData?.physicalAdapters?.toggle
   const adaptersCount: number =
-      diagramData?.physicalAdapters?.adapters.length || 0
+    diagramData?.physicalAdapters?.adapters.length || 0
 
   return {
     height:
-        UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
-        (adaptersCount === 0
-            ? UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
-            : toggle
-                ? adaptersCount * UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
-                : 0) +
-        UI_E_PositionsY.SPACE_FROM_RECT_BOTTOM,
+      UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
+      (adaptersCount === 0
+        ? UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
+        : toggle
+        ? adaptersCount * UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
+        : 0) +
+      UI_E_PositionsY.SPACE_FROM_RECT_BOTTOM,
     toggle,
     adaptersCount,
   }
 }
 
 export const getAdaptersPositions = (
-    diagramData: UI_I_DiagramData | null,
-    height: number
+  diagramData: UI_I_DiagramData | null,
+  height: number
 ): UI_I_AdaptersPositions => {
   const titlePosition: number =
-      UI_E_PositionsY.DIAGRAM_TOP +
-      UI_E_PositionsY.BETWEEN_RECTS +
-      UI_E_PositionsY.TITLE_FROM_RECT_TOP
+    UI_E_PositionsY.DIAGRAM_TOP +
+    UI_E_PositionsY.BETWEEN_RECTS +
+    UI_E_PositionsY.TITLE_FROM_RECT_TOP
 
   const rectPosition: number =
-      UI_E_PositionsY.DIAGRAM_TOP + UI_E_PositionsY.BETWEEN_RECTS
+    UI_E_PositionsY.DIAGRAM_TOP + UI_E_PositionsY.BETWEEN_RECTS
 
   const adaptersConnectLineY: number = rectPosition + height / 2
 
   const adapters: UI_T_Adapters[] | null =
-      diagramData?.physicalAdapters?.adapters.map(
-          (adapter: UI_I_Adapter, index: number) => {
-            const adapterPosition: number =
-                UI_E_PositionsY.DIAGRAM_TOP +
-                UI_E_PositionsY.BETWEEN_RECTS +
-                UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
-                UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT * index
-
-            return {
-              ...adapter,
-              adapterPosition,
-            }
-          }
-      ) || null
+    diagramData?.physicalAdapters?.adapters.map(
+      (adapter: UI_I_Adapter, index: number) => {
+        const adapterPosition: number =
+          UI_E_PositionsY.DIAGRAM_TOP +
+          UI_E_PositionsY.BETWEEN_RECTS +
+          UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
+          UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT * index
+
+        return {
+          ...adapter,
+          adapterPosition,
+        }
+      }
+    ) || null
 
   return {
     titlePosition,
@@ -219,8 +246,8 @@ export const getAdaptersPositions = (
 }
 
 export const makeSwitchSendData = (
-    data: UI_I_DiagramData,
-    adapterStatus: UI_I_AdapterStatus
+  data: UI_I_DiagramData,
+  adapterStatus: UI_I_AdapterStatus
 ): API_UI_I_SwitchItem | null => {
   if (!data.networking) return null
 

package/components/common/diagramMain/modals/lib/config/networkModal.ts

@@ -237,36 +237,36 @@ export const networkPopupFieldsFunc = (
   localization: UI_I_Localization,
   _networkType: string,
   testId: string,
+  state: number,
   inPortlet = false
 ) => {
-  const inPortletConfig = [
-    {
-      text: localization.viewSettings,
-      value: 'network-view-settings',
-      testId: `${testId}-view`,
-    },
-    // {
-    //   text: localization.editSettings,
-    //   value: 'network-edit-settings',
-    // },
-  ]
-  const notInPortletConfig = [
-    ...inPortletConfig,
-    {
-      text: localization.editSettings,
-      value: 'network-edit-settings',
-      testId: `${testId}-edit`,
-    },
-    { separate: true },
-    {
-      text: localization.remove,
-      value: 'network-port-remove',
-      testId: `${testId}-remove`,
-      // networkType === '1' ? 'network-vkernel-remove' : 'network-port-remove',
-    },
-  ]
+  const view = {
+    text: localization.viewSettings,
+    value: 'network-view-settings',
+    testId: `${testId}-view`,
+  }
+  const edit = {
+    text: localization.editSettings,
+    value: 'network-edit-settings',
+    testId: `${testId}-edit`,
+  }
+  const remove = {
+    text: localization.remove,
+    value: 'network-port-remove',
+    testId: `${testId}-remove`,
+    // networkType === '1' ? 'network-vkernel-remove' : 'network-port-remove',
+  }
 
-  return inPortlet ? inPortletConfig : notInPortletConfig
+  const inPortletConfig = [view]
+
+  const notInPortletConfig = [view, edit, { separate: true }, remove]
+  const notInPortletErrorConfig = [remove]
+
+  if (inPortlet) {
+    return state === 3 ? [] : inPortletConfig
+  } else {
+    return state === 3 ? notInPortletErrorConfig : notInPortletConfig
+  }
 }
 
 export const teamingAndFailoverTemplateMakerFunc = (

package/components/common/diagramMain/network/Block.vue

@@ -24,7 +24,8 @@
       :height="props.network.networkHeight"
       :y="props.network.rectPosition"
       :hide="
-        !props.selectedMainLine && !props.isNetworkConnectedSelectedAdapter
+        props.isCantBeHighlighted ||
+        (!props.selectedMainLine && !props.isNetworkConnectedSelectedAdapter)
       "
     />
   </g>
@@ -38,6 +39,7 @@ const props = defineProps<{
   selectedNetwork: string
   selectedMainLine: boolean
   isNetworkConnectedSelectedAdapter: boolean
+  isCantBeHighlighted: boolean
 }>()
 </script>
 

package/components/common/diagramMain/network/Contents.vue

@@ -7,7 +7,13 @@
       x="26"
       :y="props.network.titlePosition"
     >
-      <div class="vsphere-icon-network"></div>
+      <atoms-the-icon
+        v-if="props.network.state.state === 3"
+        name="error-outline"
+        width="15"
+        height="15"
+      />
+      <div v-else class="vsphere-icon-network"></div>
     </foreignObject>
 
     <a
@@ -107,6 +113,7 @@
     </foreignObject>
 
     <text
+      v-if="props.network.state.state !== 3"
       data-title="ports-main-text"
       dy="11px"
       font-size="13"
@@ -117,6 +124,21 @@
     >
       {{ props.network.networkPortsName }} ({{ props.network.portsCount }})
     </text>
+    <foreignObject
+      v-else
+      dy="11px"
+      font-size="13"
+      font-weight="400"
+      x="26"
+      height="20"
+      width="246"
+      :y="props.network.portsPosition - 5"
+      class="port-group-header"
+    >
+      <span class="error-text text-ellipsis" :title="errorText">
+        {{ errorText }}
+      </span>
+    </foreignObject>
 
     <common-diagram-main-highlights
       data-title="ports-closed"
@@ -169,6 +191,7 @@ const networkPopupFields = computed(() =>
     localization.value,
     props.network.networkType,
     props.network.testId,
+    props.network.state.state,
     props.inPortlet
   )
 )
@@ -195,6 +218,13 @@ const networkTitlePosition = computed<number>(
   () => props.network.titlePosition - 5
 )
 
+const errorText = computed<string>(() =>
+  props.network.state.state === 3
+    ? props.network.state?.errors?.join(', ') ||
+      localization.value.somethingWentWrong
+    : ''
+)
+
 const onSelectNetwork = (networkId: string): void => {
   emits('select-network', networkId)
 }
@@ -231,6 +261,15 @@ const onTogglePorts = (
       text-decoration: solid underline #c1cdd4 2px;
     }
   }
+
+  .error-text {
+    color: #e02200;
+
+    &:hover {
+      color: #e02200;
+      text-decoration: unset;
+    }
+  }
 }
 
 .diagram {
@@ -287,4 +326,16 @@ const onTogglePorts = (
     text-decoration: solid underline #565656 2px;
   }
 }
+
+.error-text {
+  font-weight: 400;
+  font-size: 12px;
+  max-width: 246px;
+  color: #e02200;
+
+  &:hover {
+    color: #e02200;
+    text-decoration: unset;
+  }
+}
 </style>

package/components/common/diagramMain/network/Lines.vue

@@ -1,5 +1,10 @@
 <template>
-  <g data-title="network-lines-group">
+  <g
+    v-if="
+      props.network.activeAdapters.length > 0 && props.network.state.state !== 3
+    "
+    data-title="network-lines-group"
+  >
     <line
       data-title="network-line"
       x1="332.5"

package/components/common/diagramMain/network/Network.vue

@@ -4,6 +4,7 @@
       :network="props.network"
       :selected-network="props.selectedNetwork"
       :selected-main-line="props.selectedMainLine"
+      :is-cant-be-highlighted="isCantBeHighlighted"
       :is-network-connected-selected-adapter="isNetworkConnectedSelectedAdapter"
     />
 
@@ -20,6 +21,7 @@
       :selected-main-line="props.selectedMainLine"
       :network-rect-bottom-position="networkRectBottomPosition"
       :is-network-connected-selected-adapter="isNetworkConnectedSelectedAdapter"
+      :is-cant-be-highlighted="isCantBeHighlighted"
     />
 
     <common-diagram-main-network-contents
@@ -88,6 +90,11 @@ const networkRectBottomPosition = computed<number>(
   () => props.network.rectPosition + props.network.networkHeight
 )
 
+const isCantBeHighlighted = computed<boolean>(
+  () =>
+    props.network.state.state === 3 || props.network.activeAdapters.length === 0
+)
+
 const emits = defineEmits<{
   (event: 'select-port', networkId: string, portId: string): void
   (event: 'select-network', networkId: string): void

package/components/common/diagramMain/network/SecondBlock.vue

@@ -12,7 +12,8 @@
       type="second-orange"
       :d="`M 313.5 ${props.network.rectPosition} H 333.5 V ${props.networkRectBottomPosition} H 313.5`"
       :hide="
-        !props.selectedMainLine && !props.isNetworkConnectedSelectedAdapter
+        props.isCantBeHighlighted ||
+        (!props.selectedMainLine && !props.isNetworkConnectedSelectedAdapter)
       "
     />
 
@@ -34,6 +35,7 @@ const props = defineProps<{
   selectedNetwork: string
   networkRectBottomPosition: number
   isNetworkConnectedSelectedAdapter: boolean
+  isCantBeHighlighted: boolean
 }>()
 </script>
 

package/components/common/diagramMain/switch/SwitchSelected.vue

@@ -1,7 +1,7 @@
 <template>
   <g>
     <line
-      v-if="isVisibleLine"
+      v-if="props.isVisibleLine"
       x1="362.5"
       :y1="props.selectedSwitchLineY.y1"
       x2="362.5"

package/components/common/vm/actions/common/lib/models/enums.ts

@@ -1,4 +1,5 @@
 export enum UI_E_FieldsSphere {
+  'location' = 2,
   'compute_resource' = 3,
   'storage.id' = 4,
   'storage.name' = 4,
@@ -29,6 +30,8 @@ export enum UI_E_FieldsSphere {
   'network_devices' = 8,
 }
 export enum UI_E_FieldsProcurator {
+  'location' = 2, // Только для Сфере
+  'compute_resource' = 3, // Только для Сфере
   'storage.id' = 4,
   'storage.name' = 4,
   'storage.type' = 4,
@@ -59,44 +62,44 @@ export enum UI_E_FieldsProcurator {
 }
 
 // TODO remove because not used
-export enum UI_E_GetElemByField {
-  'storage.id' = '#none',
-  'storage.name' = '#none',
-  'storage.type' = '#none',
-  'storage.pool' = '#none',
-  'compatibility' = '#version-select',
-  'guest_os_family' = '#os-select',
-  'guest_os_version' = '#os-version-select',
-  'machine_type' = '#machine-type-select',
-  'cpu.vcpus' = '#vm-wizard-vcpus-field input',
-  'cpu.max_vcpus' = '#vm-wizard-max-vcpus-field input',
-  'cpu.shares' = '#vm-wizard-shares-field input',
-  'cpu.core_per_socket' = '#vm-wizard-core-per-socket-field',
-  'cpu.model' = '#vm-wizard-cpu-model-field',
-  'memory.size_mb' = '#vm-wizard-memory-field input',
-  'memory.limit_mb' = '.memory-limit .combobox-container input',
-  'memory.reservation_mb' = '.memory-reservation .combobox-container input',
-  'video_card.adapter' = '#vm-wizard-video-card-adapter-field',
-  'video_card.displays' = '#vm-wizard-video-card-display-field',
-  'video_card.memory_mb' = '#vm-wizard-video-card-memory-field',
-  'options.remote_console.type' = '#vm-wizard-remote-console-type-field',
-  'options.remote_console.spice.img_compression' = '#vm-wizard-img-compression-field',
-  'options.remote_console.spice.jpeg_compression' = '#vm-wizard-jpeg-compression-field',
-  'options.remote_console.spice.zlib_glz_compression' = '#vm-wizard-zlib-compression-field',
-  'options.remote_console.spice.streaming_mode' = '#vm-wizard-streaming-mode-field',
-  'options.boot_options.firmware' = '#vm-wizard-firmware-field',
-  'disk_devices.bus' = '.vm-wizard-disk-device-bus-field',
-  'disk_devices.target' = '.vm-wizard-disk-device-target-field',
-  'disk_devices.provision_type' = '.vm-wizard-disk-device-provisioning-field',
-  'disk_devices.disk_mode' = '.vm-wizard-disk-device-mode-field',
-  'disk_devices.cache' = '.vm-wizard-disk-device-cache-field',
-  'disk_devices.io' = '.vm-wizard-disk-device-io-field',
-  'disk_devices.sharing' = '.vm-wizard-disk-device-sharing-field',
-  'network_devices.network' = '.vm-wizard-network-field',
-  'network_devices.mac_address' = '.vm-wizard-network-mac-address-field',
-  'network_devices.model' = '.vm-wizard-network-model-field',
-  '' = '#none',
-}
+// export enum UI_E_GetElemByField {
+//   'storage.id' = '#none',
+//   'storage.name' = '#none',
+//   'storage.type' = '#none',
+//   'storage.pool' = '#none',
+//   'compatibility' = '#version-select',
+//   'guest_os_family' = '#os-select',
+//   'guest_os_version' = '#os-version-select',
+//   'machine_type' = '#machine-type-select',
+//   'cpu.vcpus' = '#vm-wizard-vcpus-field input',
+//   'cpu.max_vcpus' = '#vm-wizard-max-vcpus-field input',
+//   'cpu.shares' = '#vm-wizard-shares-field input',
+//   'cpu.core_per_socket' = '#vm-wizard-core-per-socket-field',
+//   'cpu.model' = '#vm-wizard-cpu-model-field',
+//   'memory.size_mb' = '#vm-wizard-memory-field input',
+//   'memory.limit_mb' = '.memory-limit .combobox-container input',
+//   'memory.reservation_mb' = '.memory-reservation .combobox-container input',
+//   'video_card.adapter' = '#vm-wizard-video-card-adapter-field',
+//   'video_card.displays' = '#vm-wizard-video-card-display-field',
+//   'video_card.memory_mb' = '#vm-wizard-video-card-memory-field',
+//   'options.remote_console.type' = '#vm-wizard-remote-console-type-field',
+//   'options.remote_console.spice.img_compression' = '#vm-wizard-img-compression-field',
+//   'options.remote_console.spice.jpeg_compression' = '#vm-wizard-jpeg-compression-field',
+//   'options.remote_console.spice.zlib_glz_compression' = '#vm-wizard-zlib-compression-field',
+//   'options.remote_console.spice.streaming_mode' = '#vm-wizard-streaming-mode-field',
+//   'options.boot_options.firmware' = '#vm-wizard-firmware-field',
+//   'disk_devices.bus' = '.vm-wizard-disk-device-bus-field',
+//   'disk_devices.target' = '.vm-wizard-disk-device-target-field',
+//   'disk_devices.provision_type' = '.vm-wizard-disk-device-provisioning-field',
+//   'disk_devices.disk_mode' = '.vm-wizard-disk-device-mode-field',
+//   'disk_devices.cache' = '.vm-wizard-disk-device-cache-field',
+//   'disk_devices.io' = '.vm-wizard-disk-device-io-field',
+//   'disk_devices.sharing' = '.vm-wizard-disk-device-sharing-field',
+//   'network_devices.network' = '.vm-wizard-network-field',
+//   'network_devices.mac_address' = '.vm-wizard-network-mac-address-field',
+//   'network_devices.model' = '.vm-wizard-network-model-field',
+//   '' = '#none',
+// }
 export enum UI_E_GetToggleBlockElemByField {
   'cpu.vcpus' = '.stack-block-expandable #vm-wizard-toggle-block-cpu',
   'cpu.max_vcpus' = '.stack-block-expandable #vm-wizard-toggle-block-cpu',

package/components/common/vm/actions/common/select/lib/models/types.ts

@@ -19,6 +19,7 @@ export type UI_T_CustomizeHardwareField =
 
 export type UI_T_AllField =
   | UI_T_CustomizeHardwareField
+  | 'location'
   | 'compute_resource'
   | 'compatibility'
   | 'guest_os_family'

package/components/common/vm/actions/lib/utils.ts

@@ -194,6 +194,7 @@ const checkCustomizeHardware = (
 export const checkAllField = (field: string): field is UI_T_AllField => {
   return (
     checkCustomizeHardware(field) ||
+    field === 'location' ||
     field === 'compute_resource' ||
     field === 'compatibility' ||
     field === 'guest_os_family' ||

package/components/common/wizards/network/add/lib/models/types.ts

@@ -1,2 +1,14 @@
+import {
+  UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
+  UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
+  UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
+} from '~/components/common/wizards/network/add/lib/models/interfaces'
+import { API_UI_I_SwitchItem } from '~/components/common/diagramMain/lib/models/interfaces'
+
 export type UI_T_TCP = 'default' | 'provisioning' | ''
 export type UI_T_Project = 'procurator' | 'sphere'
+export type UI_T_EditData =
+  | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
+  | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+  | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
+  | API_UI_I_SwitchItem

package/package.json

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