bfg-common 1.3.442 → 1.3.443

package/components/common/wizards/datastoreNew/add/Add.vue

@@ -43,7 +43,6 @@
           :is-main-filter="props.isMainFilter"
           :host-id="props.hostId"
           @hide-alert="onHideAlert"
-          @loading="(e) => (loading = e)"
           @submit="onSaveAndNextSharedStorm"
           @main-filter="emits('main-filter', $event)"
         />
@@ -233,9 +232,9 @@ const checkNetwork2 = async (
   } else {
     return {
       isValid: false,
-      message: !form.lunDisk.length
-        ? localization.selectHostToContinueAlert
-        : localization.specifyDatastoreName,
+      message: !form.name
+        ? localization.specifyDatastoreName
+        : localization.selectHostToContinueAlert,
     }
   }
 }
@@ -253,12 +252,12 @@ const checkName2Async = async (
   } = await checkNetwork2(form, localization)
 
   if (!labelValidation.isValid) {
-    stepHasError = wizard.setValidation(1, 'datastoreName', {
+    stepHasError = wizard.setValidation(2, 'datastoreName', {
       fieldMessage: labelValidation.message,
       alertMessage: form.name ? labelValidation.message : '',
     })
-  } else if (wizard.hasMessage(1, 'datastoreName')) {
-    value = wizard.removeValidation(1, 'datastoreName', value)
+  } else if (wizard.hasMessage(2, 'datastoreName')) {
+    value = wizard.removeValidation(2, 'datastoreName', value)
   }
 
   return {

package/components/common/wizards/datastoreNew/add/lib/config/steps.ts

@@ -32,7 +32,12 @@ export const stepsFunc = (
     title: localization.nameAndDeviceSelection,
     subTitle: localization.nameAndDeviceSelectionDesc,
     status: UI_E_WIZARD_STATUS.INACTIVE,
-    fields: {},
+    fields: {
+      datastoreName: {
+        alert: '',
+        field: '',
+      },
+    },
     isValid: true,
     testId: 'select-name-and-device-selection',
   },

package/components/common/wizards/datastoreNew/add/sharedStorm/SharedStorm.vue

@@ -12,7 +12,6 @@
       :is-main-filter="props.isMainFilter"
       :host-id="props.hostId"
       @hide-alert="(e) => emits('hide-alert', e)"
-      @loading="(e) => emits('loading', e)"
       @main-filter="emits('main-filter', $event)"
     />
 
@@ -60,7 +59,6 @@ const model = defineModel<any>()
 const emits = defineEmits<{
   // (event: 'submit', value: { name: string; lunDisk: string[] }): void
   (event: 'hide-alert', value: boolean): void
-  (event: 'loading', value: boolean): void
   (event: 'main-filter', value: string): void
 }>()
 

package/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/DeviceSelection.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="device-selection">
-    {{  }}
     <atoms-alert
       v-show="props.alertMessages.length"
       test-id="device-selection-errors"
@@ -14,10 +13,7 @@
         {{ localization.name }}
       </label>
 
-      <div
-        class="clr-control-container"
-        :class="formErrors.errors?.name?.length && 'clr-error'"
-      >
+      <div class="clr-control-container" :class="nameErrorText && 'clr-error'">
         <div class="flex-align-center">
           <input
             id="device-selection-input"
@@ -32,7 +28,7 @@
         </div>
 
         <div class="clr-subtext ng-star-inserted">
-          {{ formErrors?.errors?.name?.[0] || '' }}
+          {{ nameErrorText }}
         </div>
       </div>
     </div>
@@ -112,16 +108,13 @@ import {
 import {
   UI_I_CreateStorageLunDiskItem,
   UI_I_DeviceSelectionSendData,
-  UI_I_FormValidationDataStore,
   UI_I_LunDiskSpherePayload,
   UI_I_SelectHostOptions,
-} from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+} from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/lib/models/interfaces'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 // import { Ui_T_HostSelectedType } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/types'
 import { UI_T_DatastoreType } from '~/components/common/wizards/datastoreNew/add/lib/models/types'
-import { defaultFormFunc } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/config/defaultForm'
 import { hostsOptionsFunc } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/config/selectOptions'
-import { checkValidityName } from '~/components/common/wizards/datastoreNew/add/lib/utils'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -135,7 +128,6 @@ const props = defineProps<{
 }>()
 const model = defineModel<any>()
 const emits = defineEmits<{
-  (event: 'loading', value: boolean): void
   (event: 'hide-alert', value: number): void
   (event: 'submit', value: UI_I_DeviceSelectionSendData): void
   (event: 'main-filter', value: string): void
@@ -143,44 +135,29 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 const { $store } = useNuxtApp()
-const { $validation } = useNuxtApp()
 
 const isInitDatastoreNameValidation = ref<boolean>(false)
 const initValidation = (): void => {
   isInitDatastoreNameValidation.value = true
-  const valid = validation.touch()
-  if (!valid.isValid) {
-    showValidationErrors(valid)
-  }
 }
 const onInput = (): void => {
-  const valid = validation.touch()
-
   if (!isInitDatastoreNameValidation.value) return
-
-  valid.isValid ? removeInputValidation() : showValidationErrors(valid)
 }
 
-const validation = $validation.call({})
-const defaultForm: UI_I_FormValidationDataStore = defaultFormFunc(
-  localization.value
-)
-const form = ref<UI_I_FormValidationDataStore>(useDeepCopy(defaultForm))
+const nameErrorText = computed<string>(() => {
+  if (props.messagesFields?.datastoreName?.field && !model.value.name) {
+    return props.messagesFields.datastoreName.field
+  }
 
-const setForm = (): void => {
-  form.value = useDeepCopy(defaultForm)
-  validation.setForm(form)
-}
-setForm()
+  if (!isInitDatastoreNameValidation.value) return ''
+  return !model.value.name ? localization.value.specifyDatastoreName : ''
+})
 
 const alertInfo = ref<boolean>(true)
 const onHideAlertInfo = (): void => {
   alertInfo.value = false
 }
 
-const errors = ref<string[]>([])
-const formErrors = ref<UI_I_ValidationTouchResult[]>([])
-
 /* Lun disk table  */
 
 const pagination = ref<UI_I_Pagination>({
@@ -189,8 +166,6 @@ const pagination = ref<UI_I_Pagination>({
 })
 const sort = ref<string | null>(null)
 
-// const selectedLunDisk = ref<number[]>([])
-
 const updatePagination = (event: UI_I_Pagination): void => {
   pagination.value = event
 }
@@ -230,20 +205,9 @@ const onSelectHost = (): void => {
 
 const showValidationErrors = (
   data: UI_I_ValidationTouchResult[],
-  errorText = '',
-  alert = false
-): void => {
-  if (alert) errors.value = [errorText]
-  formErrors.value = data
-}
-
-const resetValidation = (): void => {
-  errors.value = []
-  formErrors.value = []
-}
-const removeInputValidation = (): void => {
-  formErrors.value = []
-}
+  _errorText = '',
+  _alert = false
+): void => {}
 const validatePropertiesForSphere = (): boolean => {
   if (props.datastoreType === 'local') {
     return !selectedHost.value
@@ -300,10 +264,9 @@ const collectDataForReview = (
 }
 
 const submit = async (): Promise<void> => {
-  const name = form.value.name.value
   const { project } = props
 
-  const valid = validation.touch()
+  const valid = { isValid: false }
   const isShowAlertDanger =
     project === 'procurator'
       ? !model.value.lunDisk.length
@@ -322,24 +285,9 @@ const submit = async (): Promise<void> => {
   }
 
   if (!isShowAlertDanger) {
-    emits('loading', true)
-
-    const { valid: validName, msg } = await checkValidityName(
-      name,
-      props.project
-    )
-
-    emits('loading', false)
-
-    if (!validName) {
-      showValidationErrors(valid, msg, true)
-      return
-    }
   }
 
-  resetValidation()
-
-  const eventData = collectDataForReview(name, project)
+  const eventData = collectDataForReview('name', project)
   emits('submit', eventData)
 }
 submit()

package/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/lib/models/interfaces.ts

@@ -1,10 +1,5 @@
-import { UI_I_Validation } from '~/lib/models/plugins/validation/interfaces'
 import { UI_I_DataTableQuery } from '~/lib/models/table/interfaces'
 
-export interface UI_I_FormValidationDataStore {
-  name: UI_I_Validation
-}
-
 export interface UI_I_LunDiskSpherePayload extends UI_I_DataTableQuery {
   host: string
 }

package/package.json

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

package/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/lib/config/defaultForm.ts

@@ -1,18 +0,0 @@
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_FormValidationDataStore } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
-
-export const defaultFormFunc = (
-  localization: UI_I_Localization
-): UI_I_FormValidationDataStore => {
-  return {
-    name: {
-      value: 'Datastore',
-      validations: [
-        {
-          value: 'required',
-          errorText: localization.specifyDatastoreName,
-        },
-      ],
-    },
-  }
-}