bfg-common 1.3.458 → 1.3.460

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

@@ -83,12 +83,7 @@ import {
 
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
-// import { UI_I_VerticalStepItem } from '~/components/atoms/lib/models/interfaces'
-import type {
-  UI_T_DatastoreType,
-  UI_T_NfsType,
-  // UI_T_WizardDatastoreMode,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
+import type { UI_T_DatastoreType } from '~/components/common/wizards/datastoreNew/add/lib/models/types'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastoreNew/add/lib/models/interfaces'
 import type {
   UI_I_LunDisk,
@@ -101,11 +96,6 @@ import { checkValidityName } from '~/components/common/wizards/datastoreNew/add/
 
 const props = defineProps<{
   project: UI_T_Project
-  finishFunc: (
-    datastoreForm: UI_I_CreateDatastoreForm,
-    datastoreType: UI_T_DatastoreType,
-    version: UI_T_NfsType
-  ) => Promise<void>
   datacenterHosts?: UI_I_SelectHostOptions[]
   nfsHosts?: any
   isMainFilter?: boolean
@@ -130,10 +120,8 @@ const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 const datastoreType = ref<UI_T_DatastoreType>(
   props.project === 'procurator' ? 'local' : 'shared-storm'
 )
-// const nfsVersion = ref<UI_T_NfsType>('nfs-3')
-// const dataReadyView = ref<any>([])
 
-const form = ref<any>({
+const form = ref<UI_I_CreateDatastoreForm>({
   name: '',
   lunDisk: [],
   type_code: E_DatastoreTypeKode[datastoreType.value],
@@ -193,7 +181,7 @@ const checkName = async (
   } else {
     return {
       isValid: false,
-      message: localization.specifyDatastoreName,
+      message: !label ? localization.specifyDatastoreName : '',
     }
   }
 }
@@ -226,59 +214,6 @@ const checkDatastoreNameAsync = async (
     stepHasError,
   }
 }
-
-const checkNameAndDevice = async (
-  form: any,
-  localization: UI_I_Localization,
-  wizard: Wizard
-  // emits: UI_I_AddNetworkingEmits
-): Promise<UI_I_AsyncCheckReturn> => {
-  if (form.name && form.lunDisk.length) {
-    return new Promise((resolve, _reject) =>
-      checkValidityName(form.name, wizard, (message: string) => {
-        resolve({
-          isValid: message === '',
-          message: message === '' ? '' : message,
-        })
-      })
-    )
-  } else {
-    return {
-      isValid: false,
-      message: !form.name
-        ? localization.specifyDatastoreName
-        : localization.selectHostToContinueAlert,
-    }
-  }
-}
-const checkNameAndDeviceAsync = async (
-  localization: UI_I_Localization,
-  value: UI_I_WizardStep[],
-  form: any,
-  wizard: Wizard
-): Promise<UI_I_ValidationReturn> => {
-  let stepHasError = false
-
-  const labelValidation: {
-    isValid: boolean
-    message: string
-  } = await checkNameAndDevice(form, localization, wizard)
-
-  if (!labelValidation.isValid) {
-    stepHasError = wizard.setValidation(2, 'datastoreName', {
-      fieldMessage: labelValidation.message,
-      alertMessage: form.name ? labelValidation.message : '',
-    })
-  } else if (wizard.hasMessage(2, 'datastoreName')) {
-    value = wizard.removeValidation(2, 'datastoreName', value)
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
-
 const checkNfsFolderSync = (
   localization: UI_I_Localization,
   name: string,
@@ -347,15 +282,19 @@ const validationFunc = async (
   }
 
   if (wizard.isValidateForStep(2, currentStep.id, nextStep.id)) {
-    const nameValidation = await checkNameAndDeviceAsync(
+    const nameValidation = await checkDatastoreNameAsync(
       localization.value,
       value,
-      form.value,
+      form.value.name,
+      2,
+      'datastoreName',
       wizard
     )
 
     value = nameValidation.newValue
 
+    //selectHostToContinueAlert
+
     stepHasError = nameValidation.stepHasError
   }
 
@@ -380,14 +319,14 @@ const validationFunc = async (
 
     const serverValidation = checkNfsServerSync(
       localization.value,
-      form.value.folder,
+      form.value.server,
       wizard,
       value
     )
 
     stepHasError =
-      folderValidation.stepHasError ||
       nameValidation.stepHasError ||
+      folderValidation.stepHasError ||
       serverValidation.stepHasError
   }
 
@@ -422,11 +361,7 @@ watch(
 )
 
 const dataReadyView = computed<UI_I_DetailsItem>(() =>
-  constructDataReadyViewFunc(
-    localization.value,
-    datastoreType.value,
-    form.value
-  )
+  constructDataReadyViewFunc(localization.value, form.value)
 )
 const onNextStep = (_force = false): void => {}
 

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

@@ -1,38 +1,11 @@
-import { UI_T_NfsType } from '~/components/common/wizards/datastore/add/lib/models/types'
-
-// TODO refactoring
-export interface UI_I_NfsPoolNameForm<T = number> {
+import type { UI_T_NfsType } from '~/components/common/wizards/datastoreNew/add/lib/models/types'
+export interface UI_I_CreateDatastoreForm {
+  name: string
+  lunDisk: any
+  nfsVersion: UI_T_NfsType
+  type_code: 1 | 2 | 4
+  readonly: boolean
   server: string
   folder: string
-  version: T
-  readonly: boolean
-  hosts: string[]
-}
-export interface UI_I_CreateDatastoreBodyRequest {
-  name: string
-  pool_name: string
-  type_code: number
-}
-interface I_NfsForm extends UI_I_NfsPoolNameForm<UI_T_NfsType> {
-  name: string
-  type_code: number
-}
-interface I_SharedStorm extends UI_I_CreateDatastoreBodyRequest {
-  dev_names: string[]
-  hosts: string[]
-}
-
-export interface UI_I_CreateDatastoreForm {
-  local: {
-    name: string
-    hosts: string[]
-    type_code: number
-  }
-  sharedStorm: I_SharedStorm
-  nfs: I_NfsForm
-}
-
-export interface UI_I_CreateStorageUuid {
-  code: number
-  pool_name: string
+  hosts?: string[]
 }

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

@@ -11,6 +11,7 @@
       :project="props.project"
       :alert-messages="props.alertMessages"
       :messages-fields="props.messagesFields"
+      @hide-alert="(e) => emits('hide-alert', e)"
       @next="onChangeConfigurationAndNext"
     />
 
@@ -49,6 +50,7 @@ const props = defineProps<{
 }>()
 const model = defineModel<any>()
 const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
   (event: 'submit', value: UI_I_ConfigurationSendDataNfs): void
 }>()
 

package/components/common/wizards/datastoreNew/add/readyComplete/lib/config/propertiesDetails.ts

@@ -1,9 +1,7 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
 import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
-// import { UI_I_ReadyDataForLocal } from '~/components/common/wizards/datastore/add/readyComplete/lib/models/interfaces'
-
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastoreNew/add/lib/models/interfaces'
 const constructLunDiskItems = (
   disks: UI_I_CreateStorageLunDiskItem[]
 ): string => {
@@ -19,7 +17,7 @@ const constructLunDiskItems = (
 
 const nfsDetailsFunc = (
   localization: UI_I_Localization,
-  data: any,
+  data: UI_I_CreateDatastoreForm,
   isSphereWizard: boolean
 ): UI_I_DetailsItem[] => {
   const { name, server, folder, nfsVersion, hosts } = data
@@ -88,9 +86,9 @@ const nfsDetailsFunc = (
 
 const localDetailsFunc = (
   localization: UI_I_Localization,
-  event: any
+  data: UI_I_CreateDatastoreForm
 ): UI_I_DetailsItem[] => {
-  const { name } = event
+  const { name } = data
 
   return [
     {
@@ -110,7 +108,7 @@ const localDetailsFunc = (
 
 const sharedStormDetailsFunc = (
   localization: UI_I_Localization,
-  data: { name: string; lunDisk: UI_I_CreateStorageLunDiskItem[] } // пока так ставляем тип но надо будет поменять когда будем добавлять осталние настройки
+  data: UI_I_CreateDatastoreForm
 ): UI_I_DetailsItem[] => {
   const { name, lunDisk } = data
 
@@ -164,14 +162,13 @@ const sharedStormDetailsFunc = (
 
 export const constructDataReadyViewFunc = (
   localization: UI_I_Localization,
-  type: UI_T_DatastoreType,
-  data: any
+  data: UI_I_CreateDatastoreForm
 ): UI_I_DetailsItem[] => {
   const details = {
-    local: localDetailsFunc,
-    'shared-storm': sharedStormDetailsFunc,
-    nfs: nfsDetailsFunc,
+    1: localDetailsFunc,
+    2: sharedStormDetailsFunc,
+    4: nfsDetailsFunc,
   }
 
-  return details[type](localization, data, false)
+  return details[data.type_code](localization, data, false)
 }

package/package.json

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

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

@@ -1,4 +0,0 @@
-export interface UI_I_ReadyDataForLocal {
-  name: string
-  host: string
-}