bfg-common 1.4.58 → 1.4.60

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

@@ -1,38 +1,19 @@
 import type { UI_T_NfsType } from '~/components/common/wizards/datastore/add/lib/models/types'
-
-// TODO refactoring
-export interface UI_I_NfsPoolNameForm<T = number> {
+import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import type { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
+export interface UI_I_CreateDatastoreForm {
+  name: string
+  lunDisk: UI_I_CreateStorageLunDiskItem[]
+  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
+export interface UI_I_ChangeStepsSchemes {
+  [key: string]: {
+    [key in UI_T_DatastoreType]?: number
   }
-  sharedStorm: I_SharedStorm
-  nfs: I_NfsForm
-}
-
-export interface UI_I_CreateStorageUuid {
-  code: number
-  pool_name: string
 }

package/components/common/wizards/datastore/add/lib/models/types.ts

@@ -5,10 +5,3 @@ export type UI_T_KerberosAuthentication =
   | 'dont-use'
   | 'use-only-krb5'
   | 'use-integrity'
-
-export type UI_T_WizardDatastoreMode = 'procurator' | 'sphere'
-
-export interface UI_I_DatastoreValidityName {
-  valid: boolean
-  msg: any
-}

package/components/common/wizards/datastore/add/lib/utils.ts

@@ -1,45 +1,32 @@
 import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
-import type {
-  UI_I_DatastoreValidityName,
-  UI_T_WizardDatastoreMode,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
-// import {
-//   UI_I_CreateDatastoreBodyRequest,
-//   I_CreateStorageUuid,
-// } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
-
-// type T_StoragePoolNameResult = {
-//   data: I_CreateStorageUuid
-//   msg: API_UI_I_Error
-// }
-
-// type T_NullableStoragePoolNameResult = {
-//   [K in keyof T_StoragePoolNameResult]: T_StoragePoolNameResult[K] | null
-// }
+import type { UI_T_Project } from '~/lib/models/types'
+import Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import { UI_E_Kind } from '~/lib/models/enums'
 
 export const checkValidityName = async (
   name: string,
-  mode: UI_T_WizardDatastoreMode = 'procurator'
-): Promise<UI_I_DatastoreValidityName> => {
-  // TODO move to projects!!!
+  wizard: Wizard,
+  project: UI_T_Project,
+  sendMessage: (message: string) => void
+): Promise<void> => {
 
-  const kind = 10 // TODO move in global space
+  wizard.setLoader(true)
   const url =
-    mode === 'procurator'
+    project === 'procurator'
       ? `/ui/ds/validate?name=${name}`
-      : `/ui/object/validate_name?name=${name}&kind=${kind}`
+      : `/ui/object/validate_name?name=${name}&kind=${UI_E_Kind.STORAGE_VALIDATION_NAME}`
   // @ts-ignore
   const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
     method: 'GET',
   })
+  wizard.setLoader(false)
 
   if (error.value && error.value.data.error_code !== 0) {
     const existError = error.value.data?.error_message || error.value.data
-
-    return { valid: false, msg: existError }
+    sendMessage(existError)
+    return
   }
-
-  return { valid: true, msg: null }
+  sendMessage('')
 }
 
 export const validateNameAndGenerateDataId = (
@@ -74,30 +61,3 @@ export const validateNameAndGenerateDataId = (
 
   return baseDataId
 }
-
-// export const getStoragePoolName = async <T>(
-//   url: string,
-//   params: T
-// ): Promise<T_NullableStoragePoolNameResult> => {
-//   const { data, error } = await useMyFetch<I_CreateStorageUuid, API_UI_I_Error>(
-//     url,
-//     {
-//       method: 'POST',
-//       body: params,
-//     }
-//   )
-//
-//   if (error.value) return { data: null, msg: error.value }
-//
-//   return { data: data.value, msg: null }
-// }
-
-// export const createDatastore = async <T = UI_I_CreateDatastoreBodyRequest>(
-//   params: T
-// ): Promise<API_UI_I_Error> => {
-//   const { error } = await useMyFetch<any, API_UI_I_Error>('/api/v1/pn/ds', {
-//     method: 'POST',
-//     body: params,
-//   })
-//   return error.value
-// }

package/components/common/wizards/{datastoreNew → datastore}/add/lib/validations.ts

@@ -5,9 +5,9 @@ import type {
   UI_I_WizardStep,
 } from '~/components/atoms/wizard/lib/models/interfaces'
 import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
-import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastoreNew/add/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
-import { checkValidityName } from '~/components/common/wizards/datastoreNew/add/lib/utils'
+import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
 
 const checkName = async (
   form: UI_I_CreateDatastoreForm,

package/components/common/wizards/datastore/add/local/Local.vue

@@ -1,63 +1,37 @@
 <template>
   <div class="local-step">
-    <span
-      v-if="mode === 'sphere' && props.stepPosition === 1"
-      class="vmfs-container__desc"
-    >
-      {{ localization.common.nameAndDeviceSelectionDesc }}
-    </span>
-
     <common-wizards-datastore-add-local-create-name
-      v-show="mode === 'procurator' && props.stepPosition === 1"
-      :local-create-name-submit="props.localCreateNameSubmit"
-      @loading="(e) => emits('loading', e)"
-      @submit="(e) => emits('submit', e)"
-    />
-
-    <common-wizards-datastore-add-shared-storm-device-selection
-      v-if="mode === 'sphere' && props.stepPosition === 1"
-      v-model:lun-disk="selectedLunDisk"
-      mode="sphere"
-      :device-selection-submit="props.localCreateNameSubmit"
-      :step-position="props.stepPosition"
-      :datastore-type="props.datastoreType"
-      :datacenter-hosts="props.datacenterHosts"
-      :is-main-filter="props.isMainFilter"
-      @loading="(e) => emits('loading', e)"
-      @submit="(e) => emits('submit', e)"
-      @main-filter="emits('main-filter', $event)"
+      v-if="isShowCreateLocalNameBlock"
+      v-model="model.name"
+      :alert-messages="props.alertMessages"
+      :messages-fields="props.messagesFields"
+      @hide-alert="(e) => emits('hide-alert', e)"
     />
   </div>
 </template>
 
 <script lang="ts" setup>
-import type {
-  UI_I_CreateStorageLunDiskItem,
-  UI_I_SelectHostOptions,
-} from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import type {
-  UI_T_WizardDatastoreMode,
-  UI_T_DatastoreType,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
+import type { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
+import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 
 const props = defineProps<{
-  stepPosition: number
-  localCreateNameSubmit: number
+  project: UI_T_Project
+  stepId: number
   datastoreType: UI_T_DatastoreType
-  mode: UI_T_WizardDatastoreMode
-  datacenterHosts?: UI_I_SelectHostOptions[]
-  isMainFilter?: boolean
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
 }>()
+const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const emits = defineEmits<{
-  (event: 'loading', value: boolean): void
-  (event: 'submit', value: string): void
-  (event: 'main-filter', value: string): void
+  (event: 'hide-alert', value: number): void
 }>()
 
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectedLunDisk = ref<UI_I_CreateStorageLunDiskItem[]>([])
+const isShowCreateLocalNameBlock = computed<boolean>(
+  () => props.project === 'procurator' && props.stepId === 1
+)
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/datastore/add/local/createName/CreateName.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="create-datastore-name">
     <atoms-alert
-      v-show="errors.length"
-      :test-id="errorAlertDataId"
+      v-show="props.alertMessages.length"
+      test-id="create-storage-name-alert-error"
       status="alert-danger"
-      :items="errors"
-      @remove="onRemoveValidationErrors"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
     />
 
     <div class="clr-form-control clr-row">
@@ -17,12 +17,12 @@
         <div class="flex-align-center">
           <input
             id="datastore-name"
-            v-model.trim="form.name.value"
+            v-model.trim="createDatastoreNameLocal"
             data-id="datastore-name-input"
             type="text"
             class="clr-input"
-            @blur="onBlurInputName"
-            @input="onInputName"
+            @blur="initValidation(true)"
+            @input="initValidation(false)"
           />
           <atoms-the-icon class="error-icon" name="info-circle" />
         </div>
@@ -36,96 +36,46 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_FormValidationDataStore } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import { defaultFormFunc } from '~/components/common/wizards/datastore/add/local/createName/lib/config/defaultForm'
-import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
-import { validateNameAndGenerateDataId } from '~/components/common/wizards/datastore/add/lib/utils'
+import type {
+  UI_I_Localization,
+  UI_I_ArbitraryObject,
+} from '~/lib/models/interfaces'
+import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 
 const props = defineProps<{
-  localCreateNameSubmit: number
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
 }>()
+const createDatastoreNameLocal = defineModel<string>()
 const emits = defineEmits<{
-  (event: 'loading', value: boolean): void
-  (event: 'submit', value: string): 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_FormValidationDataStore = defaultFormFunc(
-  localization.value
-)
-const form = ref<UI_I_FormValidationDataStore>(useDeepCopy(defaultForm))
-
-const setForm = () => {
-  form.value = useDeepCopy(defaultForm)
-  validation.setForm(form)
-}
-setForm()
-
-const validForm = ref<UI_I_ValidationTouchResult | null>(null)
 
 /* Validation for Name input */
 const isInitNameValidation = ref<boolean>(false)
-const onBlurInputName = (): void => {
-  validForm.value = validation.touch()
-  isInitNameValidation.value = true
-}
-const onInputName = () => {
-  validForm.value = validation.touch()
-}
-const nameErrorText = computed<string>(() => {
-  if (!isInitNameValidation.value) return ''
-  return validForm.value?.errors?.name?.[0] || ''
-})
-/* Validation Name input end */
-
-const errorAlertDataId = ref<string>('')
-const errors = ref<string[]>([])
-const showValidationErrors = (data: string[]): void => {
-  errors.value = data
-  errorAlertDataId.value = validateNameAndGenerateDataId(
-    form.value.name.value,
-    data[0]
-  )
+const initValidation = (onlyBlur = false): void => {
+  onlyBlur && (isInitNameValidation.value = true)
 }
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
-const submit = async (): Promise<void> => {
-  const name = form.value.name.value
 
-  if (!name) {
-    validForm.value = validation.touch()
-    isInitNameValidation.value = true
-    if (nameErrorText.value) return
+const nameErrorText = computed<string>(() => {
+  if (
+    props.messagesFields?.datastoreName?.field &&
+    !createDatastoreNameLocal.value
+  ) {
+    return props.messagesFields.datastoreName.field
   }
 
-  if (name) {
-    emits('loading', true)
-
-    const { valid, msg } = await checkValidityName(name)
-
-    emits('loading', false)
-
-    if (!valid) {
-      showValidationErrors([msg])
-      return
-    }
-  }
+  if (!isInitNameValidation.value) return ''
+  return !createDatastoreNameLocal.value
+    ? localization.value.common.specifyDatastoreName
+    : ''
+})
 
-  onRemoveValidationErrors()
-  emits('submit', name)
+const onHideAlert = (): void => {
+  emits('hide-alert', 1)
 }
-watch(
-  () => props.localCreateNameSubmit,
-  () => {
-    submit()
-  }
-)
 </script>
 
 <style lang="scss" scoped>

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

@@ -1,111 +1,62 @@
 <template>
   <div class="nfs-container">
-    <span class="nfs-container__desc">{{ stepSubTitle }}</span>
-
     <common-wizards-datastore-add-nfs-version
-      v-show="props.stepPosition === 1"
-      v-model:version="nfsVersion"
+      v-if="props.stepId === 4"
+      v-model="model.nfsVersion"
     />
 
     <common-wizards-datastore-add-nfs-configuration
-      v-show="props.stepPosition === 2"
-      :mode="props.mode"
-      :nfs-version="nfsVersion"
-      :nfs-configuration-submit="nfsConfigurationSubmit"
-      @loading="(e) => emits('loading', e)"
-      @next="onChangeConfigurationAndNext"
+      v-show="props.stepId === 5"
+      v-model="model"
+      :project="props.project"
+      :alert-messages="props.alertMessages"
+      :messages-fields="props.messagesFields"
+      @hide-alert="(e) => emits('hide-alert', e)"
     />
 
-    <!--    <templates-home-datastore-actions-add-nfs-kerberos-authentication-->
-    <!--      v-show="nfsVersion === 'nfs-4.1' && props.stepPosition === 3"-->
-    <!--      :nfs-version="nfsVersion"-->
-    <!--    />--><!-- TODO Он будет когда будем делать групповое -->
-
     <common-wizards-datastore-add-nfs-accessibility
       v-if="showHostAccessibility"
-      :host-accessibility-submit="props.hostAccessibilitySubmit"
+      v-model="model.hosts"
+      :alert-messages="props.alertMessages"
       :hosts="props.hosts"
-      @next="onChangeAccessibilityAndNext"
+      @hide-alert="(e) => emits('hide-alert', e)"
     />
-    <!-- TODO Он будет когда будем делать групповое  -->
   </div>
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/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_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
-import { subTitleFunc } from '~/components/common/wizards/datastore/add/lib/config/stepItems'
+  UI_I_Localization,
+  UI_I_ArbitraryObject,
+} from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 
 const props = defineProps<{
-  mode: UI_T_WizardDatastoreMode
-  stepPosition: number
-  datastoreType: UI_T_DatastoreType
-  nfsConfigurationSubmit: number
-  hostAccessibilitySubmit: number
+  project: UI_T_Project
+  stepId: number
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   hosts?: any
 }>()
+const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const emits = defineEmits<{
-  (event: 'loading', value: boolean): void
-  (event: 'submit', value: UI_I_ConfigurationSendDataNfs): void
-  (event: 'change-nfs-version', value: UI_T_NfsType): void
+  (event: 'hide-alert', value: number): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const nfsVersion = ref<UI_T_NfsType>('nfs-3')
-
-const stepSubTitle = computed<string>(() => {
-  const { datastoreType, stepPosition } = props
-  return subTitleFunc(
-    localization.value,
-    datastoreType,
-    stepPosition,
-    nfsVersion.value
-  )
-})
-
-// const showHostAccessibility = computed<boolean>(() => {
-//   return (
-//     (props.stepPosition === 4 && nfsVersion.value === 'nfs-4.1') ||
-//     (props.stepPosition === 3 && nfsVersion.value === 'nfs-3')
-//   )
-// })
 const showHostAccessibility = computed<boolean>(() => {
-  return props.mode === 'sphere' && props.stepPosition === 3
+  return props.project === 'sphere' && props.stepId === 6
 })
-
-watch(nfsVersion, (newValue: UI_T_NfsType) => {
-  emits('change-nfs-version', newValue)
-})
-
-let sendData: any = null
-const onChangeConfigurationAndNext = (
-  event: UI_I_ConfigurationSendDataNfs
-): void => {
-  sendData = {
-    name: event.name,
-    folder: event.folder,
-    server: event.server,
-    hosts: [],
-  }
-  emits('submit', sendData)
-}
-const onChangeAccessibilityAndNext = (hosts: string[]): void => {
-  sendData.hosts = hosts
-  emits('submit', sendData)
-}
 </script>
 
 <style lang="scss" scoped>
 @import '~/assets/scss/common/mixins.scss';
 .nfs-container {
   @include flex($dir: column);
-  height: 100%;
+  height: inherit;
   &__desc {
   }
 }

package/components/common/wizards/datastore/add/nfs/accessibility/Accessibility.vue

@@ -1,11 +1,11 @@
 <template>
-  <div>
+  <div class="host-accessibility">
     <atoms-alert
-      v-show="errors.length"
+      v-show="props.alertMessages?.length"
       test-id="accessibility"
       status="alert-danger"
-      :items="errors"
-      @remove="removeValidationErrors"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
     />
 
     <div>
@@ -18,14 +18,11 @@
     </div>
     <div>
       <common-wizards-datastore-add-nfs-accessibility-tables-view
-        v-model:selected-row="selectedHosts"
+        v-model="modelHosts"
         :data-table="dataTable?.items || []"
         :total-items="dataTable?.total_items || 0"
         :total-pages="dataTable?.total_pages || 1"
-        :pagination="pagination"
         :table-type="activeTab"
-        @pagination="updatePagination"
-        @sort="sortTable"
       />
     </div>
   </div>
@@ -34,20 +31,21 @@
 <script lang="ts" setup>
 import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
 import type { T_HostsAccessibilityTab } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
+import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
 import { hostAccessibilityTabsFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/config/tabsPannel'
-// import { hostsAccessibilityTablesFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/hostsTableItems'
 
 const props = defineProps<{
-  hostAccessibilitySubmit: number
-  hosts?: any
+  alertMessages: string[]
+  hosts?: UI_I_CreateDatastoreHosts
 }>()
-const localization = computed<UI_I_Localization>(() => useLocal())
+const modelHosts = defineModel<string[]>()
 const emits = defineEmits<{
-  (event: 'next', value: string[]): void
+  (event: 'hide-alert', value: number): void
 }>()
 
+const localization = computed<UI_I_Localization>(() => useLocal())
+
 const activeTab = ref<T_HostsAccessibilityTab>('compatible-hosts')
 const tabs = computed<UI_I_CollapseNavItem[]>(() =>
   hostAccessibilityTabsFunc(localization.value, [
@@ -56,49 +54,10 @@ const tabs = computed<UI_I_CollapseNavItem[]>(() =>
   ])
 )
 
-// const dataTable = computed(() => hostsAccessibilityTablesFunc(activeTab.value))
-// TODO refactoring
-const dataTable = computed<any>(() => props.hosts)
-
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 35,
-})
-const sort = ref<string | null>(null)
-
-const selectedHosts = ref<string[]>([])
-
-const updatePagination = (event: UI_I_Pagination): void => {
-  pagination.value = event
-}
-const sortTable = (event: string): void => {
-  sort.value = event
-}
-
-const errors = ref<string[]>([])
-
-const showValidationErrors = (text: string): void => {
-  errors.value = [text]
-}
-const removeValidationErrors = (): void => {
-  errors.value = []
+const dataTable = computed<UI_I_CreateDatastoreHosts>(() => props.hosts)
+const onHideAlert = (): void => {
+  emits('hide-alert', 6)
 }
-const submit = async () => {
-  if (!selectedHosts.value.length) {
-    const text = localization.value.common.selectLeastEntityContinue
-    showValidationErrors(text)
-    return
-  }
-
-  removeValidationErrors()
-  emits('next', selectedHosts.value)
-}
-watch(
-  () => props.hostAccessibilitySubmit,
-  () => {
-    submit()
-  }
-)
 </script>
 
 <style lang="scss" scoped></style>

package/components/common/wizards/datastore/add/nfs/accessibility/lib/models/interfaces.ts

@@ -4,10 +4,6 @@ export interface I_CompatibleHostsTable {
     cluster: string
 }
 
-
-
-
-
 export interface I_IncompatibleHostsTable extends I_CompatibleHostsTable{
     host_incompatibility_reason: string
 }