bfg-common 1.2.222 → 1.2.224

package/components/common/vm/actions/add/Add.vue

@@ -33,7 +33,7 @@
             @check-name="emits('check-name', $event)"
           />
           <common-vm-actions-common-select-compute-resource
-            v-if="props.project === 'sphere'"
+            v-if="isSphere"
             v-show="selectedStep.id === 3"
             v-model="vmForm.computeResource"
             :compute-resource-submit="computeResourceSubmit"
@@ -227,6 +227,8 @@ const emits = defineEmits<{
   (event: 'clear-compute-resource-tree'): void // для сферы
 }>()
 
+const isSphere = computed<boolean>(() => props.project === 'sphere')
+
 const { $recursion } = useNuxtApp()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -235,7 +237,7 @@ const wizard: Wizard = new Wizard(
   stepsFunc(localization.value),
   stepsSchemeInitial
 )
-if (props.project === 'sphere') wizard.changeScheme(1)
+if (isSphere.value) wizard.changeScheme(1)
 const wasCompleted = computed<boolean>(() => wizard.wasCompleted())
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
 const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
@@ -259,29 +261,26 @@ const validationFunc = async (
 
   wizard.setLoader(true)
   if (
-    wizard.isValidateForStep(1, currentStep.id, nextStep.id) ||
-    wizard.isValidateForStep(2, currentStep.id, nextStep.id)
+    wizard.isValidateForStep(
+      isSphere.value ? 2 : 1,
+      currentStep.id,
+      nextStep.id
+    )
   ) {
-    let nameValidation: any = {}
-
-    nameValidation = await checkName(value)
+    const nameValidation = await checkName(value)
 
-    value = nameValidation.value
+    value = nameValidation.newValue
     stepHasError = stepHasError || nameValidation.stepHasError
   } else if (wizard.isValidateForStep(4, currentStep.id, nextStep.id)) {
-    let storageValidation: any = {}
+    const storageValidation = await checkStorage(value)
 
-    storageValidation = await checkStorage(value)
-
-    value = storageValidation.value
+    value = storageValidation.newValue
 
     stepHasError = stepHasError || storageValidation.stepHasError
   } else if (wizard.isValidateForStep(8, currentStep.id, nextStep.id)) {
-    let storageValidation: any = {}
-
-    storageValidation = await checkCustomizeHardware(value)
+    const storageValidation = await checkCustomizeHardware(value)
 
-    value = storageValidation.value
+    value = storageValidation.newValue
 
     stepHasError = stepHasError || storageValidation.stepHasError
   }
@@ -293,29 +292,34 @@ const validationFunc = async (
     stepShouldStop,
   }
 }
-const checkName = async (value: UI_I_WizardStep[]): Promise<any> => {
+const checkName = async (
+  value: UI_I_WizardStep[]
+): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
   return new Promise((resolve) => {
+    const step = isSphere.value ? 2 : 1
     nameFormSubmit.value = (isValid: boolean) => {
       if (!isValid) {
-        stepHasError = wizard.setValidation(1, 'name', {
+        stepHasError = wizard.setValidation(step, 'name', {
           fieldMessage: 'aaa',
           alertMessage: 'aaa',
         })
-      } else if (wizard.hasMessage(1, 'name')) {
-        value = wizard.removeValidation(1, 'name', value)
+      } else if (wizard.hasMessage(step, 'name')) {
+        value = wizard.removeValidation(step, 'name', value)
       }
 
       resolve({
-        value,
         stepHasError,
+        newValue: value,
       })
       nameFormSubmit.value = null
     }
   })
 }
-const checkStorage = async (value: UI_I_WizardStep[]): Promise<any> => {
+const checkStorage = async (
+  value: UI_I_WizardStep[]
+): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
   return new Promise((resolve) => {
@@ -330,8 +334,8 @@ const checkStorage = async (value: UI_I_WizardStep[]): Promise<any> => {
       }
 
       resolve({
-        value,
         stepHasError,
+        newValue: value,
       })
       storageSubmit.value = null
     }
@@ -339,7 +343,7 @@ const checkStorage = async (value: UI_I_WizardStep[]): Promise<any> => {
 }
 const checkCustomizeHardware = async (
   value: UI_I_WizardStep[]
-): Promise<any> => {
+): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
   return new Promise((resolve) => {
@@ -354,8 +358,8 @@ const checkCustomizeHardware = async (
       }
 
       resolve({
-        value,
         stepHasError,
+        newValue: value,
       })
       storageSubmit.value = null
     }
@@ -381,7 +385,7 @@ const vmFormCash = ref<UI_I_VmFormCash>({
 
 const onChangeName = (name: string, node: UI_I_TreeNode): void => {
   vmForm.value.name = name
-  if (props.project === 'sphere') {
+  if (isSphere.value) {
     vmForm.value.locationPath = $recursion.createAbsolutePathRecursion(
       node,
       'id',
@@ -473,7 +477,9 @@ watch(
   }
 )
 
-const validateSendData = async (value: UI_I_WizardStep[]): Promise<any> => {
+const validateSendData = async (
+  value: UI_I_WizardStep[]
+): Promise<UI_I_ValidationReturn> => {
   wizard.setLoader(true)
   let stepHasError = false
 

package/package.json

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