bfg-common 1.3.246 → 1.3.248

package/components/common/diagramMain/DiagramMain.vue

@@ -80,15 +80,17 @@
     />
     <common-diagram-main-modals-remove-modal
       v-if="isShowNetworkRemoveModal"
-      :id="initialData.networkLabel"
+      :id="initialData.id"
+      :label="initialData.networkLabel"
       modal-name="network-port-remove-modal"
       view-name="port-network-remove"
       width="872px"
       height="558px"
       :title="localization.removePortGroup"
       :show="isShowNetworkRemoveModal"
-      :is-show-loader="isShowRemoveModalLoader"
-      @remove="onRemoveNetwork"
+      :is-show-loader="props.isRemoveModalLoading"
+      type="network"
+      @remove="onRemove"
       @hide="onHideNetworkRemoveModal"
     />
     <common-diagram-main-modals-remove-modal
@@ -100,8 +102,9 @@
       height="558px"
       title="Remove Standard Switch"
       :show="isShowSwitchRemoveModal"
-      :is-show-loader="isShowRemoveModalLoader"
-      @remove="onRemoveSwitch"
+      :is-show-loader="props.isRemoveModalLoading"
+      type="switch"
+      @remove="onRemove"
       @hide="onHideSwitchRemoveModal"
     />
     <common-diagram-main-modals-remove-modal
@@ -113,8 +116,9 @@
       height="558px"
       :title="localization.removeVMkernelAdapter"
       :show="isShowPortRemoveModal"
-      :is-show-loader="isShowRemoveModalLoader"
-      @remove="onRemovePort"
+      :is-show-loader="props.isRemoveModalLoading"
+      type="port"
+      @remove="onRemove"
       @hide="onHidePortRemoveModal"
     />
     <common-diagram-main-modals-edit-settings-modal
@@ -189,6 +193,7 @@
         :adapters="props.adapters"
         :is-dark-mode="props.isDarkMode"
         :initial-adapter-status="initialManagePhysicalAdapterStatus"
+        :is-manage-adapters-modal-loading="props.isManageAdaptersModalLoading"
         @send-manage-physical-adapters-data="onSendManagePhysicalAdaptersData"
         @change-adapter-status="onChangeManagePhysicalAdapterStatus"
         @get-free-adapters="onGetFreeAdapters"
@@ -206,6 +211,7 @@
         :tcp-stacks="props.tcpStacks"
         :tcp-stack-loading="props.tcpStackLoading"
         :diagrams-data="props.diagramsData"
+        :is-networking-loading="props.isNetworkingLoading"
         @check-network-label="onCheckNetworkLabel"
         @get-existing-standard-switches="onGetExistingStandardSwitches"
         @get-tcp-stacks="onGetTcpStacks"
