bfg-common 1.5.98 → 1.5.99

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

@@ -9,6 +9,7 @@
     :selected-node="props.selectedNode"
     :title="title"
     :nfs-hosts="props.nfsHosts"
+    :host-id="props.hostId"
     @change-steps="onChangeSteps"
     @hide="onHideModal"
     @submit="onCreateDatastore"
@@ -23,6 +24,7 @@
     :selected-node="props.selectedNode"
     :title="title"
     :nfs-hosts="props.nfsHosts"
+    :host-id="props.hostId"
     @change-steps="onChangeSteps"
     @hide-alert="onHideAlert"
     @hide="onHideModal"

package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDevice.vue

@@ -8,6 +8,7 @@
     :host-id="props.hostId"
     :lun-disks-data="lunDisksData"
     :host-options="hostOptions"
+    :is-show-select-host="isShowSelectHost"
     :is-main-filter="props.isMainFilter"
     :pagination="pagination"
     :loading="loading"
@@ -24,6 +25,7 @@
     :host-id="props.hostId"
     :lun-disks-data="lunDisksData"
     :host-options="hostOptions"
+    :is-show-select-host="isShowSelectHost"
     :is-main-filter="props.isMainFilter"
     :pagination="pagination"
     :loading="loading"
@@ -72,6 +74,9 @@ const { $store }: any = useNuxtApp()
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
+const isShowSelectHost = computed<boolean>(
+  () => props.project === 'sphere' && !props.hostId
+)
 const isShowAlertInfo = ref<boolean>(true)
 const pagination = ref<UI_I_Pagination>({
   page: 1,

package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDeviceNew.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="name-and-device">
+    {{ nameErrorText }}
+
     <div class="name-and-device__disk-list">
       <common-wizards-datastore-add-steps-name-and-device-table
         v-model="formModelLocal.lunDisk"
@@ -24,11 +26,8 @@ import type {
 import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
 import type { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
-import type { UI_I_CompatibleHosts } from '~/components/common/wizards/datastore/add/steps/hostAccessibility/table/lib/models/interfaces'
-import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datastore/add/lib/models/types'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_I_CreateStorageLunDisks } from '~/components/common/wizards/datastore/add/steps/nameAndDevice/table/lib/models/interfaces'
-import { validateNameAndGenerateDataId } from '~/components/common/wizards/datastore/add/lib/utils'
 
 const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const isShowInfoAlert = defineModel<boolean>('isShowInfoAlert', {
@@ -40,10 +39,7 @@ const props = defineProps<{
   hostOptions: UI_I_SelectHostOptions[]
   alertMessages: string[]
   messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-  datastoreType: UI_T_DatastoreTypeCode
-  hosts?: UI_I_CompatibleHosts | undefined
   isMainFilter?: boolean
-  hostId?: string
   loading: boolean
 }>()
 const emits = defineEmits<{
@@ -55,53 +51,18 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const isInitDatastoreNameValidation = ref<boolean>(false)
 
 const nameErrorText = computed<string>(() => {
-  if (props.messagesFields?.datastoreName?.field && !model.value.name) {
+  if (
+    props.messagesFields?.datastoreName?.field &&
+    !formModelLocal.value.name
+  ) {
     return props.messagesFields.datastoreName.field
   }
 
   if (!isInitDatastoreNameValidation.value) return ''
-  return !model.value.name ? localization.value.common.specifyDatastoreName : ''
-})
-
-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)
-
-/* Lun disk table  */
-
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 35,
+  return !formModelLocal.value.name
+    ? localization.value.common.specifyDatastoreName
+    : ''
 })
-const sort = ref<string | null>(null)
-
-const updatePagination = (event: UI_I_Pagination): void => {
-  pagination.value = event
-}
-const sortTable = (event: string): void => {
-  sort.value = event
-
-  props.project === 'procurator'
-    ? initLunDisksDataTable()
-    : initLunDisksForSphere(model.value.hosts[0])
-}
-
-const onSelectHost = (): void => {
-  if (props.datastoreType !== 'shared-storm') return // TODO рефакторинг ( удалить проверку )
-
-  initLunDisksForSphere(model.value.hosts[0])
-}
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDeviceOld.vue

@@ -34,7 +34,7 @@
     </div>
 
     <atoms-alert
-      v-if="isShowInfoAlert"
+      v-if="isShowInfoAlert && !props.hostId"
       test-id="device-selection-information-alert"
       class="device-selection-step__alert-info"
       status="alert-info"
@@ -42,10 +42,7 @@
       @remove="isShowInfoAlert = false"
     />
 
-    <div
-      v-if="props.project === 'sphere' && !props.hostId"
-      class="clr-form-control clr-row mb-1"
-    >
+    <div v-if="props.isShowSelectHost" class="clr-form-control clr-row mb-1">
       <label class="clr-control-label clr-col-12 clr-col-md-2">
         {{ localization.common.selectHost }}
       </label>
@@ -109,13 +106,14 @@ const isShowInfoAlert = defineModel<boolean>('isShowInfoAlert', {
 })
 const props = defineProps<{
   project: UI_T_Project
-  alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-  isMainFilter?: boolean
-  hostId?: string
   lunDisksData: UI_I_CreateStorageLunDisks
   hostOptions: UI_I_SelectHostOptions[]
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   pagination: UI_I_Pagination
+  hostId?: string
+  isShowSelectHost: boolean
+  isMainFilter?: boolean
   loading: boolean
 }>()
 const emits = defineEmits<{

package/package.json

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