bfg-common 1.2.189 → 1.2.190

package/components/common/diagramMain/DiagramMain.vue

@@ -193,12 +193,18 @@
         @get-free-adapters="onGetFreeAdapters"
         @hide="onHideSwitchManagePhysicalAdaptersModal"
       />
-      <common-wizards-network-add
+      <common-add-networking
         v-if="isShowAddNetworkingModal"
-        :show="isShowAddNetworkingModal"
-        :adapters="props.adapters"
+        modal-name="add-networking-modal"
+        view-name="add-networking"
+        width="872px"
+        height="558px"
+        :title="localization.addNetworking"
         :standard-switches-initial="props.standardSwitchesInitial"
+        :show="isShowAddNetworkingModal"
+        :is-network-invalid="isNetworkInvalid"
         :free-adapters="props.freeAdapters"
+        :adapters="props.adapters"
         :is-dark-mode="props.isDarkMode"
         @check-network-label="onCheckNetworkLabel"
         @get-existing-standard-switches="onGetExistingStandardSwitches"
@@ -209,12 +215,16 @@
       />
       <common-diagram-main-modals-migrate-vmkernel-adapter
         v-if="isShowMigrateVmkernelAdapterModal"
-        :show="isShowMigrateVmkernelAdapterModal"
+        modal-name="migrate-vmkernel-adapter-modal"
+        view-name="migrate-vmkernel-adapter"
+        width="956px"
+        height="636px"
+        :title="`esxi1.иридиум - ${localization.migrateVmKernelNetworkAdapterTo} vSwitch0`"
         :switch-name="diagramData.id"
         :networks-list="props.networksList"
         :switch-networks="diagramData.networks"
+        :show="isShowMigrateVmkernelAdapterModal"
         :is-dark-mode="props.isDarkMode"
-        @check-network-label="onCheckNetworkLabel"
         @hide="onHideMigrateVmkernelAdapterModal"
       />
     </template>
@@ -242,8 +252,9 @@ import { UI_I_ArbitraryObject, UI_I_Localization } from '~/models/interfaces'
 import {
   UI_I_AddNetworkingSecondSchemeDataSend,
   UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
+  UI_I_NetworkLabelCheckExisting,
   UI_I_Switch,
-} from '~/components/common/wizards/network/add/models/interfaces'
+} from '~/components/common/addNetworking/models/interfaces'
 import {
   adapterViewSettingsFunc,
   adapterViewSettingsModalTabsFunc,
@@ -258,6 +269,7 @@ import {
   switchViewSettingsModalTabsFunc,
   vCenterViewSettingsFunc,
 } from '~/components/common/diagramMain/modals/config'
+import { isNetworkInvalidInitial } from '~/components/common/addNetworking/config'
 import {
   managePhysicalAdapterStatusInitial,
   mainRectHeightsInitial,
@@ -285,6 +297,7 @@ const props = withDefaults(
     diagramData: UI_I_DiagramDataFull | null
     inPortlet?: boolean
     standardSwitchesInitial?: UI_I_Switch[]
+    isNetworkInvalid?: UI_I_NetworkLabelCheckExisting
     hostName?: string
     adapters?: UI_I_SwitchAdapters
     freeAdapters?: UI_I_Adapter[]
@@ -295,6 +308,7 @@ const props = withDefaults(
     diagramData: null,
     inPortlet: false,
     standardSwitchesInitial: () => [],
+    isNetworkInvalid: () => isNetworkInvalidInitial,
     hostName: '',
     adapters: () => ({
       totalItems: 0,
@@ -309,6 +323,15 @@ const props = withDefaults(
 const localization = computed<UI_I_Localization>(() => useLocal())
 const initialData = ref<UI_I_ModalsInitialData>({})
 const switchInitialData = ref<UI_I_ModalsInitialData>({})
+const isNetworkInvalid = ref<UI_I_NetworkLabelCheckExisting>()
+
+watch(
+  () => props.isNetworkInvalid,
+  (newValue: UI_I_NetworkLabelCheckExisting) => {
+    isNetworkInvalid.value = newValue
+  },
+  { deep: true, immediate: true }
+)
 
 watch(
   () => props.diagramData?.networking,
@@ -326,9 +349,18 @@ const onValidateBeforeSending = (
     | UI_I_AddNetworkingSecondSchemeDataSend
     | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
   type: string,
-  setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
+  hideSendNetworkDataLoader: () => void,
+  setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void,
+  goToLastStep: (stop?: boolean) => void
 ) => {
-  emits('add-networking-data-validate', networkData, type, setValidation)
+  emits(
+    'add-networking-data-validate',
+    networkData,
+    type,
+    hideSendNetworkDataLoader,
+    setValidation,
+    goToLastStep
+  )
 }
 
 let initialManagePhysicalAdapterStatus: UI_I_AdapterStatus =
@@ -552,9 +584,10 @@ const onChangeEditFieldsData = (newEditFieldsData: UI_I_EditFieldsData) => {
 }
 const onCheckNetworkLabel = (
   networkLabel: string,
-  cb: (error_message: string) => void
+  cb: (error_message: string) => void,
+  hideLoader: () => void
 ) => {
-  emits('check-network-label', networkLabel, cb)
+  emits('check-network-label', networkLabel, cb, hideLoader)
 }
 const onGetExistingStandardSwitches = (cb: () => void) => {
   emits('get-existing-standard-switches', cb)
@@ -849,12 +882,15 @@ const emits = defineEmits<{
       | UI_I_AddNetworkingSecondSchemeDataSend
       | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
     type: string,
+    hideSendNetworkDataLoader: () => void,
     setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void,
+    goToLastStep: (stop?: boolean) => void
   ): void
   (
     event: 'check-network-label',
     networkLabel: string,
-    cb: (error_message: string) => void
+    cb: (error_message: string) => void,
+    hideLoader?: () => void
   ): void
   (event: 'get-free-adapters', cb: () => void): void
   (