bfg-common 1.3.195 → 1.3.196

package/components/common/adapterManager/AdapterManager.vue

@@ -32,6 +32,7 @@
                             :selected-is-header="selectedIsHeader"
                             :is-disabled-move-up="isDisabledMoveUp"
                             :is-disabled-move-down="isDisabledMoveDown"
+                            :is-disabled-remove="isDisabledRemove"
                             @show-add-adapter-modal="onShowAddAdapterModal"
                             @remove-adapter="onRemove"
                             @move-up-adapter="onMoveUp"
@@ -162,6 +163,7 @@ const props = withDefaults(
     adapters: UI_I_SwitchAdapters
     initialData?: UI_I_ModalsInitialData
     addedAdapters?: string[]
+    coreAdapters?: string[]
     freeAdapters?: UI_I_Adapter[]
     adapterStatus?: UI_I_AdapterStatus
     withInitial?: boolean
@@ -184,6 +186,7 @@ const props = withDefaults(
     withInitial: false,
     freeAdapters: () => [],
     addedAdapters: () => [],
+    coreAdapters: () => [],
     adapters: () => ({
       totalItems: 0,
       totalPages: 0,
@@ -230,6 +233,9 @@ const hasSelectedAdapter = computed(
       !selectedAdapterId.value.includes('header-')) ||
     selectedAddAdapterId.value !== ''
 )
+const isDisabledRemove = computed(() =>
+  props.coreAdapters.includes(selectedAdapterId.value)
+)
 
 // Some checking variables for template
 const selectedIsHeader = computed<boolean>(

package/components/common/adapterManager/ui/actions/ActionsBar.vue

@@ -11,6 +11,7 @@
       <common-adapter-manager-ui-actions-remove-adapter-button
         :full-mode="props.fullMode"
         :selected-is-header="props.selectedIsHeader"
+        :is-disabled-remove="props.isDisabledRemove"
         @remove-adapter="onRemove"
       />
       <common-adapter-manager-ui-actions-move-up-adapter-button
@@ -32,6 +33,7 @@ const props = defineProps<{
   selectedIsHeader: boolean
   isDisabledMoveUp: boolean
   isDisabledMoveDown: boolean
+  isDisabledRemove: boolean
 }>()
 
 const emits = defineEmits<{

package/components/common/adapterManager/ui/actions/RemoveAdapterButton.vue

@@ -4,7 +4,7 @@
       :class="[
         'action-link-container',
         {
-          disabled: props.selectedIsHeader,
+          disabled: props.selectedIsHeader || props.isDisabledRemove,
         },
       ]"
       :title="localization.removeSelected"
@@ -21,6 +21,7 @@ import { UI_I_Localization } from '~/lib/models/interfaces'
 const props = defineProps<{
   fullMode: boolean
   selectedIsHeader: boolean
+  isDisabledRemove: boolean
 }>()
 
 // UI_I_Localization

package/components/common/diagramMain/DiagramMain.vue

@@ -201,6 +201,7 @@
         :standard-switches-initial="props.standardSwitchesInitial"
         :free-adapters="props.freeAdapters"
         :is-dark-mode="props.isDarkMode"
+        :selected-standard-switch-id="selectedStandardSwitchId"
         :selected-switch-id="selectedSwitchId"
         @check-network-label="onCheckNetworkLabel"
         @get-existing-standard-switches="onGetExistingStandardSwitches"
@@ -478,6 +479,7 @@ const onHideMigrateVmkernelAdapterModal = (): void => {
   isShowMigrateVmkernelAdapterModal.value = false
 }
 
+const selectedStandardSwitchId = ref<string>('')
 const selectedSwitchId = ref<string>('')
 
 const onShowModal = (
@@ -526,6 +528,7 @@ const onShowModal = (
       break
     case 'add-networking':
       isShowAddNetworkingModal.value = true
+      selectedStandardSwitchId.value = properties.switch_name
       selectedSwitchId.value = properties.switch_name
       break
     case 'switch-view-settings':

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

@@ -32,14 +32,16 @@
         :standard-switches-initial="props.standardSwitchesInitial"
         :messages-fields="selectedStep.fields"
         :alert-messages="alertMessages[1]"
+        :selected-standard-switch-id="props.selectedStandardSwitchId"
         :selected-switch-id="props.selectedSwitchId"
         @hide-alert="onHideAlert"
         @change-target-device="onChangeTargetDevice"
       />
       <common-wizards-network-add-steps-create-standard-switch
-        v-if="selectedStep.id === 2"
+        v-if="selectedStep.id === 2 || selectedStep.id === 6"
         :free-adapters="props.freeAdapters"
         :added-adapters="addedAdapters"
+        :core-adapters="coreAdapters"
         :adapter-status="adapterStatus"
         :adapters="props.adapters"
         :is-show-no-connected-active-adapters-modal="
@@ -85,9 +87,9 @@
         @change-connection-settings="onChangeConnectionSettings"
         @hide-alert="onHideAlert"
       />
-      <common-wizards-network-add-steps-physical-adapter
-        v-if="selectedStep.id === 6"
-      />
+      <!--      <common-wizards-network-add-steps-physical-adapter-->
+      <!--        v-if="selectedStep.id === 6"-->
+      <!--      />-->
       <common-wizards-network-add-steps-ready-complete
         v-if="selectedStep.id === 7"
         :ready-complete-fields="readyCompleteFields"
@@ -138,6 +140,7 @@ import {
   targetDeviceInitial,
   addNetworkingZeroOrFirstSchemeDataFunc,
   addNetworkingSecondOrThirdSchemeDataFunc,
+  addNetworkingFourthOrFifthSchemeDataFunc,
 } from '~/components/common/wizards/network/add/lib/config'
 
 import {
@@ -157,6 +160,7 @@ const props = withDefaults(
     freeAdapters: UI_I_Adapter[]
     project?: UI_T_Project
     isDarkMode?: boolean
+    selectedStandardSwitchId?: string
     selectedSwitchId?: string
   }>(),
   {
@@ -164,6 +168,7 @@ const props = withDefaults(
     freeAdapters: () => [],
     project: 'procurator',
     isDarkMode: false,
+    selectedStandardSwitchId: '',
     selectedSwitchId: '',
   }
 )
@@ -197,12 +202,14 @@ const connectionTypeLocal = computed<string>({
   set(newValue: string) {
     wizard.resetAfterSelected()
     connectionType.value = newValue
-    targetDevice.value.standardSwitch = props.selectedSwitchId
+    targetDevice.value.standardSwitch = props.selectedStandardSwitchId
+    targetDevice.value.switch = props.selectedSwitchId
   },
 })
 
 // Step's content data (createStandardSwitch)
 const addedAdapters = ref<string[]>([])
+const coreAdapters = ref<string[]>([])
 
 const onChangeAddedAdapters = (addedAdaptersNew: string[]): void => {
   addedAdapters.value = addedAdaptersNew
@@ -271,16 +278,27 @@ const onHideAlert = (stepId: number): void => {
   wizard.hideAlertMessagesByStepId(stepId)
 }
 
+let flagSwitch = ''
+
 // Choosing Scheme
 watch(
   [connectionTypeLocal, targetDevice],
-  (newValues, oldValue) => {
+  (newValues, oldValues) => {
     const newCT = newValues[0] // -> newConnectionType
-    const oldCT = oldValue[0] // -> oldConnectionType
+    const oldCT = oldValues[0] // -> oldConnectionType
     const newTD = newValues[1] // -> newTargetDevice
-
+    const oldTD = oldValues[1] // -> oldTargetDevice
+    if (!oldTD || oldTD.selected !== newTD.selected) {
+      flagSwitch = ''
+      addedAdapters.value = []
+      adapterStatus.value = {
+        active: [],
+        standby: [],
+        unused: [],
+      }
+    }
     if (newCT !== oldCT) {
-      newCT === '0' && props.selectedSwitchId
+      newCT === '0' && props.selectedStandardSwitchId
         ? (targetDevice.value.selected = '1')
         : (targetDevice.value.selected = '0')
       newCT === '1' && (targetDevice.value.selected = '1')
@@ -311,7 +329,25 @@ const onGetExistingStandardSwitches = (): void => {
 watch(
   () => wizard.selectedStepId,
   (newSelectedStep: number) => {
-    if (newSelectedStep === 1) onGetExistingStandardSwitches()
+    if (newSelectedStep === 1) {
+      onGetExistingStandardSwitches()
+    }
+    if (newSelectedStep === 6 && flagSwitch !== targetDevice.value.switch) {
+      const nics = props.standardSwitchesInitial.find(
+        (sw) => sw.id === targetDevice.value.switch
+      ).nics
+      adapterStatus.value = {
+        active: nics.active || [],
+        standby: nics.standby || [],
+        unused: nics.unused || [],
+      }
+      coreAdapters.value = [
+        ...adapterStatus.value.active,
+        ...adapterStatus.value.standby,
+        ...adapterStatus.value.unused,
+      ]
+      flagSwitch = targetDevice.value.switch
+    }
 
     if (newSelectedStep !== 7) return // If last step
     if (wizard.isSelectedScheme(0)) {
@@ -361,6 +397,7 @@ const reset = (): void => {
   connectionSettings.value = useDeepCopy(connectionSettingsInitial)
   portProperties.value = useDeepCopy(portPropertiesInitial)
   ipFourSettings.value = useDeepCopy(ipFourSettingsInitial)
+  coreAdapters.value = []
   addedAdapters.value = []
   adapterStatus.value = {
     active: [],
@@ -435,6 +472,17 @@ const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {
     type = 'network'
   }
 
+  if (wizard.isSelectedScheme(4) || wizard.isSelectedScheme(5)) {
+    sendData = addNetworkingFourthOrFifthSchemeDataFunc(
+      targetDevice.value.switch,
+      wizard.isSelectedScheme(4),
+      adapterStatus.value,
+      targetDevice.value.mtu
+    )
+
+    type = 'network'
+  }
+
   return new Promise((resolve, _reject) =>
     emits(
       'add-networking-data-validate',

package/components/common/wizards/network/add/lib/config/index.ts

@@ -30,4 +30,5 @@ export const {
 export const {
   addNetworkingZeroOrFirstSchemeDataFunc,
   addNetworkingSecondOrThirdSchemeDataFunc,
+  addNetworkingFourthOrFifthSchemeDataFunc,
 } = sendData

package/components/common/wizards/network/add/lib/config/sendData.ts

@@ -100,3 +100,27 @@ export const addNetworkingZeroOrFirstSchemeDataFunc = (
 
   return sendData
 }
+
+export const addNetworkingFourthOrFifthSchemeDataFunc = (
+  switchId: string,
+  isFourthScheme: boolean = false,
+  adapterStatus: UI_I_AdapterStatus,
+  mtu?: number
+): any =>
+  isFourthScheme
+    ? {
+        id: switchId,
+        nics: {
+          active: adapterStatus?.active || [],
+          standby: adapterStatus?.standby || [],
+          unused: adapterStatus?.unused || [],
+        },
+      }
+    : {
+        mtu: mtu,
+        nics: {
+          active: adapterStatus?.active || [],
+          standby: adapterStatus?.standby || [],
+          unused: adapterStatus?.unused || [],
+        },
+      }

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

@@ -87,8 +87,8 @@ const onHideErrorMessageAlert = (): void => {
   isShowErrorMessageAlert.value = false
 }
 
-const onSelectRow = (index: number): void => {
-  selectedRowData.value = bodyItems.value[index]
+const onSelectRow = (_index: number, item: UI_I_SelectedSwitch[]): void => {
+  selectedRowData.value = item
 }
 
 const onSelectSwitch = (): void => {
@@ -115,4 +115,8 @@ const onHideModal = (): void => {
 }
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+:deep(.table-wrap) {
+  height: 300px;
+}
+</style>

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

@@ -8,6 +8,7 @@
         :adapters="props.adapters"
         :free-adapters="props.freeAdapters"
         :added-adapters="props.addedAdapters"
+        :core-adapters="props.coreAdapters"
         :adapter-status="props.adapterStatus"
         :is-dark-mode="props.isDarkMode"
         @change-added-adapters="onChangeAddedAdapters"
@@ -46,6 +47,7 @@ const props = defineProps<{
   freeAdapters: UI_I_Adapter[]
   adapterStatus: UI_I_AdapterStatus
   adapters: UI_I_SwitchAdapters
+  coreAdapters: string[]
   isShowNoConnectedActiveAdaptersModal: boolean
   isShowNoActiveAdaptersModal: boolean
   isDarkMode: boolean

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

@@ -32,7 +32,7 @@
         <div class="add-networking-radio-button-description">
           {{ localization.portGroupHandlesVirtualMachineTraffic }}
         </div>
-        <div class="radio">
+        <div class="radio disabled-on-time">
           <input
             id="physical-adapter"
             type="radio"
@@ -44,7 +44,7 @@
             {{ localization.physicalNetworkAdapter }}
           </label>
         </div>
-        <div class="add-networking-radio-button-description">
+        <div class="add-networking-radio-button-description disabled-on-time">
           {{ localization.physicalNetworkAdapterHandlesNetworkTraffic }}
         </div>
       </form>

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

@@ -265,7 +265,7 @@
       width="576px"
       height="468px"
       :title="localization.selectSwitch"
-      :data="[]"
+      :data="props.standardSwitchesInitial"
       :show="isShowSwitchModal"
       @select-switch="onSelectSwitch"
       @hide="onHideSwitchModal"
@@ -305,9 +305,11 @@ const props = withDefaults(
     alertMessages: string[]
     messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
     wizard: Wizard
+    selectedStandardSwitchId?: string
     selectedSwitchId?: string
   }>(),
   {
+    selectedStandardSwitchId: '',
     selectedSwitchId: '',
   }
 )
@@ -369,11 +371,11 @@ const onShowModal = (value: string): void => {
 }
 
 // Switches selection functionality
-const onSelectSwitch = (_selectedSwitchId: string): void => {
-  fields.value.switch = ''
+const onSelectSwitch = (selectedSwitchId: string): void => {
+  fields.value.switch = selectedSwitchId
 }
-const onSelectStandardSwitch = (selectedSwitchId: string): void => {
-  fields.value.standardSwitch = selectedSwitchId
+const onSelectStandardSwitch = (selectedStandardSwitchId: string): void => {
+  fields.value.standardSwitch = selectedStandardSwitchId
 }
 const onSelectNetwork = (_selectedNetworkId: string): void => {
   fields.value.network = ''
@@ -381,7 +383,9 @@ const onSelectNetwork = (_selectedNetworkId: string): void => {
 
 onMounted(() => {
   !fields.value.standardSwitch &&
-    (fields.value.standardSwitch = props.selectedSwitchId)
+    (fields.value.standardSwitch = props.selectedStandardSwitchId)
+
+  !fields.value.switch && (fields.value.switch = props.selectedSwitchId)
 })
 
 const onHideAlert = (): void => {

package/package.json

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