bfg-common 1.3.252 → 1.3.254

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);