bfg-common 1.3.252 → 1.3.253

package/components/common/adapterManager/AdapterManager.vue

@@ -206,8 +206,8 @@ const existingAdaptersForAdding = computed<
 >(() =>
   [
     ...props.freeAdapters,
-    ...props.adapters.items.filter((el) =>
-      removedAdapters.value.includes(el.name)
+    ...props.adapters.items.filter((adapter: UI_I_SwitchAdapterItem) =>
+      removedAdapters.value.includes(adapter.name)
     ),
   ].filter(
     (adapter: UI_I_Adapter | UI_I_SwitchAdapterItem) =>
@@ -385,8 +385,9 @@ const onRemoveWithId = (adapterId: string): void => {
       (id: string) => id !== adapterId
     ))
 
-  !props.freeAdapters.find((el) => el.name === adapterId) &&
-    removedAdapters.value.push(adapterId)
+  !props.freeAdapters.find(
+    (adapter: UI_I_Adapter) => adapter.name === adapterId
+  ) && removedAdapters.value.push(adapterId)
   addedAdapters.value = [
     ...adapterStatus.value.active,
     ...adapterStatus.value.unused,
@@ -419,7 +420,7 @@ const onHideAddAdapterModal = (): void => {
 }
 
 const emits = defineEmits<{
-  (event: 'get-free-adapters', showAddAdapterModal: () => void): void
+  (event: 'get-free-adapters', showModal: () => void): void
   (event: 'change-added-adapters', addedAdapters: string[]): void
   (event: 'change-adapter-status', adapterStatus: UI_I_AdapterStatus): void
   (event: 'hide-no-connected-active-adapters-modal'): void
@@ -474,7 +475,7 @@ const addAdapterViewSettings = computed(() =>
   adapterViewSettingsFunc(
     localization.value,
     allAdapters.value.find(
-      (ad: UI_I_Adapter) => ad.name === props.selectedAddAdapterId
+      (adapter: UI_I_Adapter) => adapter.name === props.selectedAddAdapterId
     ) || {}
   )
 )
@@ -482,14 +483,14 @@ const addAdapterViewSettings = computed(() =>
 const selectedAdapterData = computed(
   () =>
     allAdapters.value.find(
-      (ad) => ad.name === selectedAdapterId.value
+      (adapter: UI_I_Adapter) => adapter.name === selectedAdapterId.value
     ) as UI_I_ModalsInitialData
 )
 
 const selectedAdapterDataFromFree = computed(
   () =>
     props.freeAdapters?.find(
-      (ad) => ad.name === selectedAdapterId.value
+      (adapter: UI_I_Adapter) => adapter.name === selectedAdapterId.value
     ) as UI_I_ModalsInitialData
 )
 

package/components/common/diagramMain/DiagramMain.vue

@@ -132,6 +132,7 @@
       :items="networkEditSettingsTabs"
       :adapters="props.adapters"
       :is-dark-mode="props.isDarkMode"
+      :is-edit-modal-loading="props.isEditModalLoading"
       @send-edit-data="onSendEditData"
       @change-edit-fields-data="onChangeEditFieldsData"
       @check-network-label="onCheckNetworkLabel"
@@ -147,6 +148,7 @@
       :initial-data="initialData"
       :items="portEditSettingsTabs"
       :is-dark-mode="props.isDarkMode"
+      :is-edit-modal-loading="props.isEditModalLoading"
       @send-edit-data="onSendEditData"
       @change-edit-fields-data="onChangeEditFieldsData"
       @hide="onHidePortEditSettingsModal"
@@ -163,9 +165,9 @@
         :items="switchEditSettingsTabs"
         :adapters="props.adapters"
         :is-dark-mode="props.isDarkMode"
+        :is-edit-modal-loading="props.isEditModalLoading"
         @send-edit-data="onSendEditData"
         @change-edit-fields-data="onChangeEditFieldsData"
-        @check-network-label="onCheckNetworkLabel"
         @hide="onHideSwitchEditSettingsModal"
       />
       <common-diagram-main-modals-view-settings-modal
@@ -209,7 +211,6 @@
         :selected-standard-switch-id="selectedStandardSwitchId"
         :selected-switch-id="selectedSwitchId"
         :tcp-stacks="props.tcpStacks"
-        :tcp-stack-loading="props.tcpStackLoading"
         :diagrams-data="props.diagramsData"
         :is-networking-loading="props.isNetworkingLoading"
         @check-network-label="onCheckNetworkLabel"
@@ -227,6 +228,7 @@
         :networks-list="props.networksList"
         :switch-networks="props.diagramData.networks"
         :is-dark-mode="props.isDarkMode"
+        :is-migrate-adapter-loading="props.isMigrateAdapterLoading"
         @check-network-label="onCheckNetworkLabel"
         @hide="onHideMigrateVmkernelAdapterModal"
       />
@@ -309,11 +311,12 @@ const props = withDefaults(
     networksList?: UI_I_Network[]
     isDarkMode: boolean
     tcpStacks?: UI_I_TCPStack[]
-    tcpStackLoading?: boolean
     diagramsData?: UI_I_DiagramData[]
     isManageAdaptersModalLoading?: boolean
     isNetworkingLoading?: boolean
     isRemoveModalLoading?: boolean
+    isEditModalLoading?: boolean
+    isMigrateAdapterLoading?: boolean
   }>(),
   {
     diagramData: null,
@@ -328,11 +331,12 @@ const props = withDefaults(
     freeAdapters: () => [],
     networksList: () => [],
     tcpStacks: () => [],
-    tcpStackLoading: false,
     diagramsData: [],
     isManageAdaptersModalLoading: false,
     isNetworkingLoading: false,
     isRemoveModalLoading: false,
+    isEditModalLoading: false,
+    isMigrateAdapterLoading: false,
   }
 )
 
@@ -358,7 +362,7 @@ const onValidateBeforeSending = (
     | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
     | API_UI_I_SwitchItem,
   type: string,
-  setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
+  setValidation: (messages: UI_I_ArbitraryObject<string>) => void
 ) => {
   emits('add-networking-data-validate', data, type, setValidation)
 }
@@ -372,7 +376,7 @@ const managePhysicalAdapterStatus = ref<UI_I_AdapterStatus>(
 
 watch(
   () => props.diagramData,
-  (newValue) => {
+  (newValue: UI_I_DiagramData) => {
     if (newValue?.networking) {
       initialManagePhysicalAdapterStatus = {
         active: useDeepCopy(props.diagramData?.networking?.activeAdapters),
@@ -579,19 +583,19 @@ const onChangeEditFieldsData = (newEditFieldsData: UI_I_EditFieldsData) => {
   emits('change-edit-fields-data', newEditFieldsData)
 }
 const onCheckNetworkLabel = (
-  networkLabel: string,
-  cb: (error_message: string) => void
+  label: string,
+  sendMessage: (message: string) => void
 ) => {
-  emits('check-network-label', networkLabel, cb)
+  emits('check-network-label', label, sendMessage)
 }
-const onGetExistingStandardSwitches = (cb: () => void) => {
-  emits('get-existing-standard-switches', cb)
+const onGetExistingStandardSwitches = () => {
+  emits('get-existing-standard-switches')
 }
 const onGetTcpStacks = () => {
   emits('get-tcp-stacks')
 }
-const onGetFreeAdapters = (showAddAdapterModal: () => void) => {
-  emits('get-free-adapters', showAddAdapterModal)
+const onGetFreeAdapters = (showModal: () => void) => {
+  emits('get-free-adapters', showModal)
 }
 const onSendNetworkData = (
   data:
@@ -604,8 +608,8 @@ const onSendNetworkData = (
 ) => {
   emits('send-add-networking-data', data, type, hideModal)
 }
-const onSendEditData = (type: string, hideModal: () => void, name?: string) => {
-  emits('send-edit-data', type, initialData.value, hideModal, name)
+const onSendEditData = (type: string, hideModal: () => void, id?: string) => {
+  emits('send-edit-data', type, initialData.value, hideModal, id)
 }
 const isShowDiagram = ref<boolean>(true)
 const onToggleDiagram = () => {
@@ -871,7 +875,7 @@ const emits = defineEmits<{
     event: 'toggle-adapters',
     payload: Omit<UI_I_ToggleDiagramAdaptersPayload, 'paths'>
   ): void
-  (event: 'get-existing-standard-switches', cb: () => void): void
+  (event: 'get-existing-standard-switches'): void
   (
     event: 'send-add-networking-data',
     data:
@@ -890,20 +894,20 @@ const emits = defineEmits<{
       | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
       | API_UI_I_SwitchItem,
     type: string,
-    setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
+    setValidation: (message: UI_I_ArbitraryObject<string>) => void
   ): void
   (
     event: 'check-network-label',
-    networkLabel: string,
-    cb: (error_message: string) => void
+    label: string,
+    sendMessage: (message: string) => void
   ): void
-  (event: 'get-free-adapters', showAddAdapterModal: () => void): void
+  (event: 'get-free-adapters', showModal: () => void): void
   (
     event: 'send-edit-data',
     type: string,
     initialData: UI_I_ModalsInitialData,
     hideModal: () => void,
-    name?: string
+    id?: string
   ): void
   (event: 'change-edit-fields-data', editFieldsData: UI_I_EditFieldsData): void
   (event: 'remove', id: string, type: string, hideModal: () => void): void

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

@@ -164,7 +164,7 @@ const onSendManageAdapter = () => {
 // Modal
 const emits = defineEmits<{
   (event: 'hide'): void
-  (event: 'get-free-adapters', showAddAdapterModal: () => void): void
+  (event: 'get-free-adapters', showModal: () => void): void
   (event: 'change-added-adapters', addedAdapters: string[]): void
   (event: 'change-adapter-status', adapterStatus: UI_I_AdapterStatus): void
   (
@@ -175,8 +175,8 @@ const emits = defineEmits<{
   ): void
 }>()
 
-const onGetFreeAdapters = (showAddAdapterModal: () => void) => {
-  emits('get-free-adapters', showAddAdapterModal)
+const onGetFreeAdapters = (showModal: () => void) => {
+  emits('get-free-adapters', showModal)
 }
 
 const onHideManagePhysicalAdaptersModal = (): void => {

package/components/common/diagramMain/modals/editSettings/EditSettings.vue

@@ -82,7 +82,6 @@
         @hide-error-message-alert="onHideErrorMessageAlert"
       />
     </template>
-    <!--    <atoms-loader v-show="false" />-->
     <common-diagram-main-modals-edit-settings-confirm-teaming-settings-modal
       :is-show="isShowWithoutActiveAdapterModal"
       @hide="onHideWithoutActiveAdapterModal"
@@ -131,9 +130,8 @@ const emits = defineEmits<{
   (event: 'change-edit-fields-data', editFieldsData: UI_I_EditFieldsData): void
   (
     event: 'check-network-label',
-    networkLabel: string,
-    cb: (error_message: string) => void,
-    hideLoader?: () => void
+    label: string,
+    sendMessage: (message: string) => void
   ): void
   (event: 'send-edit-data', type: string): void
 }>()
@@ -204,10 +202,10 @@ const onChangeAdapterStatus = (newAdapterStatus: UI_I_AdapterStatus) => {
 }
 
 const onCheckNetworkLabel = (
-  networkLabel: string,
-  cb: (error_message: string) => void
+  label: string,
+  sendMessage: (message: string) => void
 ) => {
-  emits('check-network-label', networkLabel, cb)
+  emits('check-network-label', label, sendMessage)
 }
 
 const onChangeNetworkEditPropertiesData = (
@@ -295,10 +293,10 @@ const networkAlreadyExists = ref(false)
 
 const checkNetworkLabelCallback = (
   type: 'tab' | 'send',
-  error_message: string,
+  message: string,
   newSelectedTab?: string
 ) => {
-  if (!error_message) {
+  if (!message) {
     isCheckedNetworkLabel.value = true
     networkAlreadyExists.value = false
     type === 'tab' && (selectedTab.value = newSelectedTab || '4')
@@ -306,7 +304,7 @@ const checkNetworkLabelCallback = (
     return
   }
 
-  errorMessages.value.networkLabel = error_message
+  errorMessages.value.networkLabel = message
   networkAlreadyExists.value = true
   onShowErrorMessageAlert()
 }
@@ -323,8 +321,8 @@ const onSendData = () => {
     }
     initialNetworkLabel.value !== networkLabel.value &&
     selectedTab.value === '1'
-      ? onCheckNetworkLabel(networkLabel.value || '', (error_message) =>
-          checkNetworkLabelCallback('send', error_message)
+      ? onCheckNetworkLabel(networkLabel.value || '', (message) =>
+          checkNetworkLabelCallback('send', message)
         )
       : emits('send-edit-data', props.viewName)
   }
@@ -376,7 +374,7 @@ const stopTabChanging = (newSelectedTab: string) => {
   onShowWithoutActiveAdapterModal()
 }
 
-watch(selectedTab, (newSelectedTab, oldSelectedTab) => {
+watch(selectedTab, (newSelectedTab: string, oldSelectedTab: string) => {
   if (oldSelectedTab === '4') {
     if (!selectedTabInAlertModal.value && isFailoverOrderOverride.value) {
       const isNotChangedAdapterStatus = isNotChangedAdapterStatusFunc()
@@ -407,8 +405,8 @@ watch(selectedTab, (newSelectedTab, oldSelectedTab) => {
       networkLabel.value !== initialNetworkLabel.value &&
       networkLabel.value !== ''
     ) {
-      onCheckNetworkLabel(networkLabel.value || '', (error_message) =>
-        checkNetworkLabelCallback('tab', error_message, newSelectedTab)
+      onCheckNetworkLabel(networkLabel.value || '', (message) =>
+        checkNetworkLabelCallback('tab', message, newSelectedTab)
       )
     } else if (networkLabel.value === '') {
       onShowErrorMessageAlert()
@@ -435,7 +433,7 @@ watch(
 
 watch(
   () => networkLabel.value,
-  (newNetworkEditData, oldNetworkEditData) => {
+  (newNetworkEditData: string, oldNetworkEditData: string) => {
     if (newNetworkEditData === oldNetworkEditData) return
     isCheckedNetworkLabel.value = false
     errorMessages.value = { ...errorMessages.value, networkLabel: '' }

package/components/common/diagramMain/modals/editSettings/EditSettingsModal.vue

@@ -5,7 +5,7 @@
       :height="props.height"
       :show="props.show"
       :title="title"
-      :modal-loading="modalLoading"
+      :modal-loading="props.isEditModalLoading"
       :class="[
         'diagram-action__edit',
         {
@@ -29,9 +29,6 @@
         />
       </template>
     </atoms-modal>
-    <div v-show="true" class="loader">
-      <i class="fa clr-tree-node-caret-icon spinner spinner" />
-    </div>
   </div>
 </template>
 
@@ -60,6 +57,7 @@ interface UI_I_PortViewSettingsModalProps {
   initialData?: UI_I_ModalsInitialData
   adapters?: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
   isDarkMode: boolean
+  isEditModalLoading?: boolean
 }
 
 const props = withDefaults(defineProps<UI_I_PortViewSettingsModalProps>(), {
@@ -70,10 +68,9 @@ const props = withDefaults(defineProps<UI_I_PortViewSettingsModalProps>(), {
     total_items: 0,
     items: [],
   }),
+  isEditModalLoading: false,
 })
 
-const modalLoading = ref<boolean>(false)
-
 // UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -90,21 +87,20 @@ const emits = defineEmits<{
     event: 'send-edit-data',
     type: string,
     hideModal: () => void,
-    name?: string
+    id?: string
   ): void
   (
     event: 'check-network-label',
-    networkLabel: string,
-    cb: (error_message: string) => void,
-    hideLoader?: () => void
+    label: string,
+    sendMessage: (message: string) => void
   ): void
 }>()
 
 const onCheckNetworkLabel = (
-  networkLabel: string,
-  cb: (error_message: string) => void
+  label: string,
+  sendMessage: (message: string) => void
 ) => {
-  emits('check-network-label', networkLabel, cb)
+  emits('check-network-label', label, sendMessage)
 }
 
 const onHideEditSettingsModal = (): void => {
@@ -121,8 +117,12 @@ const onSendDataRequest = () => {
   flagSendData.value = !flagSendData.value
 }
 const onSendData = (type: string) => {
-  modalLoading.value = true
-  emits('send-edit-data', type, onHideEditSettingsModal, props.title)
+  emits(
+    'send-edit-data',
+    type,
+    onHideEditSettingsModal,
+    props.initialData.id || props.title
+  )
 }
 </script>
 
@@ -709,23 +709,6 @@ const onSendData = (type: string) => {
   }
 }
 
-.loader {
-  position: absolute;
-  z-index: 1000;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  top: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background-color: rgba(0, 0, 0, 0.3);
-
-  .spinner {
-    left: unset;
-  }
-}
-
 :deep(.diagram-action__edit.is-dark) {
   .property-label-group {
     color: var(--main-color-mode2);

package/components/common/diagramMain/modals/migrateVmkernelAdapter/MigrateVmkernelAdapter.vue

@@ -1,93 +1,95 @@
 <template>
-  <atoms-wizard
-    v-model:show="props.show"
-    :steps="wizard.steps"
-    :selected-scheme="selectedScheme"
-    :is-loading="wizard.wizardLoader.status"
-    :loader-messages="wizard.wizardLoader.messages"
-    :title="title"
-    :was-completed="wasCompleted"
-    :localization="localization"
-    :class="[
+    <atoms-wizard
+            v-model:show="props.show"
+            :steps="wizard.steps"
+            :selected-scheme="selectedScheme"
+            :is-loading="wizard.wizardLoader.status"
+            :loader-messages="wizard.wizardLoader.messages"
+            :title="title"
+            :was-completed="wasCompleted"
+            :localization="localization"
+            :class="[
       'migrate-vm-kernel-modal',
       {
         'is-dark': props.isDarkMode,
       },
     ]"
-    @change-steps="onChangeSteps"
-    @hide="onHide"
-    @submit="onSubmit"
-  >
-    <template #modalBody="{ selectedStep }">
-      <common-diagram-main-modals-migrate-vmkernel-adapter-steps-select-vmkernel-adapter
-        v-if="selectedStep.id === 0"
-        :vmkernel-adapter="vmkernelAdapter"
-        :table-data="filteredNetworksList"
-        :alert-messages="alertMessages[0]"
-        @hide-alert="onHideAlert"
-        @change-vmkernel-adapter="onChangeMigrateVmkernelAdapter"
-      />
-      <common-diagram-main-modals-migrate-vmkernel-adapter-steps-connection-settings
-        v-if="selectedStep.id === 1"
-        :connection-settings="connectionSettings"
-        :messages-fields="selectedStep.fields"
-        :alert-messages="alertMessages[1]"
-        :wizard="wizard"
-        @hide-alert="onHideAlert"
-        @change-connection-settings="onChangeConnectionSettings"
-      />
-      <common-diagram-main-modals-migrate-vmkernel-adapter-steps-vmkernel-adapter-ready-complete
-        v-if="selectedStep.id === 2"
-        :data="readyCompleteData"
-      />
-    </template>
-  </atoms-wizard>
+            @change-steps="onChangeSteps"
+            @hide="onHide"
+            @submit="onSubmit"
+    >
+        <template #modalBody="{ selectedStep }">
+            <common-diagram-main-modals-migrate-vmkernel-adapter-steps-select-vmkernel-adapter
+                    v-if="selectedStep.id === 0"
+                    :vmkernel-adapter="vmkernelAdapter"
+                    :table-data="filteredNetworksList"
+                    :alert-messages="alertMessages[0]"
+                    @hide-alert="onHideAlert"
+                    @change-vmkernel-adapter="onChangeMigrateVmkernelAdapter"
+            />
+            <common-diagram-main-modals-migrate-vmkernel-adapter-steps-connection-settings
+                    v-if="selectedStep.id === 1"
+                    :connection-settings="connectionSettings"
+                    :messages-fields="selectedStep.fields"
+                    :alert-messages="alertMessages[1]"
+                    :wizard="wizard"
+                    @hide-alert="onHideAlert"
+                    @change-connection-settings="onChangeConnectionSettings"
+            />
+            <common-diagram-main-modals-migrate-vmkernel-adapter-steps-vmkernel-adapter-ready-complete
+                    v-if="selectedStep.id === 2"
+                    :data="readyCompleteData"
+            />
+        </template>
+    </atoms-wizard>
 </template>
 
 <script setup lang="ts">
 import { UI_I_Localization } from '~/lib/models/interfaces'
 import {
-  UI_I_Network,
-  UI_I_VmkernelAdapterTableData,
+    UI_I_Network,
+    UI_I_VmkernelAdapterTableData,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import {
-  UI_I_ConnectionSettings,
-  UI_I_SelectVmkernelAdapter,
+    UI_I_ConnectionSettings,
+    UI_I_SelectVmkernelAdapter,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
 import {
-  UI_I_WizardStep,
-  UI_I_ValidationReturn,
+    UI_I_WizardStep,
+    UI_I_ValidationReturn,
 } from '~/components/atoms/wizard/lib/models/interfaces'
 import {
-  UI_I_MigrateVmkernelAdapterEmits,
-  UI_I_MigrationVmkernelAdapterReadyComplete,
+    UI_I_MigrateVmkernelAdapterEmits,
+    UI_I_MigrationVmkernelAdapterReadyComplete,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
 import {
-  stepsFunc,
-  stepsSchemeInitial,
+    stepsFunc,
+    stepsSchemeInitial,
 } from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/lib/config/steps'
 import {
-  checkNetworkAsync,
-  checkConnectionSettingsSync,
-  checkSelectedVmSync,
+    checkNetworkAsync,
+    checkConnectionSettingsSync,
+    checkSelectedVmSync,
 } from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/validations'
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import { readyCompleteInitial } from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/lib/config/steps'
 
 const props = withDefaults(
-  defineProps<{
-    show: boolean
-    switchName?: string
-    networksList?: UI_I_Network[]
-    switchNetworks?: UI_I_Network[]
-    isDarkMode: boolean
-  }>(),
-  {
-    switchName: '',
-    networksList: () => [],
-    switchNetworks: () => [],
-  }
+    defineProps<{
+        show: boolean
+        switchName?: string
+        networksList?: UI_I_Network[]
+        switchNetworks?: UI_I_Network[]
+        isDarkMode: boolean
+        isMigrateAdapterLoading?: boolean
+    }>(),
+    {
+        switchName: '',
+        networksList: () => [],
+        switchNetworks: () => [],
+        isMigrateAdapterLoading: false,
+    }
 )
 
 const emits = defineEmits<UI_I_MigrateVmkernelAdapterEmits>()
@@ -95,8 +97,8 @@ const emits = defineEmits<UI_I_MigrateVmkernelAdapterEmits>()
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const wizard: Wizard = new Wizard(
-  stepsFunc(localization.value),
-  stepsSchemeInitial
+    stepsFunc(localization.value),
+    stepsSchemeInitial
 )
 const wasCompleted = computed<boolean>(() => wizard.wasCompleted())
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
@@ -104,184 +106,192 @@ const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
 const hostname = ref<string>('')
 const title = computed<string>(
-  () =>
-    `${hostname.value} - ${localization.value.migrateVmKernelNetworkAdapterTo} ${props.switchName}`
+    () =>
+        `${hostname.value} - ${localization.value.migrateVmKernelNetworkAdapterTo} ${props.switchName}`
 )
 
 const connectionSettings = ref<UI_I_ConnectionSettings>({
-  networkLabel: 'VM Network',
-  vlanId: 'None (0)',
+    networkLabel: 'VM Network',
+    vlanId: 'None (0)',
 })
 
 const vmkernelAdapter = ref<UI_I_SelectVmkernelAdapter>({
-  vm: '',
+    vm: '',
 })
 
 const readyCompleteData =
-  ref<UI_I_MigrationVmkernelAdapterReadyComplete>(readyCompleteInitial)
+    ref<UI_I_MigrationVmkernelAdapterReadyComplete>(readyCompleteInitial)
 
 const validationFunc = async (
-  value: UI_I_WizardStep[],
-  currentStep: UI_I_WizardStep,
-  nextStep: UI_I_WizardStep
+    value: UI_I_WizardStep[],
+    currentStep: UI_I_WizardStep,
+    nextStep: UI_I_WizardStep
 ): Promise<UI_I_ValidationReturn> => {
-  let stepHasError = false
+    let stepHasError = false
 
-  if (wizard.isValidateForStep(0, currentStep.id, nextStep.id)) {
-    const selectVmkernelAdapterValidation = checkSelectedVmSync(
-      localization.value,
-      vmkernelAdapter.value,
-      wizard,
-      value
-    )
+    if (wizard.isValidateForStep(0, currentStep.id, nextStep.id)) {
+        const selectVmkernelAdapterValidation = checkSelectedVmSync(
+            localization.value,
+            vmkernelAdapter.value,
+            wizard,
+            value
+        )
 
-    value = selectVmkernelAdapterValidation.newValue
+        value = selectVmkernelAdapterValidation.newValue
 
-    stepHasError = stepHasError || selectVmkernelAdapterValidation.stepHasError
-  }
+        stepHasError = stepHasError || selectVmkernelAdapterValidation.stepHasError
+    }
 
-  if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
-    const labelValidation = await checkNetworkAsync(
-      value,
-      connectionSettings.value.networkLabel,
-      1,
-      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_NETWORK,
-      emits,
-      localization.value,
-      wizard
-    )
-
-    value = labelValidation.newValue
-
-    const connectionSettingsValidation = checkConnectionSettingsSync(
-      localization.value,
-      connectionSettings.value,
-      wizard,
-      value
-    )
-
-    value = connectionSettingsValidation.newValue
-
-    stepHasError =
-      stepHasError ||
-      labelValidation.stepHasError ||
-      connectionSettingsValidation.stepHasError
-  }
+    if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
+        const labelValidation = await checkNetworkAsync(
+            value,
+            connectionSettings.value.networkLabel,
+            1,
+            UI_E_MigrationValidationFields.CONNECTION_SETTINGS_NETWORK,
+            emits,
+            localization.value,
+            wizard
+        )
+
+        value = labelValidation.newValue
+
+        const connectionSettingsValidation = checkConnectionSettingsSync(
+            localization.value,
+            connectionSettings.value,
+            wizard,
+            value
+        )
+
+        value = connectionSettingsValidation.newValue
+
+        stepHasError =
+            stepHasError ||
+            labelValidation.stepHasError ||
+            connectionSettingsValidation.stepHasError
+    }
 
-  return {
-    newValue: value,
-    stepHasError,
-  }
+    return {
+        newValue: value,
+        stepHasError,
+    }
 }
 
 const finalValidationFunc = async (
-  value: UI_I_WizardStep[]
+    value: UI_I_WizardStep[]
 ): Promise<UI_I_ValidationReturn> => {
-  let stepHasError = false
+    let stepHasError = false
 
-  // wizard.setLoader(true)
+    // wizard.setLoader(true)
 
-  // wizard.setLoader(false)
-  return {
-    stepHasError,
-    newValue: value,
-  }
+    // wizard.setLoader(false)
+    return {
+        stepHasError,
+        newValue: value,
+    }
 }
 
 const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> =>
-  wizard.changeSteps(value, validationFunc, finalValidationFunc)
+    wizard.changeSteps(value, validationFunc, finalValidationFunc)
 
 const filteredNetworksList = ref<UI_I_VmkernelAdapterTableData[]>([])
 
 watch(
-  () => wizard.selectedStepId,
-  (newSelectedStepId: number) => {
-    if (newSelectedStepId !== 2) return
-
-    const from = filteredNetworksList.value.find(
-      (network) => network.name === vmkernelAdapter.value.vm
-    )
-
-    readyCompleteData.value = {
-      vm: vmkernelAdapter.value.vm,
-      currentSettings: {
-        switch: from?.switch || '',
-        network: from?.networkLabel || '',
-      },
-      newSettings: {
-        switch: props.switchName,
-        network: connectionSettings.value.networkLabel,
-      },
-      vlanId: connectionSettings.value.vlanId,
+    () => wizard.selectedStepId,
+    (newSelectedStepId: number) => {
+        if (newSelectedStepId !== 2) return
+
+        const from = filteredNetworksList.value.find(
+            (network) => network.name === vmkernelAdapter.value.vm
+        )
+
+        readyCompleteData.value = {
+            vm: vmkernelAdapter.value.vm,
+            currentSettings: {
+                switch: from?.switch || '',
+                network: from?.networkLabel || '',
+            },
+            newSettings: {
+                switch: props.switchName,
+                network: connectionSettings.value.networkLabel,
+            },
+            vlanId: connectionSettings.value.vlanId,
+        }
     }
-  }
 )
 
 watch(
-  () => props.switchNetworks,
-  (netsOnSwitch: UI_I_Network[]) => {
-    const vmKernelNetworksIdOnSwitch = netsOnSwitch
-      .filter((net: UI_I_Network) => net.networkType === '1')
-      .map((net: UI_I_Network) => net.id)
-
-    filteredNetworksList.value = props.networksList
-      .filter(
-        (net: UI_I_Network) =>
-          net.networkType === '1' &&
-          !vmKernelNetworksIdOnSwitch.includes(net.id)
-      )
-      .map((net: UI_I_Network, index: number) => ({
-        name: net.sysx?.id || '',
-        networkLabel: net.title,
-        switch: net.switchName || '',
-        ipAddress: net.sysx?.ipv4_settings.ipv4 || '--',
-        tcp: net.sysx?.tcp_stack
-          ? localization.value[net.sysx?.tcp_stack]
-          : '--',
-        id: `${net.sysx?.id || ''}-${index}`,
-      }))
-  },
-  { deep: true, immediate: true }
+    () => props.switchNetworks,
+    (netsOnSwitch: UI_I_Network[]) => {
+        const vmKernelNetworksIdOnSwitch = netsOnSwitch
+            .filter((net: UI_I_Network) => net.networkType === '1')
+            .map((net: UI_I_Network) => net.id)
+
+        filteredNetworksList.value = props.networksList
+            .filter(
+                (net: UI_I_Network) =>
+                    net.networkType === '1' &&
+                    !vmKernelNetworksIdOnSwitch.includes(net.id)
+            )
+            .map((net: UI_I_Network, index: number) => ({
+                name: net.sysx?.id || '',
+                networkLabel: net.title,
+                switch: net.switchName || '',
+                ipAddress: net.sysx?.ipv4_settings.ipv4 || '--',
+                tcp: net.sysx?.tcp_stack
+                    ? localization.value[net.sysx?.tcp_stack]
+                    : '--',
+                id: `${net.sysx?.id || ''}-${index}`,
+            }))
+    },
+    { deep: true, immediate: true }
 )
 
 const onChangeConnectionSettings = (
-  newFields: UI_I_ConnectionSettings
+    newFields: UI_I_ConnectionSettings
 ): void => {
-  connectionSettings.value = newFields
+    connectionSettings.value = newFields
 }
 
 const onChangeMigrateVmkernelAdapter = (
-  newFields: UI_I_SelectVmkernelAdapter
+    newFields: UI_I_SelectVmkernelAdapter
 ): void => {
-  vmkernelAdapter.value = newFields
+    vmkernelAdapter.value = newFields
 }
 
 const reset = (): void => {
-  wizard.reset()
-  connectionSettings.value = {
-    networkLabel: 'VM Network',
-    vlanId: 'None (0)',
-  }
-  vmkernelAdapter.value = {
-    vm: '',
-  }
+    wizard.reset()
+    connectionSettings.value = {
+        networkLabel: 'VM Network',
+        vlanId: 'None (0)',
+    }
+    vmkernelAdapter.value = {
+        vm: '',
+    }
 }
 
 const onHideAlert = (stepId: number): void => {
-  wizard.hideAlertMessagesByStepId(stepId)
+    wizard.hideAlertMessagesByStepId(stepId)
 }
 
 const onHide = (): void => {
-  emits('hide')
-  reset()
+    emits('hide')
+    reset()
 }
 
 const onSubmit = (): void => {
-  onHide()
+    onHide()
 }
 
+watch(
+    () => props.isMigrateAdapterLoading,
+    (newValue: boolean) => {
+        wizard.setLoader(newValue)
+    },
+    { immediate: true }
+)
+
 onMounted(() => {
-  hostname.value = location.hostname
+    hostname.value = location.hostname
 })
 </script>
 

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings.ts

@@ -75,24 +75,24 @@ export const checkConnectionSettingsSync = (
 }
 
 const checkNetwork = async (
-  networkLabel: string,
+  label: string,
   localization: UI_I_Localization,
   emits: UI_I_MigrateVmkernelAdapterEmits
 ): Promise<UI_I_AsyncCheckReturn> => {
-  if (networkLabel) {
+  if (label) {
     return new Promise((resolve, _reject) =>
-      emits('check-network-label', networkLabel, (error_message: string) => {
-        if (error_message === '') {
+      emits('check-network-label', label, (message: string) => {
+        if (message === '') {
           resolve({
             isValid: true,
             message: '',
           })
         }
 
-        if (error_message !== '') {
+        if (message !== '') {
           resolve({
             isValid: false,
-            message: error_message,
+            message,
           })
         }
       })
@@ -107,7 +107,7 @@ const checkNetwork = async (
 
 export const checkNetworkAsync = async (
   value: UI_I_WizardStep[],
-  networkLabel: string,
+  label: string,
   stepId: number,
   fieldName: string,
   emits: UI_I_MigrateVmkernelAdapterEmits,
@@ -116,14 +116,10 @@ export const checkNetworkAsync = async (
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
-  wizard.setLoader(true)
-
   const labelValidation: {
     isValid: boolean
     message: string
-  } = await checkNetwork(networkLabel, localization, emits)
-
-  wizard.setLoader(false)
+  } = await checkNetwork(label, localization, emits)
 
   if (!labelValidation.isValid) {
     stepHasError = wizard.setValidation(stepId, fieldName, {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/Location.vue

@@ -5,6 +5,7 @@
         class="network-modal"
         :show="props.locationModalIsShow"
         :title="localization.selectNetwork"
+        test-id="select-network-modal"
         @submit="onSubmitLocationModal"
         @hide="onHideLocationModal"
       >

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

@@ -175,7 +175,6 @@ const props = withDefaults(
     selectedStandardSwitchId?: string
     selectedSwitchId?: string
     tcpStacks?: UI_I_TCPStack[]
-    tcpStackLoading?: boolean
     diagramsData?: UI_I_DiagramData[]
     isNetworkingLoading?: boolean
   }>(),
@@ -187,7 +186,6 @@ const props = withDefaults(
     selectedStandardSwitchId: '',
     selectedSwitchId: '',
     tcpStacks: () => [],
-    tcpStackLoading: false,
     diagramsData: [],
     isNetworkingLoading: false,
   }
@@ -352,21 +350,13 @@ watch(
 )
 
 const onGetExistingStandardSwitches = (): void => {
-  wizard.setLoader(true)
-  emits('get-existing-standard-switches', () => wizard.setLoader(false))
+  emits('get-existing-standard-switches')
 }
 
 const onGetTcpStacks = (): void => {
   emits('get-tcp-stacks')
 }
 
-watch(
-  () => props.tcpStackLoading,
-  (newValue: boolean) => {
-    wizard.setLoader(newValue)
-  }
-)
-
 watch(
   () => wizard.selectedStepId,
   (newSelectedStep: number) => {
@@ -481,12 +471,8 @@ const onConfirmNoActiveAdaptersModal = (): void => {
   wizard.selectStepHard(wizard.waitingStepId)
 }
 
-const onGetFreeAdapters = (showAddAdapterModal: () => void): void => {
-  wizard.setLoader(true)
-  emits('get-free-adapters', () => {
-    wizard.setLoader(false)
-    showAddAdapterModal()
-  })
+const onGetFreeAdapters = (showModal: () => void): void => {
+  emits('get-free-adapters', showModal)
 }
 
 const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {

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

@@ -216,12 +216,12 @@ export interface UI_I_AddNetworkingEmits {
     type: string,
     hideModal: () => void
   ): void
-  (event: 'get-existing-standard-switches', cb: () => void): void
+  (event: 'get-existing-standard-switches'): void
   (event: 'get-free-adapters', cb: () => void): void
   (
     event: 'check-network-label',
-    networkLabel: string,
-    cb: (error_message: string) => void
+    label: string,
+    sendMessage: (message: string) => void
   ): void
   (event: 'get-tcp-stacks'): void
 }

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

@@ -57,7 +57,7 @@ const props = defineProps<{
 }>()
 
 const emits = defineEmits<{
-  (event: 'get-free-adapters', showAddAdapterModal: () => void): void
+  (event: 'get-free-adapters', showModal: () => void): void
   (event: 'change-added-adapters', addedAdapters: string[]): void
   (event: 'change-adapter-status', adapterStatus: UI_I_AdapterStatus): void
   (event: 'confirm-no-active-adapters-modal'): void
@@ -68,8 +68,8 @@ const emits = defineEmits<{
 // UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const onGetFreeAdapters = (showAddAdapterModal: () => void): void =>
-  emits('get-free-adapters', showAddAdapterModal)
+const onGetFreeAdapters = (showModal: () => void): void =>
+  emits('get-free-adapters', showModal)
 
 const onChangeAddedAdapters = (addedAdapters: string[]): void =>
   emits('change-added-adapters', addedAdapters)

package/components/common/wizards/network/add/validations/networkValidation.ts

@@ -8,24 +8,24 @@ import {
 } from '~/components/atoms/wizard/lib/models/interfaces'
 
 const checkNetwork = async (
-  networkLabel: string,
+  label: string,
   localization: UI_I_Localization,
   emits: UI_I_AddNetworkingEmits
 ): Promise<UI_I_AsyncCheckReturn> => {
-  if (networkLabel) {
+  if (label) {
     return new Promise((resolve, _reject) =>
-      emits('check-network-label', networkLabel, (error_message: string) => {
-        if (error_message === '') {
+      emits('check-network-label', label, (message: string) => {
+        if (message === '') {
           resolve({
             isValid: true,
             message: '',
           })
         }
 
-        if (error_message !== '') {
+        if (message !== '') {
           resolve({
             isValid: false,
-            message: error_message,
+            message,
           })
         }
       })
@@ -40,7 +40,7 @@ const checkNetwork = async (
 
 export const checkNetworkAsync = async (
   value: UI_I_WizardStep[],
-  networkLabel: string,
+  label: string,
   stepId: number,
   fieldName: string,
   emits: UI_I_AddNetworkingEmits,
@@ -49,21 +49,17 @@ export const checkNetworkAsync = async (
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
-  wizard.setLoader(true)
-
   const labelValidation: {
     isValid: boolean
     message: string
-  } = await checkNetwork(networkLabel, localization, emits)
-
-  wizard.setLoader(false)
+  } = await checkNetwork(label, localization, emits)
 
-  if (labelValidation.message === 'onHideLoader') {
-    return {
-      newValue: value,
-      stepHasError: true,
-    }
-  }
+  // if (labelValidation.message === '$hasError') {
+  //   return {
+  //     newValue: value,
+  //     stepHasError: true,
+  //   }
+  // }
 
   if (!labelValidation.isValid) {
     stepHasError = wizard.setValidation(stepId, fieldName, {

package/package.json

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