bfg-common 1.2.197 → 1.2.198

package/components/atoms/table/simpleTable/SimpleTable.vue

@@ -28,7 +28,9 @@
         <tr
           v-for="(item, key) in presentBodyItems"
           :key="key"
-          :class="{ selected: selectedRowKey === key }"
+          :class="{
+            selected: props.selectedRowKey === key || selectedRowKey === key,
+          }"
           @click="selectRow(key, item)"
         >
           <td
@@ -71,8 +73,9 @@ const props = withDefaults(
     bodyItems: UI_I_TableBodyItem[][]
     editable?: boolean
     testId?: string
+    selectedRowKey?: number
   }>(),
-  { testId: 'ui-simple-table' }
+  { testId: 'ui-simple-table', selectedRowKey: -1 }
 )
 const emits = defineEmits<{
   (event: 'select', value1: number, value2: UI_I_TableBodyItem[]): void

package/components/atoms/wizard/Wizard.vue

@@ -284,8 +284,8 @@ const onPreviousStep = (): void => {
 watch(
   () => props.selectedScheme,
   (newValue: number[]) => {
-    steps.value = props.steps.filter((_step: UI_I_WizardStep, index: number) =>
-      newValue.includes(index)
+    steps.value = props.steps.filter((step: UI_I_WizardStep) =>
+      newValue.includes(step.id)
     )
   },
   { deep: true, immediate: true }
@@ -293,8 +293,8 @@ watch(
 watch(
   () => props.steps,
   (newValue: UI_I_WizardStep[]) => {
-    steps.value = newValue.filter((_step: UI_I_WizardStep, index: number) =>
-      props.selectedScheme.includes(index)
+    steps.value = newValue.filter((step: UI_I_WizardStep) =>
+      props.selectedScheme.includes(step.id)
     )
   },
   { deep: true, immediate: true }

package/components/atoms/wizard/models/interfaces.ts

@@ -42,6 +42,7 @@ export interface UI_I_ValidationReturn {
   newValue: UI_I_WizardStep[]
 }
 
-// export interface UI_I_WizardSlot {
-//   selectedStep: UI_I_WizardStep
-// }
+export interface UI_I_AsyncCheckReturn {
+  isValid: boolean
+  message: string
+}

package/components/atoms/wizard/utils/utils.ts

@@ -15,6 +15,7 @@ export default class Wizard {
   private _stepsScheme: Ref<number[][]>
   private _selectedSchemeId: Ref<number>
   private _wizardLoader: Ref<UI_I_Loader>
+  private _waitingStepId: Ref<number>
   selectedScheme: ComputedRef<number[]>
   alertMessages: ComputedRef<string[][]>
 
@@ -28,6 +29,7 @@ export default class Wizard {
       status: false,
       messages: [],
     })
+    this._waitingStepId = ref<number>(-1)
     this.selectedScheme = computed<number[]>(
       () => this._stepsScheme.value[this._selectedSchemeId.value]
     )
@@ -66,13 +68,32 @@ export default class Wizard {
     return this._selectedSchemeId.value
   }
 
+  set waitingStepId(id: number) {
+    this._waitingStepId.value = id
+  }
+
+  get waitingStepId(): number {
+    return this._waitingStepId.value
+  }
+
   get wizardLoader(): UI_I_Loader {
     return this._wizardLoader.value
   }
 
+  get nextAvailableStep(): number {
+    const currentStepIndex = this.selectedScheme.value.indexOf(
+      this.selectedStepId
+    )
+    return this.selectedScheme.value[currentStepIndex + 1]
+  }
+
   setLoader(status: boolean, messages?: string[]): void {
     this._wizardLoader.value.status = status
 
+    if (!messages && this._wizardLoader.value.messages.length > 0) {
+      this._wizardLoader.value.messages = []
+      return
+    }
     if (!messages) return
 
     messages.length > 0 && (this._wizardLoader.value.messages = messages)
@@ -122,15 +143,25 @@ export default class Wizard {
 
     if (!invalidStep) return
 
-    invalidStep.isValid = false
     invalidStep.fields[field].field = message
 
-    if (this.isSelected(invalidStep.status)) {
-      invalidStep.status = UI_E_WIZARD_STATUS.INVALID_SELECTED
-      return
-    }
+    if (message) {
+      invalidStep.isValid = false
 
-    invalidStep.status = UI_E_WIZARD_STATUS.INVALID
+      if (this.isSelected(invalidStep.status)) {
+        invalidStep.status = UI_E_WIZARD_STATUS.INVALID_SELECTED
+        return
+      }
+
+      invalidStep.status = UI_E_WIZARD_STATUS.INVALID
+    } else {
+      invalidStep.isValid = true
+      if (this.isSelected(invalidStep.status)) {
+        invalidStep.status = UI_E_WIZARD_STATUS.SELECTED
+      } else {
+        invalidStep.status = UI_E_WIZARD_STATUS.COMPLETED
+      }
+    }
   }
 
   setAlertMessage(stepId: number, field: string, message: string): void {
@@ -153,18 +184,6 @@ export default class Wizard {
     )
   }
 
-  hideAlertMessagesByStepId(stepId: number): UI_I_WizardStep[] {
-    const modifiedStep: UI_I_WizardStep = this.steps[stepId]
-
-    for (const field in modifiedStep.fields) {
-      modifiedStep.fields[field].alert = ''
-    }
-
-    return (this.steps = this.steps.map((step: UI_I_WizardStep) =>
-      step.id === stepId ? modifiedStep : step
-    ))
-  }
-
   private removeValidationError(
     stepId: number,
     field: string,
@@ -205,6 +224,18 @@ export default class Wizard {
     )
   }
 
+  hideAlertMessagesByStepId(stepId: number): UI_I_WizardStep[] {
+    const modifiedStep: UI_I_WizardStep = this.steps[stepId]
+
+    for (const field in modifiedStep.fields) {
+      modifiedStep.fields[field].alert = ''
+    }
+
+    return (this.steps = this.steps.map((step: UI_I_WizardStep) =>
+      step.id === stepId ? modifiedStep : step
+    ))
+  }
+
   changeStep(value: UI_I_WizardStep[]): void {
     this.steps = this.steps.map(
       (step: UI_I_WizardStep): UI_I_WizardStep => ({
@@ -242,7 +273,12 @@ export default class Wizard {
 
   async changeSteps(
     value: UI_I_WizardStep[],
-    validationFunc: (
+    validationFunc?: (
+      value: UI_I_WizardStep[],
+      currentStep: UI_I_WizardStep,
+      nextStep: UI_I_WizardStep
+    ) => Promise<UI_I_ValidationReturn>,
+    finalValidationFunc?: (
       value: UI_I_WizardStep[],
       currentStep: UI_I_WizardStep,
       nextStep: UI_I_WizardStep
@@ -280,6 +316,32 @@ export default class Wizard {
 
         validation.stepHasError && this.goToFirstInvalidStep()
 
+        return
+      } else if (this.isLastStep() && finalValidationFunc) {
+        const finalValidation: UI_I_ValidationReturn =
+          await finalValidationFunc(value, currentStep, nextStep)
+
+        if (
+          finalValidation.stepHasError ||
+          finalValidation.stepShouldStop?.ifFromAnyStep ||
+          finalValidation.stepShouldStop?.ifOnCurrentStep
+        ) {
+          finalValidation.stepShouldStop?.ifFromAnyStep &&
+            currentStep.id < finalValidation.stepShouldStop?.stoppageStepId &&
+            this.selectStepHard(finalValidation.stepShouldStop?.stoppageStepId)
+
+          finalValidation.stepShouldStop?.ifOnCurrentStep &&
+            this.selectStepHard(finalValidation.stepShouldStop?.stoppageStepId)
+
+          finalValidation.stepHasError && this.goToFirstInvalidStep()
+
+          return
+        } else {
+          currentStep.status = UI_E_WIZARD_STATUS.COMPLETED
+        }
+
+        this.changeStep(finalValidation.newValue)
+
         return
       } else {
         currentStep.status = UI_E_WIZARD_STATUS.COMPLETED
@@ -295,9 +357,8 @@ export default class Wizard {
 
   selectStepHard(stepId: number): void {
     const newSteps = this.steps.map((st: UI_I_WizardStep) => {
-      console.log(st.id, stepId)
       if (st.id < stepId) return { ...st, status: UI_E_WIZARD_STATUS.COMPLETED }
-      console.log(st.id, stepId)
+
       if (st.id === stepId)
         return { ...st, status: UI_E_WIZARD_STATUS.SELECTED }
 
@@ -312,7 +373,11 @@ export default class Wizard {
     currentStepId: number,
     nextStepId: number
   ): boolean {
-    return nextStepId > step && currentStepId <= step
+    return (
+      nextStepId > step &&
+      currentStepId <= step &&
+      this.selectedScheme.value.includes(step)
+    )
   }
 
   setValidation(
@@ -331,6 +396,11 @@ export default class Wizard {
     return true
   }
 
+  removeValidationLocal(stepId: number, field: string): void {
+    this.setValidationError(stepId, field, '')
+    this.setAlertMessage(stepId, field, '')
+  }
+
   removeValidation(
     stepId: number,
     field: string,
@@ -342,6 +412,7 @@ export default class Wizard {
       true,
       value
     )
+
     newValue = this.removeAlertMessage(stepId, field, newValue)
     return newValue
   }
@@ -383,11 +454,15 @@ export default class Wizard {
   }
 
   activeStepId(): number {
-    return (
-      this.steps.find(
-        (step: UI_I_WizardStep) => step.status === UI_E_WIZARD_STATUS.ACTIVE
-      )?.id || 0
-    )
+    const activeStep = this.steps.find(
+      (step: UI_I_WizardStep) => step.status === UI_E_WIZARD_STATUS.ACTIVE
+    )?.id
+
+    const invalidStep = this.steps.find(
+      (step: UI_I_WizardStep) => step.status === UI_E_WIZARD_STATUS.INVALID
+    )?.id
+
+    return activeStep || invalidStep || 0
   }
 
   wasCompleted(): boolean {
@@ -401,6 +476,10 @@ export default class Wizard {
     )
   }
 
+  isSelectedScheme(schemeId: number): boolean {
+    return schemeId === this.selectedSchemeId
+  }
+
   getStepIdByFieldName(fieldName: string): number {
     return this.steps.find((step) => step.fields[fieldName])?.id || -1
   }

package/components/common/diagramMain/DiagramMain.vue

@@ -193,18 +193,12 @@
         @get-free-adapters="onGetFreeAdapters"
         @hide="onHideSwitchManagePhysicalAdaptersModal"
       />
-      <common-add-networking
+      <common-wizards-network-add
         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(

package/components/common/diagramMain/modals/editSettings/tabs/port/IpvFourSettings.vue

@@ -176,7 +176,7 @@ import {
   UI_I_IpvFourSettingsFields,
   UI_I_ModalsInitialData,
 } from '~/components/common/diagramMain/models/interfaces'
-import { UI_T_IpFourSettingsFieldName } from '~/components/common/addNetworking/models/types'
+import { UI_T_IpFourSettingsFieldName } from '~/components/common/wizards/network/add/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/utils'
 
 const props = withDefaults(