bfg-common 1.5.487 → 1.5.488

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

@@ -236,9 +236,13 @@ export interface UI_I_ViewSettingsFields {
   title?: string
   id: number
   type: number
+  separator?: boolean
   rows: {
     name: string
-    value?: string | string[]
+    value?: string | string[] | undefined
+    color?: boolean
+    status?: boolean
+    icon?: string
   }[]
 }
 
@@ -748,7 +752,6 @@ export interface UI_I_NetworkPositionsConst {
   readonly BETWEEN_V_CENTERS: 12.5
 }
 
-
 export interface UI_I_FirstAndLastNetworkLinesY {
   firstNetworkY: number
   lastNetworkY: number

package/components/common/diagramMain/modals/ManagePhysicalAdaptersModal.vue

@@ -19,23 +19,24 @@
         <div class="wizard-content__container">
           <div class="wizard-content">
             <common-adapter-manager
-              :is-active="true"
-              :full-mode="true"
               :adapters="props.adapters"
               :free-adapters="props.freeAdapters"
               :added-adapters="addedAdapters"
               :adapter-status="props.adapterStatus"
+              :is-dark-mode="props.isDarkMode"
+              test-id="manage-physical-adapter"
+              :is-active="true"
+              :full-mode="true"
               :is-show-no-connected-active-adapters-modal="
                 isShowNoConnectedActiveAdaptersModal
               "
-              :is-dark-mode="props.isDarkMode"
               :is-show-no-active-adapters-modal="isShowNoActiveAdaptersModal"
-              test-id="manage-physical-adapter"
+
               @hide-no-connected-active-adapters-modal="
                 onHideNoConnectedActiveAdaptersModal
               "
               @hide-no-active-adapters-modal="onHideNoActiveAdaptersModal"
-              @confirm-no-active-adapters-modal="onConfirmNoActiveAdaptersModal"
+              @submit-from-modal="onConfirmNoActiveAdaptersModal"
               @change-added-adapters="onChangeAddedAdapters"
               @change-adapter-status="onChangeAdapterStatus"
               @get-free-adapters="onGetFreeAdapters"

package/components/common/diagramMain/modals/Modals.vue

@@ -52,7 +52,9 @@
     :title="localization.common.removePortGroup"
     :show="props.isShowNetworkRemoveModal"
     :is-show-loader="props.isRemoveModalLoading"
+    :network-type="removableNetworkType"
     :switch-name="props.diagramData.diagramName"
+    :project="props.project"
     modal-name="network-port-remove-modal"
     view-name="port-network-remove"
     height="558px"
@@ -180,6 +182,7 @@
       :diagrams-data="props.diagramsData"
       :is-networking-loading="props.isNetworkingLoading"
       :host-name="props.hostName"
+      :project="props.project"
       @check-network-label="onCheckNetworkLabel"
       @get-existing-standard-switches="onGetExistingStandardSwitches"
       @get-tcp-stacks="onGetTcpStacks"
@@ -203,6 +206,7 @@
 </template>
 
 <script setup lang="ts">
+import type { UI_T_Project } from '~/lib/models/types'
 import type {
   UI_I_ItemsWithTotalCounts,
   UI_I_ArbitraryObject,
@@ -271,6 +275,7 @@ const props = defineProps<{
   networksList: UI_I_Network[]
   isMigrateAdapterLoading: boolean
   diagramsData: UI_I_DiagramData[]
+  project: UI_T_Project
 }>()
 
 const emits = defineEmits<{
@@ -382,8 +387,21 @@ const switchEditSettingsTabs = computed(() =>
   switchEditSettingsTabsFunc(localization.value)
 )
 
+const removableNetworkType = computed<string>(() =>
+  props.isShowNetworkRemoveModal
+    ? props.networksList.find?.((a) => a.id === props.initialData.id)
+        ?.networkType
+    : ''
+)
+
 const onRemove = (id: string, type: string) => {
-  emits('remove', id, type)
+  let idLocal = id
+  if (type === 'network1') {
+    idLocal = props.networksList.find?.((a) => a.id === props.initialData.id)
+      ?.sysx?.id
+  }
+
+  emits('remove', idLocal, type)
 }
 
 const onCheckNetworkLabel = (

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

@@ -1,5 +1,8 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ModalsInitialData } from '~/components/common/diagramMain/lib/models/interfaces'
+import type {
+  UI_I_ModalsInitialData,
+  UI_I_ViewSettingsFields,
+} from '~/components/common/diagramMain/lib/models/interfaces'
 import { getNicSpeed } from '~/components/common/diagramMain/modals/lib/utils/index'
 
 export const adapterViewSettingsModalTabsFunc = (
@@ -31,7 +34,7 @@ export const adapterViewSettingsFunc = (
   localization: UI_I_Localization,
   initialData: UI_I_ModalsInitialData,
   isNewView: boolean = false
-) => [
+): UI_I_ViewSettingsFields[] => [
   {
     title: isNewView ? localization.common.properties : '',
     id: 1,
@@ -39,19 +42,19 @@ export const adapterViewSettingsFunc = (
     rows: [
       {
         name: localization.common.adapter,
-        value: initialData.adapter?.trim(),
+        value: initialData?.adapter?.trim(),
       },
       {
         name: localization.common.name,
-        value: initialData.name,
+        value: initialData?.name,
       },
       {
         name: localization.common.location,
-        value: `PCI ${initialData.pciAddress}`,
+        value: `PCI ${initialData?.pciAddress}`,
       },
       {
         name: localization.common.driver,
-        value: initialData.driver,
+        value: initialData?.driver,
       },
     ],
   },
@@ -62,33 +65,33 @@ export const adapterViewSettingsFunc = (
     rows: [
       {
         name: localization.common.status,
-        value: initialData.carrier
+        value: initialData?.carrier
           ? localization.common.connected
           : localization.common.disconnected,
-        color: initialData.carrier,
+        color: initialData?.carrier,
         status: true,
       },
       {
         name: localization.common.actualSpeedDuplex,
-        value: initialData.carrier
-          ? `${getNicSpeed(initialData.speed || 0, localization)}, ${
-              initialData.duplex
+        value: initialData?.carrier
+          ? `${getNicSpeed(initialData?.speed || 0, localization)}, ${
+              initialData?.duplex
             } Duplex`
           : localization.common.down,
       },
       {
         name: localization.common.configuredSpeedDuplex,
-        value: initialData.carrier
-          ? `${getNicSpeed(initialData.speed || 0, localization)}, ${
-              initialData.duplex
+        value: initialData?.carrier
+          ? `${getNicSpeed(initialData?.speed || 0, localization)}, ${
+              initialData?.duplex
             } Duplex`
           : localization.common.autoNegotiate,
       },
       {
         name: localization.common.networks,
         value:
-          initialData.networks && initialData.networks?.length > 0
-            ? initialData.networks.map((network: string) => network.trim())
+          initialData?.networks && initialData?.networks?.length > 0
+            ? initialData?.networks.map((network: string) => network.trim())
             : localization.common.noNetworks,
       },
     ],
@@ -100,8 +103,8 @@ export const adapterViewSettingsFunc = (
     rows: [
       {
         name: localization.common.status,
-        value: !initialData.srIov ? localization.common.notSupported : '--',
-        color: initialData.srIov,
+        value: !initialData?.srIov ? localization.common.notSupported : '--',
+        color: initialData?.srIov,
         status: true,
       },
     ],
@@ -110,13 +113,13 @@ export const adapterViewSettingsFunc = (
     title: localization.common.ciscoDiscoveryProtocol,
     id: 4,
     type: 2,
-    rows: !initialData.cdp ? [] : [],
+    rows: !initialData?.cdp ? [] : [],
   },
   {
     title: localization.common.linkLayerDiscoveryProtocol,
     id: 5,
     type: 3,
-    rows: !initialData.lldp ? [] : [],
+    rows: !initialData?.lldp ? [] : [],
   },
 ]