bfg-common 1.2.186 → 1.2.187

package/components/common/diagramMain/DiagramMain.vue

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

package/components/common/diagramMain/modals/config/index.ts

@@ -4,7 +4,6 @@ import * as adapterModalConfig from './adapterModal'
 import * as vCenterModalConfig from './vCenterModal'
 import * as initialConfig from './initial'
 import * as switchModalConfig from './switchModal'
-import * as migrateVmkernelAdapterStepsConfig from './migrateVmkernelAdapterSteps'
 import * as validationData from './validation'
 import * as vmKernelAdapterData from './vmKernelAdapter'
 // import * as temporaryData from './temporaryData'
@@ -42,11 +41,6 @@ export const {
   switchEditSettingsTabsFunc,
   switchViewSettingsFunc,
 } = switchModalConfig
-export const {
-  migrateVmkernelAdapterSchemeFunc,
-  createMigrateVmkernelAdapterSchemeReadyCompleteFunc,
-} = migrateVmkernelAdapterStepsConfig
-export const { selectVmKernelAdapterFieldsErrorMessages } = validationData
 export const {
   vmKernelAdapterViewSettingsModalTabsFunc,
   vmKernelAdapterViewSettingsTableHeadFunc,

package/components/common/diagramMain/modals/config/vmKernelAdapter.ts

@@ -7,7 +7,7 @@ import {
   UI_I_BodyItems,
   UI_I_ReadyCompleteFields,
   UI_I_TableHead,
-} from '~/components/common/addNetworking/models/interfaces'
+} from '~/components/common/wizards/network/add/models/interfaces'
 
 export const vmKernelAdapterViewSettingsFunc = (
   localization: UI_I_Localization
@@ -69,7 +69,7 @@ export const vmKernelAdapterTableBodyMapperFunc = (
   {
     editable: false,
     text: vmkernelAdapterData.name,
-    id: vmkernelAdapterData.id,
+    id: vmkernelAdapterData.name,
   },
   {
     editable: false,

package/components/common/diagramMain/modals/editSettings/tabs/NetworkProperties.vue

@@ -90,7 +90,7 @@ import {
 } from '~/components/common/diagramMain/models/interfaces'
 import { UI_T_PropertiesFieldName } from '~/components/common/diagramMain/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/utils'
-import { vlanIdSelectData } from '~/components/common/addNetworking/config'
+import { vlanIdSelectData } from '~/components/common/wizards/network/add/config'
 
 // Props from up
 const props = withDefaults(