bfg-common 1.3.453 → 1.3.455

package/components/common/lib/config/states.ts

@@ -124,3 +124,37 @@ export const resourcePoolIconByState = [
   'resourcePoolAlert',
   'resourcePoolAlert',
 ]
+
+export const backupStorageLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+  'maintenance',
+  'inaccessible',
+  'disconnected',
+]
+
+export const backupStorageIconByState = [
+  'datastore-error',
+  'datastore',
+  'datastore-warning',
+  'datastore-error',
+  'datastore-maintenance',
+  'datastore-inaccessible',
+  'datastore-unmount', // 'datastore-disconnected',
+]
+
+export const bucketLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+]
+
+export const bucketIconByState = [
+  'vm-error',
+  'vm',
+  'vm-warning',
+  'vm-error',
+]

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

@@ -144,26 +144,22 @@
 </template>
 
 <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_Localization } from '~/lib/models/interfaces'
 import {
   UI_I_DataServersListItem,
   UI_I_FormValidationConfiguration,
 } from '~/components/common/wizards/datastore/add/nfs/configuration/serversList/lib/models/interfaces'
-import { UI_T_NfsType } from '~/components/common/wizards/datastore/add/lib/models/types'
+import {
+  UI_T_NfsType,
+  UI_T_WizardDatastoreMode,
+} from '~/components/common/wizards/datastore/add/lib/models/types'
 import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/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'
 
 const props = defineProps<{
-  project: UI_T_Project
-  alertMessages: string[]
-  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  mode: UI_T_WizardDatastoreMode
   nfsVersion: UI_T_NfsType
   nfsConfigurationSubmit: number
 }>()
@@ -267,7 +263,7 @@ const dataServers = ref<UI_I_DataServersListItem[]>([])
 //   // if (nfsVersion === 'nfs-4.1') server.value = ''
 // }
 
-const alertInfo = ref<boolean>(props.project === 'procurator')
+const alertInfo = ref<boolean>(props.mode === 'procurator')
 
 const resetValidation = (): void => {
   isInitNameValidation.value =
@@ -299,7 +295,7 @@ const submit = async (): Promise<void> => {
 
   emits('loading', true)
 
-  const { valid, msg } = await checkValidityName(name.value, props.project)
+  const { valid, msg } = await checkValidityName(name.value, props.mode)
 
   emits('loading', false)
 

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

@@ -164,7 +164,7 @@ const datastoreForm = ref<UI_I_CreateDatastoreForm>({
     server: '',
     folder: '',
     readonly: false,
-    version: nfsVersion.value,
+    version: '',
     type_code: 4,
     hosts: [],
   },

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

@@ -5,12 +5,12 @@
       v-model="model.nfsVersion"
     />
 
-    <common-wizards-datastore-add-nfs-configuration
+    <common-wizards-datastore-new-add-nfs-configuration
       v-show="props.stepId === 5"
+      v-model="model"
       :project="props.project"
       :alert-messages="props.alertMessages"
       :messages-fields="props.selectedStep"
-      :nfs-version="model.nfsVersion"
       :nfs-configuration-submit="nfsConfigurationSubmit"
       @loading="(e) => emits('loading', e)"
       @next="onChangeConfigurationAndNext"

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

@@ -19,9 +19,9 @@
       <h6 class="nd-mt-0">{{ localization.nfsShareDetails }}</h6>
 
       <div class="clr-form-control clr-row">
-        <label for="" class="clr-control-label clr-col-md-2">{{
-          localization.name
-        }}</label>
+        <label for="" class="clr-control-label clr-col-md-2">
+          {{ localization.name }}
+        </label>
 
         <div
           class="clr-control-container"
@@ -30,12 +30,12 @@
           <div class="flex-align-center">
             <input
               id="configuration-name-input"
-              v-model="form.name.value"
+              v-model="model.name"
               data-id="configuration-name-input"
               type="text"
               class="clr-input"
-              @blur="onBlurInputName"
-              @input="onInputName"
+              @blur="initValidation(true, ['name'])"
+              @input="initValidation(false, ['name'])"
             />
             <atoms-the-icon class="error-icon" name="info-circle" />
           </div>
@@ -47,9 +47,9 @@
       </div>
 
       <div class="clr-form-control clr-row">
-        <label class="clr-control-label clr-col-md-2">{{
-          localization.folder
-        }}</label>
+        <label class="clr-control-label clr-col-md-2">
+          {{ localization.folder }}
+        </label>
 
         <div
           class="clr-control-container"
@@ -58,12 +58,12 @@
           <div class="flex-align-center">
             <input
               id="configuration-folder-input"
-              v-model="form.folder.value"
+              v-model="model.folder"
               data-id="configuration-folder-input"
               type="text"
               class="clr-input"
-              @blur="onBlurInputFolder"
-              @input="onInputFolder"
+              @blur="initValidation(true, ['folder'])"
+              @input="initValidation(false, ['folder'])"
             />
             <atoms-the-icon class="error-icon" name="info-circle" />
           </div>
@@ -76,9 +76,9 @@
       </div>
 
       <div class="nd-mt-0 clr-form-control clr-row">
-        <label class="clr-control-label clr-col-md-2">{{
-          localization.server
-        }}</label>
+        <label class="clr-control-label clr-col-md-2">
+          {{ localization.server }}
+        </label>
 
         <div
           class="clr-control-container"
@@ -87,12 +87,12 @@
           <div class="flex-align-center input-action-wrapper">
             <input
               id="configuration-folder-input"
-              v-model="form.server.value"
+              v-model="model.server"
               data-id="configuration-folder-input"
               type="text"
               class="clr-input"
-              @blur="onBlurInputServer"
-              @input="onInputServer"
+              @blur="initValidation(true, ['server'])"
+              @input="initValidation(false, ['server'])"
             />
             <atoms-the-icon class="error-icon" name="info-circle" />
           </div>
@@ -114,7 +114,7 @@
       </div>
 
       <div
-        v-show="props.nfsVersion === 'nfs-4.1' && false"
+        v-show="model.nfsVersion === 'nfs-4.1' && false"
         class="configuration__servers-list"
       >
         <common-wizards-datastore-add-nfs-configuration-servers-list
@@ -144,30 +144,37 @@
 </template>
 
 <script lang="ts" setup>
+import type { UI_T_Project } from '~/lib/models/types'
 import { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
-import { UI_I_Localization } from '~/lib/models/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_T_NfsType,
-  UI_T_WizardDatastoreMode,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
-import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
+  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'
 
 const props = defineProps<{
-  mode: UI_T_WizardDatastoreMode
-  nfsVersion: UI_T_NfsType
+  project: UI_T_Project
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   nfsConfigurationSubmit: number
 }>()
-const localization = computed<UI_I_Localization>(() => useLocal())
+const model = defineModel<any>()
 const emits = defineEmits<{
   (event: 'loading', value: boolean): void
   (event: 'next', value: UI_I_ConfigurationSendDataNfs): void
 }>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
 const { $validation } = useNuxtApp()
 
 const validation = $validation.call({})
@@ -183,56 +190,48 @@ 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 = (): void => {
-  validForm.value = validation.touch()
+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,
+  server: false,
+})
+const initValidation = (onlyBlur = false, types: string[]): void => {
+  onlyBlur && types.forEach((type) => (initValidationFields.value[type] = true))
 }
 
+/* Validation error text for Name input field */
 const nameErrorText = computed<string>(() => {
-  if (!isInitNameValidation.value) return ''
-  return validForm.value?.errors?.name?.[0] || ''
-})
-/* Validation Name input end */
+  if (props.messagesFields?.name?.field && !model.value.name) {
+    return props.messagesFields.name.field
+  }
 
-/* Validation for Folder input */
-const isInitFolderValidation = ref<boolean>(false)
-const onBlurInputFolder = (): void => {
-  validForm.value = validation.touch()
-  isInitFolderValidation.value = true
-}
-const onInputFolder = (): void => {
-  validForm.value = validation.touch()
-}
+  if (!initValidationFields.value.name) return ''
+  return !model.value.name ? localization.value.specifyDatastoreName : ''
+})
 
+/* Validation error text for Folder input field */
 const folderErrorText = computed<string>(() => {
-  if (!isInitFolderValidation.value) return ''
-  return validForm.value?.errors?.folder?.[0] || ''
-})
-/* Validation Folder input end */
+  if (props.messagesFields.folder?.field && !model.value.folder) {
+    return props.messagesFields.folder.field
+  }
 
-/* Validation for Server input */
-const isInitServerValidation = ref<boolean>(false)
-const onBlurInputServer = (): void => {
-  validForm.value = validation.touch()
-  isInitServerValidation.value = true
-}
-const onInputServer = (): void => {
-  validForm.value = validation.touch()
-  isInitServerValidation.value = true
-}
+  if (!initValidationFields.value.folder) return ''
+  return !model.value.folder ? localization.value.specifyDatastoreName : ''
+})
 
