bfg-common 1.4.94 → 1.4.97

package/components/common/wizards/vmNew/migrate/Migrate.vue

@@ -19,12 +19,10 @@
           :project="props.project"
         />
 
-        <common-wizards-vm-migrate-select-target-server
-          v-show="currentBlockId === 'select-target-center'"
-        />
+        <common-wizards-vm-migrate-select-target-server v-if="false" />
 
         <common-wizards-vm-migrate-select-compute-resource
-          v-show="currentBlockId === 'select-compute-resource'"
+          v-if="false"
           v-model="form"
           :submit="selectComputeResourceSubmit"
           :get-compute-resource-data="props.getComputeResourceData"
@@ -35,15 +33,17 @@
 
         <common-wizards-vm-new-migrate-select-storage
           v-show="selectedStep.id === 3"
+          :alert-messages="alertMessages[3]"
           :submit="selectStorageSubmit"
           :get-datastore-table-func="props.getDatastoreTableFunc"
           :datastore="props.datastore"
           :connected-storage-id-default="connectedStorageIdOnVm"
           :configure-per-disks="props.configurePerDisks"
+          @hide-alert="onHideAlert"
         />
 
         <common-wizards-vm-migrate-select-network
-          v-if="currentBlockId === 'select-networks'"
+          v-if="false"
           v-model:is-basic-network-mode="
             dataFormLocal.selectNetwork.isShowNetworkBasic
           "
@@ -51,7 +51,7 @@
         />
 
         <common-wizards-vm-migrate-select-priority
-          v-show="currentBlockId === 'select-motion-priority'"
+          v-if="false"
           v-model="selectedVMotionPriority"
         />
 
@@ -73,7 +73,7 @@ import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {
   stepsFunc,
   stepsSchemeInitial,
-} from '~/components/common/wizards/datastore/add/lib/config/steps'
+} from '~/components/common/wizards/vmNew/migrate/lib/config/steps'
 
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
@@ -90,6 +90,7 @@ import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizar
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
 import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/lib/models/types'
 import type { UI_I_CollectedDataFormLocal } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
