bfg-common 1.2.205 → 1.2.206

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

@@ -90,7 +90,7 @@ export default class Wizard {
   setLoader(status: boolean, messages?: string[]): void {
     this._wizardLoader.value.status = status
 
-    if (!messages && this._wizardLoader.value.messages.length > 0) {
+    if (!messages && this._wizardLoader.value?.messages.length > 0) {
       this._wizardLoader.value.messages = []
       return
     }
@@ -535,4 +535,34 @@ export default class Wizard {
         : step
     )
   }
+
+  validateFieldLocal(
+      stepId: number,
+      field: string,
+      rule: boolean | boolean[],
+      fieldMessage: string | string[],
+      alertMessage: string | string[]
+  ): void {
+    if (typeof rule === 'boolean') {
+      if (rule) {
+        this.setValidation(stepId, field, {
+          fieldMessage: fieldMessage as string,
+          alertMessage: alertMessage as string,
+        })
+      } else if (this.hasMessage(stepId, field)) {
+        this.removeValidationLocal(stepId, field)
+      }
+    } else {
+      const ruleIndex = rule.indexOf(true)
+
+      if (ruleIndex !== -1) {
+        this.setValidation(stepId, field, {
+          fieldMessage: fieldMessage[ruleIndex],
+          alertMessage: alertMessage[ruleIndex],
+        })
+      } else if (this.hasMessage(stepId, field)) {
+        this.removeValidationLocal(stepId, field)
+      }
+    }
+  }
 }

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common.ts

@@ -1,5 +1,3 @@
-import type Wizard from '~/components/atoms/wizard/utils/utils'
-
 export const isIntegerNumberInRange = (
   value: number | string | undefined,
   down: number,
@@ -14,34 +12,3 @@ export const checkVlanId = (vlanId: string): boolean =>
   vlanId !== 'None (0)' &&
   vlanId !== 'All (4095)' &&
   (isIntegerNumberInRange(vlanId, 0, 4095) || vlanId === '')
-
-export const validateFieldLocal = (
-  wizard: Wizard,
-  stepId: number,
-  field: string,
-  rule: boolean | boolean[],
-  fieldMessage: string | string[],
-  alertMessage: string | string[]
-): void => {
-  if (typeof rule === 'boolean') {
-    if (rule) {
-      wizard.setValidation(stepId, field, {
-        fieldMessage: fieldMessage as string,
-        alertMessage: alertMessage as string,
-      })
-    } else if (wizard.hasMessage(stepId, field)) {
-      wizard.removeValidationLocal(stepId, field)
-    }
-  } else {
-    const ruleIndex = rule.indexOf(true)
-
-    if (ruleIndex !== -1) {
-      wizard.setValidation(stepId, field, {
-        fieldMessage: fieldMessage[ruleIndex],
-        alertMessage: alertMessage[ruleIndex],
-      })
-    } else if (wizard.hasMessage(stepId, field)) {
-      wizard.removeValidationLocal(stepId, field)
-    }
-  }
-}

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings.ts

@@ -8,18 +8,14 @@ import {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
 } from '~/components/atoms/wizard/models/interfaces'
-import {
-  validateFieldLocal,
-  checkVlanId,
-} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common'
+import { checkVlanId } from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common'
 
 export const validateVlanIdConnectionSettingsLocal = (
   localization: UI_I_Localization,
   data: UI_I_ConnectionSettings,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     1,
     UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
     checkVlanId(data.vlanId),
@@ -33,8 +29,7 @@ export const validateNetworkConnectionSettingsLocal = (
   data: UI_I_ConnectionSettings,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     1,
     UI_E_MigrationValidationFields.CONNECTION_SETTINGS_NETWORK,
     data.networkLabel === '',

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter.ts

@@ -3,15 +3,13 @@ import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/
 import { UI_I_Localization } from '~/models/interfaces'
 import type Wizard from '~/components/atoms/wizard/utils/utils'
 import { UI_I_WizardStep, UI_I_ValidationReturn } from '~/components/atoms/wizard/models/interfaces'
-import { validateFieldLocal } from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common'
 
 export const validateSelectedVmLocal = (
   localization: UI_I_Localization,
   data: UI_I_SelectVmkernelAdapter,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     0,
     'vm',
     data.vm === '',

package/components/common/vm/actions/add/utils.ts

@@ -1,28 +1,12 @@
 import type { UI_I_WizardStep } from '~/components/atoms/wizard/models/interfaces'
 
-import { UI_I_ArbitraryObject } from '~/models/interfaces'
 import { UI_E_Fields } from '~/components/common/vm/actions/common/models/enums'
-import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
 import { UI_I_Localization } from '~/models/interfaces'
 import { UI_I_VerticalStepItem } from '~/components/atoms/models/interfaces'
 import { UI_T_Project } from '~/models/types'
 import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/models/enums'
 import { checkAllField } from '~/components/common/vm/actions/utils'
 
-export const objectToOptionItem = (
-  // TODO переместить в более глобальное место
-  obj: UI_I_ArbitraryObject<string>
-): UI_I_OptionItem[] => {
-  const result = []
-  for (const key in obj) {
-    result.push({
-      text: obj[key],
-      value: key,
-    })
-  }
-  return result
-}
-
 export const getStepPositionByField = (field: string): number => {
   if (checkAllField(field)) {
     return UI_E_Fields[field]

package/components/common/wizards/network/add/steps/SelectedTargetDevice.vue

@@ -308,7 +308,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
 const emits = defineEmits<{
   (event: 'change-target-device', targetDevice: UI_I_TargetDevice): void
-  (event: 'hide-alert', stepId: 2): void
+  (event: 'hide-alert', stepId: 1): void
 }>()
 
 const isConnectionTypeFirstTwo = computed<boolean>(() =>

package/components/common/wizards/network/add/validations/common.ts

@@ -1,5 +1,3 @@
-import type Wizard from '~/components/atoms/wizard/utils/utils'
-
 export const isIntegerNumberInRange = (
   value: number | string | undefined,
   down: number,
@@ -26,33 +24,3 @@ export const checkMtu = (mtu: number): boolean => {
   return !!(mtu === 0 ? '0' : mtu) && isIntegerNumberInRange(mtu, 1280, 65535)
 }
 
-export const validateFieldLocal = (
-  wizard: Wizard,
-  stepId: number,
-  field: string,
-  rule: boolean | boolean[],
-  fieldMessage: string | string[],
-  alertMessage: string | string[]
-): void => {
-  if (typeof rule === 'boolean') {
-    if (rule) {
-      wizard.setValidation(stepId, field, {
-        fieldMessage: fieldMessage as string,
-        alertMessage: alertMessage as string,
-      })
-    } else if (wizard.hasMessage(stepId, field)) {
-      wizard.removeValidationLocal(stepId, field)
-    }
-  } else {
-    const ruleIndex = rule.indexOf(true)
-
-    if (ruleIndex !== -1) {
-      wizard.setValidation(stepId, field, {
-        fieldMessage: fieldMessage[ruleIndex],
-        alertMessage: alertMessage[ruleIndex],
-      })
-    } else if (wizard.hasMessage(stepId, field)) {
-      wizard.removeValidationLocal(stepId, field)
-    }
-  }
-}

package/components/common/wizards/network/add/validations/connectionSettings.ts

@@ -6,18 +6,14 @@ import {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
 } from '~/components/atoms/wizard/models/interfaces'
-import {
-  validateFieldLocal,
-  checkVlanId,
-} from '~/components/common/wizards/network/add/validations/common'
+import { checkVlanId } from '~/components/common/wizards/network/add/validations/common'
 
 export const validateVlanIdConnectionSettingsLocal = (
   localization: UI_I_Localization,
   data: UI_I_ConnectionSettings,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     5,
     UI_E_ValidationFields.CONNECTION_SETTINGS_VLAN,
     checkVlanId(data.vlanId),
@@ -31,8 +27,7 @@ export const validateNetworkConnectionSettingsLocal = (
   data: UI_I_ConnectionSettings,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     5,
     UI_E_ValidationFields.CONNECTION_SETTINGS_NETWORK,
     data.networkLabel === '',

package/components/common/wizards/network/add/validations/ipFourSettings.ts

@@ -6,18 +6,14 @@ import {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
 } from '~/components/atoms/wizard/models/interfaces'
-import {
-  validateFieldLocal,
-  checkIfValidIP,
-} from '~/components/common/wizards/network/add/validations/common'
+import { checkIfValidIP } from '~/components/common/wizards/network/add/validations/common'
 
 export const validateAddressIpFourSettingsLocal = (
   localization: UI_I_Localization,
   data: UI_I_IpFourSettings,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     4,
     UI_E_ValidationFields.IPV_SETTINGS_IPV,
     [!data.static.ipFourAddress, !checkIfValidIP(data.static.ipFourAddress)],
@@ -31,8 +27,7 @@ export const validateMaskIpFourSettingsLocal = (
   data: UI_I_IpFourSettings,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     4,
     UI_E_ValidationFields.IPV_SETTINGS_MASK,
     [!data.static.subnetMask, !checkIfValidIP(data.static.subnetMask)],
@@ -46,8 +41,7 @@ export const validateGatewayIpFourSettingsLocal = (
   data: UI_I_IpFourSettings,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     4,
     UI_E_ValidationFields.IPV_SETTINGS_GATEWAY,
     [

package/components/common/wizards/network/add/validations/networkValidation.ts

@@ -2,7 +2,8 @@ import { UI_I_AddNetworkingEmits } from '~/components/common/wizards/network/add
 import { UI_I_Localization } from '~/models/interfaces'
 import type Wizard from '~/components/atoms/wizard/utils/utils'
 import {
-  UI_I_AsyncCheckReturn, UI_I_ValidationReturn,
+  UI_I_AsyncCheckReturn,
+  UI_I_ValidationReturn,
   UI_I_WizardStep,
 } from '~/components/atoms/wizard/models/interfaces'
 
@@ -57,6 +58,13 @@ export const checkNetworkAsync = async (
 
   wizard.setLoader(false)
 
+  if (labelValidation.message === 'onHideLoader') {
+    return {
+      newValue: value,
+      stepHasError: true,
+    }
+  }
+
   if (!labelValidation.isValid) {
     stepHasError = wizard.setValidation(stepId, fieldName, {
       fieldMessage: labelValidation.message,

package/components/common/wizards/network/add/validations/portProperties.ts

@@ -4,7 +4,6 @@ import { UI_I_Localization } from '~/models/interfaces'
 import type Wizard from '~/components/atoms/wizard/utils/utils'
 import {UI_I_ValidationReturn, UI_I_WizardStep} from '~/components/atoms/wizard/models/interfaces'
 import {
-  validateFieldLocal,
   checkVlanId,
   checkMtu,
 } from '~/components/common/wizards/network/add/validations/common'
@@ -14,8 +13,7 @@ export const validateNetworkPortPropertiesLocal = (
   data: UI_I_PortProperties,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     3,
     UI_E_ValidationFields.PORT_PROPERTIES_NETWORK,
     data.networkLabel === '',
@@ -29,8 +27,7 @@ export const validateVlanIdPortPropertiesLocal = (
   data: UI_I_PortProperties,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     3,
     UI_E_ValidationFields.PORT_PROPERTIES_VLAN,
     checkVlanId(data.vlanId),
@@ -44,8 +41,7 @@ export const validateMtuPortPropertiesLocal = (
   data: UI_I_PortProperties,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     3,
     UI_E_ValidationFields.PORT_PROPERTIES_MTU,
     data.mtu.option === '1' && checkMtu(data.mtu.size),

package/components/common/wizards/network/add/validations/targetDevice.ts

@@ -6,18 +6,14 @@ import {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
 } from '~/components/atoms/wizard/models/interfaces'
-import {
-  validateFieldLocal,
-  checkMtu,
-} from '~/components/common/wizards/network/add/validations/common'
+import { checkMtu } from '~/components/common/wizards/network/add/validations/common'
 
 export const validateMtuTargetDeviceLocal = (
   localization: UI_I_Localization,
   data: UI_I_TargetDevice,
   wizard: Wizard
 ): void => {
-  validateFieldLocal(
-    wizard,
+  wizard.validateFieldLocal(
     1,
     UI_E_ValidationFields.TARGET_DEVICE_MTU,
     data.selected === '3' && checkMtu(data.mtu || 0),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.2.205",
+  "version": "1.2.206",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",