@@ -247,6 +253,7 @@ 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,
@@ -256,6 +263,7 @@ import {
 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'
@@ -303,6 +311,9 @@ const props = withDefaults(
     tcpStacks?: UI_I_TCPStack[]
     tcpStackLoading?: boolean
     diagramsData?: UI_I_DiagramData[]
+    isManageAdaptersModalLoading?: boolean
+    isNetworkingLoading?: boolean
+    isRemoveModalLoading?: boolean
   }>(),
   {
     diagramData: null,
@@ -319,6 +330,9 @@ const props = withDefaults(
     tcpStacks: () => [],
     tcpStackLoading: false,
     diagramsData: [],
+    isManageAdaptersModalLoading: false,
+    isNetworkingLoading: false,
+    isRemoveModalLoading: false,
   }
 )
 
@@ -338,13 +352,15 @@ watch(
 )
 
 const onValidateBeforeSending = (
-  networkData:
+  data:
     | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
+    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+    | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
+    | API_UI_I_SwitchItem,
   type: string,
   setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
 ) => {
-  emits('add-networking-data-validate', networkData, type, setValidation)
+  emits('add-networking-data-validate', data, type, setValidation)
 }
 
 let initialManagePhysicalAdapterStatus: UI_I_AdapterStatus =
@@ -386,19 +402,16 @@ const onHideSwitchManagePhysicalAdaptersModal = (): void => {
 const onSendManagePhysicalAdaptersData = (
   adapterStatus: UI_I_AdapterStatus,
   switchName: string,
-  hideManagePhysicalAdaptersModal: () => void,
-  hideLoader: () => void
+  hideModal: () => void
 ) => {
   emits(
     'send-manage-physical-adapters-data',
     adapterStatus,
     switchName,
-    hideManagePhysicalAdaptersModal,
-    hideLoader
+    hideModal
   )
 }
 
-const isShowRemoveModalLoader = ref(false)
 const switchViewSettingsModalTabs = computed(() =>
   switchViewSettingsModalTabsFunc(localization.value)
 )
@@ -419,7 +432,6 @@ const onHideSwitchEditSettingsModal = (): void => {
 }
 const onHideSwitchRemoveModal = (): void => {
   isShowSwitchRemoveModal.value = false
-  isShowRemoveModalLoader.value = false
 }
 const adapterViewSettingsModalTabs = computed(() =>
   adapterViewSettingsModalTabsFunc(localization.value)
@@ -451,7 +463,6 @@ const onHideNetworkEditSettingsModal = (): void => {
 }
 const onHideNetworkRemoveModal = (): void => {
   isShowNetworkRemoveModal.value = false
-  isShowRemoveModalLoader.value = false
 }
 const portViewSettingsModalTabs = computed(() =>
   portViewSettingsModalTabsFunc(localization.value)
@@ -473,7 +484,6 @@ const onHidePortEditSettingsModal = (): void => {
 }
 const onHidePortRemoveModal = (): void => {
   isShowPortRemoveModal.value = false
-  isShowRemoveModalLoader.value = false
 }
 const vCenterViewSettings = computed(() =>
   vCenterViewSettingsFunc(localization.value, initialData.value)
@@ -555,19 +565,16 @@ const onShowModal = (
       break
   }
 }
-const onRemoveNetwork = (label: string) => {
-  isShowRemoveModalLoader.value = true
-  const id = props.networksList.find((network) => network.title === label)!.id
-  emits('remove-network', { id, hideModalCB: onHideNetworkRemoveModal })
-}
-const onRemoveSwitch = (id: string) => {
-  isShowRemoveModalLoader.value = true
-  emits('remove-switch', { id, hideModalCB: onHideSwitchRemoveModal })
-}
-const onRemovePort = (id: string) => {
-  isShowRemoveModalLoader.value = true
-  emits('remove-port', { id, hideModalCB: onHidePortRemoveModal })
+const onRemove = (id: string, type: string) => {
+  const hideModal =
+    type === 'network'
+      ? onHideNetworkRemoveModal
+      : type === 'switch'
+      ? onHideSwitchRemoveModal
+      : onHidePortRemoveModal
+  emits('remove', id, type, hideModal)
 }
+
 const onChangeEditFieldsData = (newEditFieldsData: UI_I_EditFieldsData) => {
   emits('change-edit-fields-data', newEditFieldsData)
 }
@@ -583,24 +590,19 @@ const onGetExistingStandardSwitches = (cb: () => void) => {
 const onGetTcpStacks = () => {
   emits('get-tcp-stacks')
 }
-const onGetFreeAdapters = (cb: () => void) => {
-  emits('get-free-adapters', cb)
+const onGetFreeAdapters = (showAddAdapterModal: () => void) => {
+  emits('get-free-adapters', showAddAdapterModal)
 }
 const onSendNetworkData = (
-  networkData:
+  data:
     | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
+    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+    | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
+    | API_UI_I_SwitchItem,
   type: string,
-  hideSendNetworkDataLoader: () => void,
-  onHideAddNetworkingModal: () => void
+  hideModal: () => void
 ) => {
-  emits(
-    'send-add-networking-data',
-    networkData,
-    type,
-    hideSendNetworkDataLoader,
-    onHideAddNetworkingModal
-  )
+  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)
@@ -872,18 +874,21 @@ const emits = defineEmits<{
   (event: 'get-existing-standard-switches', cb: () => void): void
   (
     event: 'send-add-networking-data',
-    secondSchemeData:
+    data:
       | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
+      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
+      | API_UI_I_SwitchItem,
     type: string,
-    hideSendNetworkDataLoader: () => void,
-    onHideAddNetworkingModal: () => void
+    hideModal: () => void
   ): void
   (
     event: 'add-networking-data-validate',
-    networkData:
+    data:
       | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
+      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
+      | API_UI_I_SwitchItem,
     type: string,
     setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
   ): void
@@ -892,7 +897,7 @@ const emits = defineEmits<{
     networkLabel: string,
     cb: (error_message: string) => void
   ): void
-  (event: 'get-free-adapters', cb: () => void): void
+  (event: 'get-free-adapters', showAddAdapterModal: () => void): void
   (
     event: 'send-edit-data',
     type: string,
@@ -901,15 +906,12 @@ const emits = defineEmits<{
     name?: string
   ): void
   (event: 'change-edit-fields-data', editFieldsData: UI_I_EditFieldsData): void
-  (event: 'remove-network', arg: { id: string; hideModalCB: () => void }): void
-  (event: 'remove-switch', arg: { id: string; hideModalCB: () => void }): void
-  (event: 'remove-port', arg: { id: string; hideModalCB: () => void }): void
+  (event: 'remove', id: string, type: string, hideModal: () => void): void
   (
     event: 'send-manage-physical-adapters-data',
     adapterStatus: UI_I_AdapterStatus,
     switchName: string,
-    hideModalCB: () => void,
-    hideLoaderCB: () => void
+    hideModal: () => void
   ): void
   (event: 'get-tcp-stacks'): void
 }>()

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

@@ -42,7 +42,7 @@
             />
           </div>
         </div>
-        <atoms-loader v-show="isShowLoader" />
+        <atoms-loader v-show="props.isManageAdaptersModalLoading" />
       </template>
     </atoms-modal>
   </div>
@@ -72,6 +72,7 @@ const props = withDefaults(
     adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
     initialAdapterStatus: UI_I_AdapterStatus
     isDarkMode?: boolean
+    isManageAdaptersModalLoading?: boolean
   }>(),
   {
     switchName: '',
@@ -81,21 +82,13 @@ const props = withDefaults(
       unused: [],
     }),
     isDarkMode: false,
+    isManageAdaptersModalLoading: false,
   }
 )
 
 // UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const isShowLoader = ref(false)
-
-const showLoader = () => {
-  isShowLoader.value = true
-}
-const hideLoader = () => {
-  isShowLoader.value = false
-}
-
 const addedAdapters = ref<string[]>()
 
 const onChangeAddedAdapters = (addedAdaptersNew: string[]) => {
@@ -125,24 +118,20 @@ const onHideNoActiveAdaptersModal = () => {
 const onSendManagePhysicalAdaptersData = (
   adapterStatus: UI_I_AdapterStatus,
   switchName: string,
-  hideManagePhysicalAdaptersModal: () => void,
-  hideLoader: () => void
+  hideModal: () => void
 ) => {
-  showLoader()
   emits(
     'send-manage-physical-adapters-data',
     adapterStatus,
     switchName,
-    hideManagePhysicalAdaptersModal,
-    hideLoader
+    hideModal
   )
 }
 const onConfirmNoActiveAdaptersModal = () => {
   onSendManagePhysicalAdaptersData(
     props.adapterStatus,
     props.switchName,
-    onHideManagePhysicalAdaptersModal,
-    hideLoader
+    onHideManagePhysicalAdaptersModal
   )
   onHideNoConnectedActiveAdaptersModal()
   onHideNoActiveAdaptersModal()
@@ -168,8 +157,7 @@ const onSendManageAdapter = () => {
   onSendManagePhysicalAdaptersData(
     props.adapterStatus,
     props.switchName,
-    onHideManagePhysicalAdaptersModal,
-    hideLoader
+    onHideManagePhysicalAdaptersModal
   )
 }
 
@@ -183,17 +171,12 @@ const emits = defineEmits<{
     event: 'send-manage-physical-adapters-data',
     adapterStatus: UI_I_AdapterStatus,
     switchName: string,
-    hideModalCB: () => void,
-    hideLoaderCB: () => void
+    hideModal: () => void
   ): void
 }>()
 
 const onGetFreeAdapters = (showAddAdapterModal: () => void) => {
-  showLoader()
-  emits('get-free-adapters', () => {
-    hideLoader()
-    showAddAdapterModal()
-  })
+  emits('get-free-adapters', showAddAdapterModal)
 }
 
 const onHideManagePhysicalAdaptersModal = (): void => {

package/components/common/diagramMain/modals/remove/RemoveModal.vue

@@ -90,7 +90,7 @@
               type="button"
               data-id="diagram-remove-modal-yes-button"
               class="btn btn-primary"
-              @click="onRemove(props.id)"
+              @click="onRemove(props.id, props.type)"
             >
               {{ localization.yes }}
             </button>
@@ -112,7 +112,7 @@
               type="button"
               data-id="diagram-remove-modal-remove-button"
               class="btn btn-primary"
-              @click="onRemove(props.id)"
+              @click="onRemove(props.id, props.type)"
             >
               {{ localization.remove }}
             </button>
@@ -138,10 +138,13 @@ const props = withDefaults(
     title: string
     id?: string
     isShowLoader?: boolean
+    type: string
+    label?: string
   }>(),
   {
     id: '',
     isShowLoader: false,
+    label: '',
   }
 )
 
@@ -163,7 +166,7 @@ const isQuestionButton = computed<boolean>(
 
 const removeModalTextNetwork = computed<string>(
   () =>
-    `${localization.value.removeVMNetworkPortGroupQuestionPartOne} ${props.id} ${localization.value.removeVMNetworkPortGroupQuestionPartTwo}`
+    `${localization.value.removeVMNetworkPortGroupQuestionPartOne} ${props.label} ${localization.value.removeVMNetworkPortGroupQuestionPartTwo}`
 )
 // const removeModalTextPortError = computed<string>(
 //   () =>
@@ -180,11 +183,11 @@ const removeModalTextPort = computed<string>(
 // Modal hiding
 const emits = defineEmits<{
   (event: 'hide'): void
-  (event: 'remove', id: string): void
+  (event: 'remove', id: string, type: string): void
 }>()
 
-const onRemove = (id: string) => {
-  emits('remove', id)
+const onRemove = (id: string, type: string) => {
+  emits('remove', id, type)
 }
 const onHideModal = (): void => {
   emits('hide')

package/components/common/diagramMain/port/Port.vue

@@ -41,11 +41,24 @@
         >
           {{ props.port.name }}
           <span
-            v-if="props.port.state?.state === 3"
+            v-if="
+              props.port.state?.state === 2 || props.port.state?.state === 3
+            "
             class="port-state-icon-container"
             :title="props.port.state?.errors?.[0] || ''"
           >
-            <atoms-the-icon name="warning" width="15" height="15" />
+            <atoms-the-icon
+              v-if="props.port.state?.state === 2"
+              name="warning"
+              width="15"
+              height="15"
+            />
+            <atoms-the-icon
+              v-if="props.port.state?.state === 3"
+              name="error-outline"
+              width="15"
+              height="15"
+            />
           </span>
         </span>
       </foreignObject>