+import * as validation from '~/components/common/wizards/vmNew/migrate/lib/validations'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -101,8 +102,6 @@ const props = defineProps<{
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
   computeResourceTableData?: any
   computeResourceTree?: UI_I_TreeNode
-  readyCompleteTableInfo?: any // пока так потом если будет нужен изменит или удалить
-  finishFunc: any
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
@@ -121,6 +120,7 @@ const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
 const form = ref<UI_I_MigrateFormLocal>({
   migrate_type: props.project === 'procurator' ? 'storage' : 'resource',
+  storage: ''
 })
 
 const validationFunc = async (
@@ -130,22 +130,17 @@ const validationFunc = async (
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
-  if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
-    // const nameValidation = await validation.checkDatastoreNameAsync(
-    //     localization.value,
-    //     value,
-    //     form.value,
-    //     1,
-    //     'datastoreName',
-    //     wizard,
-    //     props.project
-    // )
+  if (wizard.isValidateForStep(3, currentStep.id, nextStep.id)) {
+    const nameValidation = await validation.checkSelectedDatastoreSync(
+      localization.value,
+      form.value.storage,
+      wizard,
+      value
+    )
 
-    // value = nameValidation.newValue
-    value = 'nameValidation.newValue'
+    value = nameValidation.newValue
 
-    // stepHasError = nameValidation.stepHasError
-    stepHasError = false
+    stepHasError = nameValidation.stepHasError
   }
 
   return {
@@ -191,8 +186,6 @@ const vmMigrateType = ref<UI_T_VmMigrateType>(
 )
 const dataReadyView = ref<UI_I_TableInfoItem[]>([])
 
-const currentBlockId = computed<string>(() => '')
-
 const connectedStorageIdOnVm = computed<string>(
   () => props.vmSettings?.storage.id || ''
 )
@@ -215,6 +208,10 @@ const onFinish = (): void => {
 const onHideModal = (): void => {
   emits('hide')
 }
+
+const onHideAlert = (stepId: number): void => {
+  wizard.hideAlertMessagesByStepId(stepId)
+}
 </script>
 
 <style scoped lang="scss">
@@ -226,33 +223,4 @@ const onHideModal = (): void => {
     padding-left: 10px;
   }
 }
-
-//:deep(.has-solid.close-icon.clr-icon) {
-//  width: 20px;
-//  top: 0;
-//}
-//:deep(.modal .modal-dialog .modal-content .modal-footer) {
-//  flex: unset;
-//  height: unset;
-//  min-height: unset;
-//}
-//:deep(.wizard-modal-titlebar h3) {
-//  color: #000;
-//  font-size: 24px;
-//  font-weight: 200;
-//  line-height: 27px;
-//  margin: 0;
-//  padding: 0;
-//}
-//:deep(.clr-wizard-stepnav-item) {
-//  padding-left: 0;
-//}
-//:deep(.clr-wizard-stepnav
-//    .clr-wizard-stepnav-item
-//    button
-//    .clr-wizard-stepnav-link-title) {
-//  width: 189px;
-//  font-weight: 700;
-//  font-size: 13px;
-//}
 </style>

package/components/common/wizards/vmNew/migrate/lib/config/steps.ts

@@ -18,7 +18,7 @@ export const stepsFunc = (
     id: 1,
     title: localization.common.selectTargetVCenterSer,
     subTitle: localization.common.selectComputeResourceDesc,
-    status: UI_E_WIZARD_STATUS.SELECTED,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
     fields: {},
     isValid: true,
     testId: 'migrate-vm-select-target-server',
@@ -27,7 +27,7 @@ export const stepsFunc = (
     id: 2,
     title: localization.common.selectComputeResource,
     subTitle: localization.common.selectComputeResourceDesc,
-    status: UI_E_WIZARD_STATUS.SELECTED,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
     fields: {},
     isValid: true,
     testId: 'migrate-vm-select-compute-resource',
@@ -36,7 +36,7 @@ export const stepsFunc = (
     id: 3,
     title: localization.common.selectStorage,
     subTitle: localization.common.selectStorageDesc,
-    status: UI_E_WIZARD_STATUS.SELECTED,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
     fields: {
       name: {
         alert: '',
@@ -50,7 +50,7 @@ export const stepsFunc = (
     id: 4,
     title: localization.common.selectNetworks,
     subTitle: localization.common.selectNetworksDesc,
-    status: UI_E_WIZARD_STATUS.SELECTED,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
     fields: {},
     isValid: true,
     testId: 'migrate-vm-select-networks',
@@ -59,7 +59,7 @@ export const stepsFunc = (
     id: 5,
     title: localization.common.selectVMotionPriority,
     subTitle: localization.common.selectVMotionPriorityDesc,
-    status: UI_E_WIZARD_STATUS.SELECTED,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
     fields: {},
     isValid: true,
     testId: 'migrate-vm-select-vMotion-priority',

package/components/common/wizards/vmNew/migrate/lib/models/interfaces.ts

@@ -7,6 +7,7 @@ import type { UI_T_VmMigrateType } from '~/components/common/wizards/vmNew/migra
 
 export interface UI_I_MigrateFormLocal {
   migrate_type: UI_T_VmMigrateType
+  storage: string
 }
 
 export interface UI_I_ChangeStepsSchemes {

package/components/common/wizards/vmNew/migrate/lib/validations.ts

@@ -0,0 +1,29 @@
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_ValidationReturn,
+  UI_I_WizardStep,
+} from '~/components/atoms/wizard/lib/models/interfaces'
+import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+
+export const checkSelectedDatastoreSync = (
+  localization: UI_I_Localization,
+  name: string,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (!name) {
+    stepHasError = wizard.setValidation(3, 'name', {
+      fieldMessage: '',
+      alertMessage: localization.common.selectValidDestinationStorage,
+    })
+  } else if (wizard.hasMessage(3, 'name')) {
+    value = wizard.removeValidation(3, 'name', value)
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}

package/components/common/wizards/vmNew/migrate/select/storage/Storage.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="select-storage">
     <atoms-alert
-      v-if="errorMessages.length"
+      v-show="props.alertMessages?.length"
       test-id="select-storage-alert"
       status="alert-danger"
-      :items="errorMessages"
-      @remove="onHideErrorMessageAlert"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
     />
 
     <common-wizards-vm-migrate-select-storage-selected-per-disk
@@ -77,6 +77,7 @@ import type {
 import { vmMigrateSelectStorageTabsFunc } from '~/components/common/wizards/vm/migrate/select/storage/lib/config/tabsPannel'
 
 const props = defineProps<{
+  alertMessages: string[]
   submit: number
   getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
   datastore: UI_I_DatastoreTableItem[]
@@ -84,6 +85,7 @@ const props = defineProps<{
   configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
 }>()
 const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
   (event: 'next-step', value: UI_I_SelectStorageReadyData): void
 }>()
 
@@ -94,7 +96,6 @@ const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
   vmMigrateSelectStorageTabsFunc(localization.value)
 )
 
-const errorMessages = ref<string[]>([])
 const selectStorageDataLocal = ref<UI_I_SelectStorageDataLocal>({
   vmDiskFormat: 0,
   storage: null,
@@ -160,18 +161,15 @@ const isHideSelectDiskFormat = computed<boolean>(() => {
     selectedPerDisks.value[0].file === 'Configuration file'
   )
 })
-const onHideErrorMessageAlert = (): void => {
-  errorMessages.value = []
-}
 
 const checkValidityBlock = (): boolean => {
   if (!selectStorageDataLocal.value.storage) {
     const errorText = localization.value.common.selectValidDestinationStorage
+    console.log(errorText)
 
-    errorMessages.value = [errorText]
     return false
   }
-  onHideErrorMessageAlert()
+
   const isActivePerDiskTab = activeTab.value === 'configure-disk'
   emits('next-step', {
     ...selectStorageDataLocal.value,
@@ -189,6 +187,10 @@ watch(
     checkValidityBlock()
   }
 )
+
+const onHideAlert = (): void => {
+  emits('hide-alert', 3)
+}
 </script>
 
 <style lang="scss" scoped>

package/package.json

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