bfg-common 1.3.455 → 1.3.457

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

@@ -55,11 +55,8 @@
           :datastore-type="datastoreType"
           :alert-messages="alertMessages[selectedStep.id]"
           :messages-fields="selectedStep.fields"
-          :nfs-configuration-submit="nfsConfigurationSubmit"
           :host-accessibility-submit="hostAccessibilitySubmit"
           :hosts="props.nfsHosts"
-          @loading="(e) => (loading = e)"
-          @change-nfs-version="updateNfsVersion"
           @submit="saveChangesAndNextNfs"
         />
 
@@ -136,7 +133,6 @@ const datastoreType = ref<UI_T_DatastoreType>(
 // const nfsVersion = ref<UI_T_NfsType>('nfs-3')
 // const dataReadyView = ref<any>([])
 
-
 const form = ref<any>({
   name: '',
   lunDisk: [],
@@ -170,7 +166,7 @@ const datastoreForm = ref<UI_I_CreateDatastoreForm>({
   },
 })
 
-const checkNetwork = async (
+const checkName = async (
   label: string,
   localization: UI_I_Localization,
   wizard: Wizard
@@ -192,11 +188,12 @@ const checkNetwork = async (
     }
   }
 }
-
-const checkNameAsync = async (
+const checkDatastoreNameAsync = async (
   localization: UI_I_Localization,
   value: UI_I_WizardStep[],
   label: string,
+  stepId: number,
+  fieldName: string,
   wizard: Wizard
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
@@ -204,15 +201,15 @@ const checkNameAsync = async (
   const labelValidation: {
     isValid: boolean
     message: string
-  } = await checkNetwork(label, localization, wizard)
+  } = await checkName(label, localization, wizard)
 
   if (!labelValidation.isValid) {
-    stepHasError = wizard.setValidation(1, 'datastoreName', {
+    stepHasError = wizard.setValidation(stepId, fieldName, {
       fieldMessage: labelValidation.message,
       alertMessage: label ? labelValidation.message : '',
     })
-  } else if (wizard.hasMessage(1, 'datastoreName')) {
-    value = wizard.removeValidation(1, 'datastoreName', value)
+  } else if (wizard.hasMessage(stepId, fieldName)) {
+    value = wizard.removeValidation(stepId, fieldName, value)
   }
 
   return {
@@ -221,7 +218,7 @@ const checkNameAsync = async (
   }
 }
 
-const checkNetwork2 = async (
+const checkNameAndDevice = async (
   form: any,
   localization: UI_I_Localization,
   wizard: Wizard
@@ -245,7 +242,7 @@ const checkNetwork2 = async (
     }
   }
 }
-const checkName2Async = async (
+const checkNameAndDeviceAsync = async (
   localization: UI_I_Localization,
   value: UI_I_WizardStep[],
   form: any,
@@ -256,7 +253,7 @@ const checkName2Async = async (
   const labelValidation: {
     isValid: boolean
     message: string
-  } = await checkNetwork2(form, localization, wizard)
+  } = await checkNameAndDevice(form, localization, wizard)
 
   if (!labelValidation.isValid) {
     stepHasError = wizard.setValidation(2, 'datastoreName', {
@@ -273,6 +270,29 @@ const checkName2Async = async (
   }
 }
 
+const checkNfsFolderSync = (
+  localization: UI_I_Localization,
+  name: string,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (!name) {
+    stepHasError = wizard.setValidation(5, 'folder', {
+      fieldMessage: localization.noHostOrClusterSelected,
+      alertMessage: '',
+    })
+  } else if (wizard.hasMessage(5, 'folder')) {
+    value = wizard.removeValidation(5, 'folder', value)
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
 const validationFunc = async (
   value: UI_I_WizardStep[],
   currentStep: UI_I_WizardStep,
@@ -281,10 +301,12 @@ const validationFunc = async (
   let stepHasError = false
 
   if (wizard.isValidateForStep(1, currentStep.id, nextStep.id)) {
-    const nameValidation = await checkNameAsync(
+    const nameValidation = await checkDatastoreNameAsync(
       localization.value,
       value,
       form.value.name,
+      1,
+      'datastoreName',
       wizard
     )
 
@@ -294,7 +316,7 @@ const validationFunc = async (
   }
 
   if (wizard.isValidateForStep(2, currentStep.id, nextStep.id)) {
-    const nameValidation = await checkName2Async(
+    const nameValidation = await checkNameAndDeviceAsync(
       localization.value,
       value,
       form.value,
@@ -306,6 +328,28 @@ const validationFunc = async (
     stepHasError = nameValidation.stepHasError
   }
 
+  if (wizard.isValidateForStep(5, currentStep.id, nextStep.id)) {
+    const nameValidation = await checkDatastoreNameAsync(
+      localization.value,
+      value,
+      form.value.name,
+      5,
+      'name',
+      wizard
+    )
+
+    value = nameValidation.newValue
+
+    const folderValidation = checkNfsFolderSync(
+      localization.value,
+      form.value.folder,
+      wizard,
+      value
+    )
+
+    stepHasError = folderValidation.stepHasError || nameValidation.stepHasError
+  }
+
   return {
     newValue: value,
     stepHasError,
@@ -343,50 +387,8 @@ const dataReadyView = computed<UI_I_DetailsItem>(() =>
     form.value
   )
 )
+const onNextStep = (_force = false): void => {}
 
-// let cashStep = -1
-const onNextStep = (_force = false): void => {
-  // const isValid = checkSubmit(force)
-  //
-  // if (!isValid) {
-  //   return
-  // }
-  //
-  // const isDisabled = stepItems.value[cashStep]?.disabled
-  // if (cashStep !== -1 && !isDisabled) {
-  //   stepPosition.value = cashStep
-  //   cashStep = -1
-  //   return
-  // }
-  //
-  // stepItems.value[stepPosition.value].complete = true
-  // stepItems.value[stepPosition.value + 1].disabled = false
-  // stepPosition.value++
-}
-
-// const onChangeStep = (key: number): void => {
-//   if (key < stepPosition.value) {
-//     stepPosition.value = key
-//     return
-//   }
-//
-//   const isValid = checkSubmit()
-//
-//   if (!isValid) {
-//     cashStep = key
-//     return
-//   }
-//
-//   stepPosition.value = key
-// }
-
-const updateNfsVersion = (event: UI_T_NfsType): void => {
-  // nfsVersion.value = event
-  const { name, server, folder, hosts } = datastoreForm.value.nfs
-  saveChangesAndNextNfs({ name, server, folder, hosts }, false)
-}
-
-const nfsConfigurationSubmit = ref<number>(0)
 const hostAccessibilitySubmit = ref<number>(0)
 
 const isWizardModeForSphere = computed<boolean>(

package/components/common/wizards/datastoreNew/add/nfs/Nfs.vue

@@ -10,9 +10,7 @@
       v-model="model"
       :project="props.project"
       :alert-messages="props.alertMessages"
-      :messages-fields="props.selectedStep"
-      :nfs-configuration-submit="nfsConfigurationSubmit"
-      @loading="(e) => emits('loading', e)"
+      :messages-fields="props.messagesFields"
       @next="onChangeConfigurationAndNext"
     />
 
@@ -46,13 +44,11 @@ const props = defineProps<{
   datastoreType: UI_T_DatastoreType
   alertMessages: string[]
   messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-  nfsConfigurationSubmit: number
   hostAccessibilitySubmit: number
   hosts?: any
 }>()
 const model = defineModel<any>()
 const emits = defineEmits<{
-  (event: 'loading', value: boolean): void
   (event: 'submit', value: UI_I_ConfigurationSendDataNfs): void
 }>()
 

package/components/common/wizards/datastoreNew/add/nfs/configuration/Configuration.vue

@@ -2,11 +2,11 @@
   <div class="configuration">
     <div>
       <atoms-alert
-        v-show="errors.length"
+        v-show="props.alertMessages?.length"
         test-id="configuration-error"
         status="alert-danger"
-        :items="errors"
-        @remove="onCloseAlertDanger"
+        :items="props.alertMessages"
+        @remove="onHideAlert"
       />
 
       <atoms-alert
@@ -124,9 +124,9 @@
     </div>
 
     <div v-if="false" class="clr-form-control clr-row mt-1">
-      <label for="" class="clr-control-label clr-col-md-2">{{
-        localization.accessMode
-      }}</label>
+      <label for="" class="clr-control-label clr-col-md-2">
+        {{ localization.accessMode }}
+      </label>
 
       <div class="clr-col-md-10 clr-col-12 clr-checkbox-wrapper">
         <input
@@ -145,54 +145,26 @@
 
 <script lang="ts" setup>
 import type { UI_T_Project } from '~/lib/models/types'
-import { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
 import type {
   UI_I_Localization,
   UI_I_ArbitraryObject,
 } from '~/lib/models/interfaces'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
-import {
-  UI_I_DataServersListItem,
-  UI_I_FormValidationConfiguration,
-} from '~/components/common/wizards/datastore/add/nfs/configuration/serversList/lib/models/interfaces'
-import {
-  UI_I_ConfigurationSendDataNfs,
-  UI_I_InitialValidationFields,
-} from '~/components/common/wizards/datastoreNew/add/nfs/configuration/lib/models/interfaces'
-import { defaultFormFunc } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/config/defaultForm'
-import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
+import type { UI_I_DataServersListItem } from '~/components/common/wizards/datastoreNew/add/nfs/configuration/serversList/lib/models/interfaces'
+import type { UI_I_InitialValidationFields } from '~/components/common/wizards/datastoreNew/add/nfs/configuration/lib/models/interfaces'
 
 const props = defineProps<{
   project: UI_T_Project
   alertMessages: string[]
   messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-  nfsConfigurationSubmit: number
 }>()
 const model = defineModel<any>()
 const emits = defineEmits<{
-  (event: 'loading', value: boolean): void
-  (event: 'next', value: UI_I_ConfigurationSendDataNfs): void
+  (event: 'hide-alert', value: number): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $validation } = useNuxtApp()
 
-const validation = $validation.call({})
-const defaultForm: UI_I_FormValidationConfiguration = defaultFormFunc(
-  localization.value
-)
-const form = ref<UI_I_FormValidationConfiguration>(useDeepCopy(defaultForm))
-const setForm = () => {
-  form.value = useDeepCopy(defaultForm)
-  validation.setForm(form)
-}
-setForm()
-
-const validForm = ref<UI_I_ValidationTouchResult | null>(null)
-
-const isInitNameValidation = ref<boolean>(false) // Удалить
-const isInitFolderValidation = ref<boolean>(false) // Удалить
-const isInitServerValidation = ref<boolean>(false) // Удалить
 const initValidationFields = ref<UI_I_InitialValidationFields>({
   name: false,
   folder: false,
@@ -219,7 +191,7 @@ const folderErrorText = computed<string>(() => {
   }
 
   if (!initValidationFields.value.folder) return ''
-  return !model.value.folder ? localization.value.specifyDatastoreName : ''
+  return !model.value.folder ? localization.value.specifyFolderName : ''
 })
 
 /* Validation error text for Server input field */
@@ -230,11 +202,10 @@ const serverErrorText = computed<string>(() => {
 
   // if (!initValidationFields.value.server || dataServers.value.length) return ''
   if (!initValidationFields.value.server) return ''
-  return !model.value.server ? localization.value.specifyDatastoreName : ''
+  return !model.value.server ? localization.value.specifyServerName : ''
 })
 
 const accessMode = ref<boolean>(false)
-
 const dataServers = ref<UI_I_DataServersListItem[]>([])
 // const onAddServerToList = (): void => {
 //   const { server } = form.value
@@ -261,72 +232,10 @@ const dataServers = ref<UI_I_DataServersListItem[]>([])
 //
 //   // if (nfsVersion === 'nfs-4.1') server.value = ''
 // }
-
-const alertInfo = ref<boolean>(props.project === 'procurator')
-
-const resetValidation = (): void => {
-  isInitNameValidation.value =
-    isInitFolderValidation.value =
-    isInitServerValidation.value =
-      false
-  validForm.value = null
-  errors.value = []
-}
-
-watch(
-  () => props.nfsConfigurationSubmit,
-  () => {
-    submit()
-  }
-)
-const submit = async (): Promise<void> => {
-  const { name, server, folder } = form.value
-
-  validForm.value = validation.touch()
-  isInitNameValidation.value =
-    isInitFolderValidation.value =
-    isInitServerValidation.value =
-      true
-
-  if (nameErrorText.value || folderErrorText.value || serverErrorText.value) {
-    return
-  }
-
-  emits('loading', true)
-
-  const { valid, msg } = await checkValidityName(name.value, props.project)
-
-  emits('loading', false)
-
-  if (!valid) {
-    showValidationErrors(msg)
-    return
-  }
-
-  // if (server.value) onAddServerToList()
-
-  resetValidation()
-
-  const configurationData: UI_I_ConfigurationSendDataNfs = {
-    name: name.value,
-    folder: folder.value,
-    server: server.value,
-  }
-
-  emits('next', configurationData)
-  // if (props.nfsVersion !== 'nfs-4.1') {
-  //   dataServers.value = []
-  // }
-}
-
-const errors = ref<string[]>([])
-
-const showValidationErrors = (errorText: string): void => {
-  errors.value = [errorText]
-}
-const onCloseAlertDanger = (): void => {
-  errors.value = []
+const onHideAlert = (): void => {
+  emits('hide-alert', 5)
 }
+const alertInfo = ref<boolean>(props.project === 'procurator')
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/datastoreNew/add/nfs/configuration/serversList/lib/models/interfaces.ts

@@ -1,11 +1,3 @@
-import { UI_I_Validation } from '~/lib/models/plugins/validation/interfaces'
-
-export interface UI_I_FormValidationConfiguration {
-  name: UI_I_Validation
-  folder: UI_I_Validation
-  server: UI_I_Validation
-}
-
 export interface UI_I_DataServersListItem {
   server_name: string
 }

package/package.json

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

package/components/common/wizards/datastoreNew/add/nfs/configuration/lib/config/defaultForm.ts

@@ -1,33 +0,0 @@
-import { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const defaultFormFunc = (localization: UI_I_Localization): any => {
-  return {
-    name: {
-      value: 'Datastore',
-      validations: [
-        {
-          value: 'required',
-          errorText: localization.specifyDatastoreName,
-        },
-      ],
-    },
-    folder: {
-      value: '',
-      validations: [
-        {
-          value: 'required',
-          errorText: localization.specifyFolderName,
-        },
-      ],
-    },
-    server: {
-      value: '',
-      validations: [
-        {
-          value: 'required',
-          errorText: localization.specifyServerName,
-        },
-      ],
-    },
-  }
-}