+/* Validation error text for Server input field */
 const serverErrorText = computed<string>(() => {
-  // if (!isInitServerValidation.value || dataServers.value.length) return ''
-  if (!isInitServerValidation.value) return ''
-  return validForm.value?.errors?.server?.[0] || ''
-})
+  if (props.messagesFields.server?.field && !model.value.server) {
+    return props.messagesFields.server.field
+  }
 
-/* Validation Folder Server end */
+  // if (!initValidationFields.value.server || dataServers.value.length) return ''
+  if (!initValidationFields.value.server) return ''
+  return !model.value.server ? localization.value.specifyDatastoreName : ''
+})
 
 const accessMode = ref<boolean>(false)
 
@@ -263,7 +262,7 @@ const dataServers = ref<UI_I_DataServersListItem[]>([])
 //   // if (nfsVersion === 'nfs-4.1') server.value = ''
 // }
 
-const alertInfo = ref<boolean>(props.mode === 'procurator')
+const alertInfo = ref<boolean>(props.project === 'procurator')
 
 const resetValidation = (): void => {
   isInitNameValidation.value =
@@ -295,7 +294,7 @@ const submit = async (): Promise<void> => {
 
   emits('loading', true)
 
-  const { valid, msg } = await checkValidityName(name.value, props.mode)
+  const { valid, msg } = await checkValidityName(name.value, props.project)
 
   emits('loading', false)
 

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

@@ -1,8 +1,11 @@
 import { UI_I_DataServersListItem } from '~/components/common/wizards/datastore/add/nfs/configuration/serversList/lib/models/interfaces'
 
-// export interface I_ServerNfs {
-//   server_name: string
-// }
+export interface UI_I_InitialValidationFields {
+  name: boolean
+  folder: boolean
+  server: boolean
+}
+
 export interface UI_I_ConfigurationSendDataNfs {
   name: string
   folder: string

package/package.json

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