bfg-common 1.4.58 → 1.4.60

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

@@ -1,11 +1,11 @@
 <template>
-  <div class="device-selection">
+  <div class="device-selection-step">
     <atoms-alert
-      v-show="errors.length"
+      v-show="props.alertMessages?.length"
       :test-id="errorAlertDataId"
       status="alert-danger"
-      :items="errors"
-      @remove="onCloseAlertDanger"
+      :items="props.alertMessages"
+      @remove="onHideAlert"
     />
 
     <div class="clr-form-control clr-row">
@@ -13,28 +13,21 @@
         {{ localization.common.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"
-            v-model="form.name.value"
+            v-model="model.name"
             data-id="device-selection-input"
             type="text"
             class="clr-input"
-            @blur="initValidation"
-            @input="onInput"
+            @blur="initValidation(true)"
+            @input="initValidation(false)"
           />
           <atoms-the-icon class="error-icon" name="info-circle" />
         </div>
 
-        <div
-          v-if="nameErrorText"
-          class="clr-subtext"
-          data-id="storm-datastore-name-field-require"
-        >
+        <div class="clr-subtext" data-id="storm-datastore-name-field-require">
           {{ nameErrorText }}
         </div>
       </div>
@@ -43,14 +36,14 @@
     <atoms-alert
       v-if="alertInfo"
       test-id="device-selection-information-alert"
-      class="device-selection__alert-info"
+      class="device-selection-step__alert-info"
       status="alert-info"
       :items="[localization.common.nameAndDeviceSelectionAlertInfo]"
       @remove="onHideAlertInfo"
     />
 
     <div
-      v-if="props.mode === 'sphere' && !props.hostId"
+      v-if="props.project === 'sphere' && !props.hostId"
       class="clr-form-control clr-row"
     >
       <label class="clr-control-label clr-col-12 clr-col-md-2">
@@ -61,7 +54,7 @@
         <div class="clr-select-wrapper">
           <select
             id="device-host-select"
-            v-model="selectedHost"
+            v-model="model.hosts"
             data-id="device-host-select"
             class="dropdown-toggle"
             @change="onSelectHost"
@@ -69,7 +62,7 @@
             <option
               v-for="(item, index) in hostOptions"
               :key="index"
-              :value="item.value"
+              :value="[item.value]"
               :disabled="item.disabled"
             >
               {{ item.text }}
@@ -82,9 +75,9 @@
       </div>
     </div>
 
-    <div class="device-selection__disk-list">
-      <common-wizards-datastore-add-shared-storm-device-selection-host-table
-        v-model:selected="selectedLunDisk"
+    <div class="device-selection-step__disk-list">
+      <common-wizards-datastore-add-shared-storm-device-selection-table
+        v-model="model.lunDisk"
         :data-table="dataTable?.items || []"
         :total-items="dataTable?.total_items || 0"
         :total-pages="dataTable?.total_pages || 1"
@@ -100,97 +93,78 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
-// import type { UI_I_SchemaTablePayload } from '~/lib/models/store/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 import type {
+  UI_I_Localization,
+  UI_I_ArbitraryObject,
+} from '~/lib/models/interfaces'
+import {
   API_UI_I_DataTable,
   UI_I_Pagination,
   UI_I_DataTableQuery,
 } from '~/lib/models/table/interfaces'
 import type {
   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'
-// import type { UI_T_HostSelectedType } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/types'
-import type {
-  UI_T_DatastoreType,
-  UI_T_WizardDatastoreMode,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
-import { defaultFormFunc } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/config/defaultForm'
+import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
+import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
+import type { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
 import { hostsOptionsFunc } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/config/selectOptions'
-import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
 import { validateNameAndGenerateDataId } from '~/components/common/wizards/datastore/add/lib/utils'
 
 const props = defineProps<{
-  mode: UI_T_WizardDatastoreMode
-  deviceSelectionSubmit: number
-  lunDisk: UI_I_CreateStorageLunDiskItem[]
-  stepPosition: number
+  project: UI_T_Project
+  stepId: number
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   datastoreType: UI_T_DatastoreType
-  datacenterHosts?: UI_I_SelectHostOptions[] | undefined
+  hosts?: UI_I_CreateDatastoreHosts | undefined
   isMainFilter?: boolean
   hostId?: string
 }>()
+const model = defineModel<any>()
 const emits = defineEmits<{
-  (event: 'loading', value: boolean): void
-  (event: 'submit', value: UI_I_DeviceSelectionSendData): void
-  (
-    event: 'update:lun-disk',
-    value: UI_I_CreateStorageLunDiskItem[] | null
-  ): void
+  (event: 'hide-alert', value: number): void
   (event: 'main-filter', value: string): void
 }>()
 
 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 initValidation = (onlyBlur: boolean): void => {
+  onlyBlur && (isInitDatastoreNameValidation.value = true)
 }
 
-const nameErrorText = computed<string>(
-  () => formErrors.value?.errors?.name?.[0] || ''
-)
+const nameErrorText = computed<string>(() => {
+  if (props.messagesFields?.datastoreName?.field && !model.value.name) {
+    return props.messagesFields.datastoreName.field
+  }
 
-const validation = $validation.call({})
-const defaultForm: UI_I_FormValidationDataStore = defaultFormFunc(
-  localization.value
-)
-const form = ref<UI_I_FormValidationDataStore>(useDeepCopy(defaultForm))
+  if (!isInitDatastoreNameValidation.value) return ''
+  return !model.value.name ? localization.value.common.specifyDatastoreName : ''
+})
 
-const setForm = (): void => {
-  form.value = useDeepCopy(defaultForm)
-  validation.setForm(form)
-}
-setForm()
+const defaultDataId = ref<string>('device-selection-alert-error')
+const errorAlertDataId = computed<string>(() => {
+  if (!props.alertMessages?.length) return
+
+  return !model.value.lunDisk.length
+    ? `${defaultDataId.value}-not-selected-lundisk`
+    : validateNameAndGenerateDataId(
+        model.value.name,
+        props.alertMessages[0],
+        defaultDataId.value
+      )
+})
 
 const alertInfo = ref<boolean>(true)
 const onHideAlertInfo = (): void => {
   alertInfo.value = false
 }
 
-const errors = ref<string[]>([])
-const errorAlertDataId = ref<string>('')
-const defaultDataId = ref<string>('device-selection-alert-error')
-const formErrors = ref<UI_I_ValidationTouchResult[]>([])
-
 /* Lun disk table  */
 
 const pagination = ref<UI_I_Pagination>({
@@ -199,22 +173,6 @@ const pagination = ref<UI_I_Pagination>({
 })
 const sort = ref<string | null>(null)
 
-const selectedLunDisk = ref<number[]>([])
-
-watch(
-  selectedLunDisk,
-  (newValue: number[] | null) => {
-    if (newValue === null || !dataTable.value) return null
-
-    const lunDisk = dataTable.value.items.filter((_: any, key: number) =>
-      newValue.includes(key)
-    )
-
-    emits('update:lun-disk', lunDisk)
-  },
-  { deep: true }
-)
-
 const updatePagination = (event: UI_I_Pagination): void => {
   pagination.value = event
 }
@@ -229,165 +187,20 @@ const loading = computed<boolean>(() =>
 const dataTable = computed<API_UI_I_DataTable<
   UI_I_CreateStorageLunDiskItem[]
 > | null>(() => {
-  // if (props.mode === 'procurator')
   return $store.getters['storage/getNewDatastoreHosts']
-
-  // if (props.datastoreType === 'local') return []
-  //
-  // if (props.datastoreType === 'shared-storm') return []
-  //
-  // if (props.datastoreType === 'nfs') return []
 })
 
 /*  Select host */
-// const hostData = ref<UI_I_SelectHostOptions[] | null>(null)
-const selectedHost = ref<string>(props.hostId || '')
 const hostOptions = computed<UI_I_SelectHostOptions[]>(() =>
-  hostsOptionsFunc(localization.value, props.datacenterHosts)
-) //  <!-- TODO  Нам сейчас он не нужен. Мы монтируем nfs только на один хост ( procurator )-->
+  hostsOptionsFunc(localization.value, props.hosts?.items)
+)
 
 const onSelectHost = (): void => {
-  if (props.datastoreType !== 'shared-storm') return
-
-  initLunDisksForSphere(selectedHost.value)
-}
-
-const showValidationErrors = (
-  data: UI_I_ValidationTouchResult[],
-  errorText = '',
-  alert = false
-): void => {
-  if (alert) {
-    errors.value = [errorText]
-    errorAlertDataId.value = !selectedLunDisk.value.length
-      ? `${defaultDataId.value}-not-selected-lundisk`
-      : validateNameAndGenerateDataId(
-          form.value.name.value,
-          errorText,
-          defaultDataId.value
-        )
-  }
-  formErrors.value = data
-}
-
-const resetValidation = (): void => {
-  errors.value = []
-  formErrors.value = []
-}
-const removeInputValidation = (): void => {
-  formErrors.value = []
-}
-const onCloseAlertDanger = (): void => {
-  errors.value = []
-}
-const validatePropertiesForSphere = (): boolean => {
-  if (props.datastoreType === 'local') {
-    return !selectedHost.value
-  }
-
-  if (props.datastoreType === 'shared-storm') {
-    return !selectedHost.value || !selectedLunDisk.value.length
-  }
+  if (props.datastoreType !== 'shared-storm') return // TODO рефакторинг ( удалить проверку )
 
-  return false
+  initLunDisksForSphere(model.value.hosts[0])
 }
-const validationTextForSphere = (): string => {
-  if (props.datastoreType === 'local') {
-    return 'selectHostToContinueAlert'
-  }
-
-  if (props.datastoreType === 'shared-storm') {
-    return !selectedHost.value
-      ? 'selectHostToContinueAlert'
-      : 'selectDiskToContinueAlert'
-  }
 
-  return ''
-}
-
-const collectDataForReview = (
-  name: string,
-  mode: UI_T_WizardDatastoreMode
-): UI_I_DeviceSelectionSendData => {
-  const data: UI_I_DeviceSelectionSendData = {
-    name,
-  }
-
-  if (mode === 'procurator') {
-    data.lunDisk = props.lunDisk.map((lun) => {
-      return { name: lun.name, capacity: lun.capacity_mb }
-    })
-  }
-
-  if (mode === 'sphere') {
-    if (props.datastoreType === 'local') {
-      data.host = selectedHost.value
-    }
-
-    if (props.datastoreType === 'shared-storm') {
-      data.host = selectedHost.value
-      data.lunDisk = props.lunDisk.map((lun) => {
-        return { name: lun.name, capacity: lun.capacity_mb }
-      })
-    }
-  }
-
-  return data
-}
-
-const submit = async (): Promise<void> => {
-  const name = form.value.name.value
-  const { mode } = props
-
-  const valid = validation.touch()
-  const isShowAlertDanger =
-    mode === 'procurator'
-      ? !selectedLunDisk.value.length
-      : validatePropertiesForSphere()
-
-  if (!valid.isValid || isShowAlertDanger) {
-    const isModeSphere = mode === 'sphere'
-
-    const errorText =
-      localization.value.common[
-        isModeSphere ? validationTextForSphere() : 'selectDiskToContinueAlert'
-      ]
-
-    showValidationErrors(valid, errorText, isShowAlertDanger)
-    return
-  }
-
-  if (!isShowAlertDanger) {
-    emits('loading', true)
-
-    const { valid: validName, msg } = await checkValidityName(name, props.mode)
-
-    emits('loading', false)
-
-    if (!validName) {
-      showValidationErrors(valid, msg, true)
-      return
-    }
-  }
-
-  resetValidation()
-
-  const eventData = collectDataForReview(name, mode)
-  emits('submit', eventData)
-}
-
-watch(
-  () => props.deviceSelectionSubmit,
-  () => {
-    submit()
-  }
-)
-
-// const initHostData = async (): Promise<void> => {
-//   hostData.value = await $store.dispatch('storage/A_GET_DATACENTER_HOSTS', {
-//     schema: 'short',
-//   } as UI_I_SchemaTablePayload)
-// }
 const initLunDisksForSphere = async (host: string): Promise<void> => {
   await $store.dispatch('storage/A_GET_DISKS_LIST', {
     host,
@@ -405,34 +218,18 @@ const initLunDisksDataTable = async (): Promise<void> => {
   } as UI_I_DataTableQuery)
 }
 
-watch(
-  () => props.stepPosition,
-  () => {
-    const { stepPosition, datastoreType, mode } = props
-    // const hostsDataForProcurator =
-    //   $store.getters['storage/getNewDatastoreHosts']
+if (props.project === 'procurator') {
+  // && props.stepId === 2
+  initLunDisksDataTable()
+}
 
-    // if (
-    //   mode === 'sphere' &&
-    //   stepPosition === 1 &&
-    //   datastoreType === 'local' &&
-    //   !hostData.value
-    // ) {
-    //   initHostData()
-    // }
-    if (
-      mode === 'procurator' &&
-      stepPosition === 1 &&
-      datastoreType === 'shared-storm'
-    ) {
-      initLunDisksDataTable()
-    }
-  }
-)
+const onHideAlert = (): void => {
+  emits('hide-alert', props.stepId)
+}
 </script>
 
 <style lang="scss" scoped>
-.device-selection {
+.device-selection-step {
   display: flex;
   flex-direction: column;
   height: inherit;

package/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/config/selectOptions.ts

@@ -1,11 +1,11 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 
 const constructHostListFunc = (
-  data: { name: string; id: string }[]
+  data: { host: string; id: string }[]
 ): UI_I_SelectHostOptions[] => {
   return data.map((item) => ({
-    text: item.name,
+    text: item.host,
     value: item.id,
     disabled: false,
   }))
@@ -13,7 +13,7 @@ const constructHostListFunc = (
 
 export const hostsOptionsFunc = (
   localization: UI_I_Localization,
-  hosts: { name: string; id: string }[] | undefined
+  hosts: { host: string; id: string }[] | undefined
 ): UI_I_SelectHostOptions[] => {
   if (!hosts) return []
 

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

@@ -1,9 +1,4 @@
-import type { UI_I_Validation } from '~/lib/models/plugins/validation/interfaces'
-import type { UI_I_DataTableQuery } from '~/lib/models/table/interfaces'
-
-export interface UI_I_FormValidationDataStore {
-  name: UI_I_Validation
-}
+import { UI_I_DataTableQuery } from '~/lib/models/table/interfaces'
 
 export interface UI_I_LunDiskSpherePayload extends UI_I_DataTableQuery {
   host: string
@@ -13,11 +8,6 @@ export interface UI_I_LunDisk {
   name: string
   capacity: string
 }
-export interface UI_I_DeviceSelectionSendData {
-  name: string
-  lunDisk?: UI_I_LunDisk[]
-  host?: string
-}
 
 export interface UI_I_SelectHostOptions {
   text: string

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

@@ -1,14 +1 @@
-export type UI_T_HostTableItemsKey =
-  | 'name'
-  | 'identifier'
-  | 'lun'
-  | 'capacity_mb'
-  | 'hardware_acceleration'
-  | 'drive_type'
-  | 'sector_format'
-
-// export type Ui_T_HostSelectedType = 'host-1' | 'host-2' | 'host-3' | 'host-4' | 'host-5'
-
-
-
-
+export type T_DatastoreTableItemsTuple = ['name', 'type_ds', 'description']

package/components/common/wizards/{datastoreNew → datastore}/add/sharedStorm/deviceSelection/table/Table.vue

@@ -38,8 +38,8 @@ import type {
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
 import { UI_I_Localization } from '~/lib/models/interfaces'
 import { UI_I_Pagination } from '~/lib/models/table/interfaces'
-import { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import * as lunDiskTable from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/table/lib/config/lunDiskTable'
+import { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import * as lunDiskTable from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/table/lib/config/lunDiskTable'
 
 const props = defineProps<{
   dataTable: UI_I_CreateStorageLunDiskItem[]

package/components/common/wizards/{datastoreNew → datastore}/add/sharedStorm/deviceSelection/table/lib/config/lunDiskTable.ts

@@ -6,7 +6,7 @@ import type {
 import * as defaultSettings from '~/components/atoms/table/dataGrid/lib/config/settingsTable'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import { lunDiskTableItemsKeys } from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/table/lib/config/tableKeys'
+import { lunDiskTableItemsKeys } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/table/lib/config/tableKeys'
 
 const getItems = (
   localization: UI_I_Localization

package/components/common/wizards/{datastoreNew → datastore}/add/sharedStorm/deviceSelection/table/lib/config/tableKeys.ts

@@ -1,4 +1,4 @@
-import type { UI_T_LunDiskTableItemTuple } from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/table/lib/models/types'
+import type { UI_T_LunDiskTableItemTuple } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/table/lib/models/types'
 
 export const lunDiskTableItemsKeys: UI_T_LunDiskTableItemTuple = [
   'name',

package/components/common/wizards/datastore/add/sharedStorm/partitionConfiguration/PartitionConfiguration.vue

@@ -2,7 +2,7 @@
   <div class="partition">
     <div class="clr-form-control clr-row">
       <label class="clr-col-md-4 clr-control-label">
-        {{ localization.common.partitionConfiguration }}
+        {{ localization.partitionConfiguration }}
       </label>
 
       <div class="clr-col-md-8 p-0">
@@ -29,7 +29,7 @@
 
     <div class="datastore-size-container clr-flex-row clr-flex">
       <label class="clr-col-md-4 clr-control-label" for="datastore-size">
-        {{ localization.common.datastoreSize }}
+        {{ localization.datastoreSize }}
       </label>
 
       <div class="datastore-size-slider-container clr-col-md-8 p-0">
@@ -54,30 +54,30 @@
 
         <input
           id="datastore-size-input-1"
-          data-id="select-storm-storage-size-input-field"
           v-model="datastoreSize"
+          data-id="select-storm-storage-size-input-field"
           type="number"
           min="0"
           :max="countDatastoreSizeToGb"
           step="0.01"
           class="show-arrow"
         />
-        <span>{{ localization.common.gb }}</span>
+        <span>{{ localization.gb }}</span>
       </div>
     </div>
 
     <template v-if="props.vmfsVersion === 'vmfs-6'">
       <div class="clr-form-control clr-row">
         <label class="clr-col-md-4 clr-control-label">
-          {{ localization.common.blockSize }}
+          {{ localization.blockSize }}
         </label>
 
         <div>
           <div class="clr-select-wrapper">
             <select
               id="storm-configuration-block-size"
-              data-id="storm-configuration-block-size"
               v-model="selectedSize"
+              data-id="storm-configuration-block-size"
               class="dropdown-toggle"
               @change="onSelectHost"
             >
@@ -96,15 +96,15 @@
 
       <div class="clr-form-control clr-row">
         <label class="clr-col-md-4 clr-control-label">
-          {{ localization.common.spaceReclamationGranularity }}
+          {{ localization.spaceReclamationGranularity }}
         </label>
 
         <div>
           <div class="clr-select-wrapper">
             <select
               id="granularity-select"
-              data-id="storm-configuration-space-granularity"
               v-model="selectedGranularity"
+              data-id="storm-configuration-space-granularity"
               class="dropdown-toggle"
               @change="onSelectHost"
             >
@@ -123,15 +123,15 @@
 
       <div class="clr-form-control clr-row">
         <label class="clr-col-md-4 clr-control-label">
-          {{ localization.common.spaceReclamationPriority }}
+          {{ localization.spaceReclamationPriority }}
         </label>
 
         <div>
           <div class="clr-select-wrapper">
             <select
               id="priority-select"
-              data-id="storm-configuration-space-priority"
               v-model="selectedPriority"
+              data-id="storm-configuration-space-priority"
               class="dropdown-toggle"
               @change="onSelectHost"
             >
@@ -157,9 +157,9 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_VmfsType } from '~/components/common/wizards/datastore/add/lib/models/types'
-import type { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_T_VmfsType } from '~/components/common/wizards/datastore/add/lib/models/types'
+import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 import {
   partitionConfigurationFunc,
   spacePriorityFunc,