bfg-common 1.5.302 → 1.5.303

package/components/common/backup/storage/actions/add/lib/config/steps.ts

@@ -1,168 +1,168 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
-import type { UI_I_ChangeStepsSchemes } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
-import type { UI_T_DatastoreTypeCode } from '~/components/common/backup/storage/actions/add/lib/models/types'
-import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
-
-export const dynamicSteps = {
-  type: 0,
-  name: 1,
-  nameAndConfigure: 2,
-  storage: 3,
-  hostAccessibility: 4,
-  readyComplete: 5,
-}
-
-export const stepsFunc = (
-  localization: UI_I_Localization
-): UI_I_WizardStep[] => [
-  {
-    id: dynamicSteps.type,
-    title: localization.common.type,
-    subTitle: localization.backup.specifyBackupStorageType,
-    status: UI_E_WIZARD_STATUS.SELECTED,
-    fields: {},
-    isValid: true,
-    testId: 'create-datastore-select-type',
-  },
-  {
-    id: dynamicSteps.name,
-    title: localization.backup.selectName,
-    subTitle: localization.backup.specifyBackupStorageName,
-    status: UI_E_WIZARD_STATUS.INACTIVE,
-    fields: {
-      name: {
-        alert: '',
-        field: '',
-      }
-    },
-    isValid: true,
-    testId: 'create-datastore-name-selection',
-  },
-  {
-    id: dynamicSteps.nameAndConfigure,
-    title: localization.common.nameAndConfiguration,
-    subTitle: localization.backup.specifyBackupStorageNameAndConfiguration,
-    status: UI_E_WIZARD_STATUS.INACTIVE,
-    fields: {
-      name: {
-        alert: '',
-        field: '',
-      },
-      folder: {
-        alert: '',
-        field: '',
-      },
-      server: {
-        alert: '',
-        field: '',
-      },
-      user: {
-        alert: '',
-        field: '',
-      },
-      password: {
-        alert: '',
-        field: '',
-      },
-    },
-    isValid: true,
-    testId: 'create-datastore-name-and-configuration',
-  },
-  {
-    id: dynamicSteps.storage,
-    title: localization.common.selectStorage,
-    subTitle: localization.backup.selectDestinationStorageForBackupStorage,
-    status: UI_E_WIZARD_STATUS.INACTIVE,
-    fields: {
-      storage: {
-        alert: '',
-        field: '',
-      },
-    },
-    isValid: true,
-    testId: 'create-datastore-storage',
-  },
-  {
-    id: dynamicSteps.hostAccessibility,
-    title: localization.common.hostsAccessibility,
-    subTitle: localization.backup.selectHostsThatRequireAccessBackupStorage,
-    status: UI_E_WIZARD_STATUS.INACTIVE,
-    fields: {
-      hostsAccessibility: {
-        alert: '',
-        field: '',
-      },
-    },
-    isValid: true,
-    testId: 'create-datastore-hosts-accessibility',
-  },
-  {
-    id: dynamicSteps.readyComplete,
-    title: localization.common.readyComplete,
-    subTitle: localization.backup.storageReview,
-    status: UI_E_WIZARD_STATUS.INACTIVE,
-    fields: {},
-    isValid: true,
-    testId: 'create-datastore-ready-complete',
-  },
-]
-
-export const stepsSchemeInitial: number[][] = [
-  // Procurator Scheme for "local"
-  [dynamicSteps.type, dynamicSteps.name, dynamicSteps.readyComplete],
-  // Procurator Scheme for "nfs" and "samba"
-  [
-    dynamicSteps.type,
-    dynamicSteps.nameAndConfigure,
-    dynamicSteps.readyComplete,
-  ],
-  // Procurator Scheme for "shared-storm"
-  [
-    dynamicSteps.type,
-    dynamicSteps.name,
-    dynamicSteps.storage,
-    dynamicSteps.readyComplete,
-  ],
-
-  // Sphere Scheme for "local"
-  [dynamicSteps.type, dynamicSteps.name, dynamicSteps.hostAccessibility, dynamicSteps.readyComplete],
-  // Sphere Scheme for "nfs" and "samba"
-  [
-    dynamicSteps.type,
-    dynamicSteps.nameAndConfigure,
-    dynamicSteps.hostAccessibility,
-    dynamicSteps.readyComplete,
-  ],
-  // Sphere Scheme for "shared-storm"
-  [
-    dynamicSteps.type,
-    dynamicSteps.name,
-    dynamicSteps.storage,
-    dynamicSteps.hostAccessibility,
-    dynamicSteps.readyComplete,
-  ],
-]
-
-export const getStepScheme = (
-  project: UI_T_Project,
-  typeCode: UI_T_DatastoreTypeCode,
-): number | undefined => {
-  const schemes: UI_I_ChangeStepsSchemes = {
-    procurator: {
-      '1': 0,
-      '2': 1,
-      '3': 1,
-      '4': 2,
-    },
-    sphere: {
-      '1': 3,
-      '2': 4,
-      '3': 4,
-      '4': 5,
-    },
-  }
-
-  return schemes[project]?.[typeCode]
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
+import type { UI_I_ChangeStepsSchemes } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
+import type { UI_T_DatastoreTypeCode } from '~/components/common/backup/storage/actions/add/lib/models/types'
+import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
+
+export const dynamicSteps = {
+  type: 0,
+  name: 1,
+  nameAndConfigure: 2,
+  storage: 3,
+  hostAccessibility: 4,
+  readyComplete: 5,
+}
+
+export const stepsFunc = (
+  localization: UI_I_Localization
+): UI_I_WizardStep[] => [
+  {
+    id: dynamicSteps.type,
+    title: localization.common.type,
+    subTitle: localization.backup.specifyBackupStorageType,
+    status: UI_E_WIZARD_STATUS.SELECTED,
+    fields: {},
+    isValid: true,
+    testId: 'create-datastore-select-type',
+  },
+  {
+    id: dynamicSteps.name,
+    title: localization.backup.selectName,
+    subTitle: localization.backup.specifyBackupStorageName,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {
+      name: {
+        alert: '',
+        field: '',
+      }
+    },
+    isValid: true,
+    testId: 'create-datastore-name-selection',
+  },
+  {
+    id: dynamicSteps.nameAndConfigure,
+    title: localization.common.nameAndConfiguration,
+    subTitle: localization.backup.specifyBackupStorageNameAndConfiguration,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {
+      name: {
+        alert: '',
+        field: '',
+      },
+      folder: {
+        alert: '',
+        field: '',
+      },
+      server: {
+        alert: '',
+        field: '',
+      },
+      user: {
+        alert: '',
+        field: '',
+      },
+      password: {
+        alert: '',
+        field: '',
+      },
+    },
+    isValid: true,
+    testId: 'create-datastore-name-and-configuration',
+  },
+  {
+    id: dynamicSteps.storage,
+    title: localization.common.selectStorage,
+    subTitle: localization.backup.selectDestinationStorageForBackupStorage,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {
+      storage: {
+        alert: '',
+        field: '',
+      },
+    },
+    isValid: true,
+    testId: 'create-datastore-storage',
+  },
+  {
+    id: dynamicSteps.hostAccessibility,
+    title: localization.common.hostsAccessibility,
+    subTitle: localization.backup.selectHostsThatRequireAccessBackupStorage,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {
+      hostsAccessibility: {
+        alert: '',
+        field: '',
+      },
+    },
+    isValid: true,
+    testId: 'create-datastore-hosts-accessibility',
+  },
+  {
+    id: dynamicSteps.readyComplete,
+    title: localization.common.readyComplete,
+    subTitle: localization.backup.storageReview,
+    status: UI_E_WIZARD_STATUS.INACTIVE,
+    fields: {},
+    isValid: true,
+    testId: 'create-datastore-ready-complete',
+  },
+]
+
+export const stepsSchemeInitial: number[][] = [
+  // Procurator Scheme for "local"
+  [dynamicSteps.type, dynamicSteps.name, dynamicSteps.readyComplete],
+  // Procurator Scheme for "nfs" and "samba"
+  [
+    dynamicSteps.type,
+    dynamicSteps.nameAndConfigure,
+    dynamicSteps.readyComplete,
+  ],
+  // Procurator Scheme for "shared-storm"
+  [
+    dynamicSteps.type,
+    dynamicSteps.name,
+    dynamicSteps.storage,
+    dynamicSteps.readyComplete,
+  ],
+
+  // Sphere Scheme for "local"
+  [dynamicSteps.type, dynamicSteps.name, dynamicSteps.hostAccessibility, dynamicSteps.readyComplete],
+  // Sphere Scheme for "nfs" and "samba"
+  [
+    dynamicSteps.type,
+    dynamicSteps.nameAndConfigure,
+    dynamicSteps.hostAccessibility,
+    dynamicSteps.readyComplete,
+  ],
+  // Sphere Scheme for "shared-storm"
+  [
+    dynamicSteps.type,
+    dynamicSteps.name,
+    dynamicSteps.storage,
+    dynamicSteps.hostAccessibility,
+    dynamicSteps.readyComplete,
+  ],
+]
+
+export const getStepScheme = (
+  project: UI_T_Project,
+  typeCode: UI_T_DatastoreTypeCode,
+): number | undefined => {
+  const schemes: UI_I_ChangeStepsSchemes = {
+    procurator: {
+      '1': 0,
+      '2': 1,
+      '3': 1,
+      '4': 2,
+    },
+    sphere: {
+      '1': 3,
+      '2': 4,
+      '3': 4,
+      '4': 5,
+    },
+  }
+
+  return schemes[project]?.[typeCode]
+}

package/components/common/backup/storage/actions/add/lib/validations.ts

@@ -221,7 +221,7 @@ export const checkStorageSync = (
   if (!storm_id) {
     stepHasError = wizard.setValidation(dynamicSteps.storage, 'storage', {
       fieldMessage: '',
-      alertMessage: localization.common.selectLeastEntityContinue,
+      alertMessage: localization.common.selectValidDestinationStorage,
     })
   } else if (wizard.hasMessage(dynamicSteps.storage, 'storage')) {
     value = wizard.removeValidation(dynamicSteps.storage, 'storage', value)

package/components/common/backup/storage/actions/add/steps/hostAccessibility/HostAccessibility.vue

@@ -1,52 +1,52 @@
-<template>
-  <common-backup-storage-actions-add-steps-host-accessibility-new
-    v-if="isNewView"
-    v-model="modelHostsLocal"
-    v-model:active-tab="activeTab"
-    :hosts="dataTable"
-    :tab-options="tabs"
-  />
-  <common-backup-storage-actions-add-steps-host-accessibility-old
-    v-else
-    v-model="modelHostsLocal"
-    v-model:active-tab="activeTab"
-    :hosts="dataTable"
-    :tab-options="tabs"
-    :alert-messages="props.alertMessages"
-    @hide-alert="(e) => emits('hide-alert', e)"
-  />
-</template>
-
-<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_T_HostsAccessibilityTab } from '~/components/common/backup/storage/actions/add/steps/hostAccessibility/lib/models/types'
-import type { UI_I_CompatibleHosts } from '~/components/common/backup/storage/actions/add/steps/hostAccessibility/table/lib/models/interfaces'
-import { hostAccessibilityTabsFunc } from '~/components/common/backup/storage/actions/add/steps/hostAccessibility/lib/config/tabsPannel'
-
-const modelHostsLocal = defineModel<string[]>()
-const props = defineProps<{
-  alertMessages: string[]
-  hosts?: UI_I_CompatibleHosts
-}>()
-const emits = defineEmits<{
-  (event: 'hide-alert', value: number): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const activeTab = ref<UI_T_HostsAccessibilityTab>('compatible-hosts')
-const tabs = computed<UI_I_CollapseNavItem[]>(() =>
-  hostAccessibilityTabsFunc(localization.value, [
-    (props.hosts?.items?.length || 0) + '',
-    '0',
-  ])
-)
-
-const dataTable = computed<UI_I_CompatibleHosts>(() => props.hosts)
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-backup-storage-actions-add-steps-host-accessibility-new
+    v-if="isNewView"
+    v-model="modelHostsLocal"
+    v-model:active-tab="activeTab"
+    :hosts="dataTable"
+    :tab-options="tabs"
+  />
+  <common-backup-storage-actions-add-steps-host-accessibility-old
+    v-else
+    v-model="modelHostsLocal"
+    v-model:active-tab="activeTab"
+    :hosts="dataTable"
+    :tab-options="tabs"
+    :alert-messages="props.alertMessages"
+    @hide-alert="(e) => emits('hide-alert', e)"
+  />
+</template>
+
+<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_T_HostsAccessibilityTab } from '~/components/common/backup/storage/actions/add/steps/hostAccessibility/lib/models/types'
+import type { UI_I_CompatibleHosts } from '~/components/common/backup/storage/actions/add/steps/hostAccessibility/table/lib/models/interfaces'
+import { hostAccessibilityTabsFunc } from '~/components/common/backup/storage/actions/add/steps/hostAccessibility/lib/config/tabsPannel'
+
+const modelHostsLocal = defineModel<string[]>()
+const props = defineProps<{
+  alertMessages: string[]
+  hosts?: UI_I_CompatibleHosts
+}>()
+const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const activeTab = ref<UI_T_HostsAccessibilityTab>('compatible-hosts')
+const tabs = computed<UI_I_CollapseNavItem[]>(() =>
+  hostAccessibilityTabsFunc(localization.value, [
+    (props.hosts?.items?.length || 0) + '',
+    '0',
+  ])
+)
+
+const dataTable = computed<UI_I_CompatibleHosts>(() => props.hosts)
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/backup/storage/actions/add/steps/hostAccessibility/table/new/lib/config/compatibleTable.ts

@@ -45,7 +45,6 @@ export const options: UI_I_DataTableOptions = {
   isResizable: true,
   showSelectedRows: true,
   showColumnManager: false,
-  inBlock: true,
   inModal: true
 }
 

package/components/common/backup/storage/actions/add/steps/name/New.vue

@@ -38,6 +38,8 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const nameErrorText = computed<string>(() => {
   if (!props.alertMessages?.length && props.messagesFields?.name?.field) {
     return props.messagesFields.name.field
+  } else if (!formModelLocal.value.name) {
+    return localization.value.common.fieldRequired
   }
   return ''
 })

package/components/common/backup/storage/actions/add/steps/nameAndConfigure/NameAndConfigure.vue

@@ -1,42 +1,42 @@
-<template>
-  <common-backup-storage-actions-add-steps-name-and-configure-new
-    v-if="isNewView"
-    v-model="formModel"
-    v-model:alert-info="isShowAlertInfo"
-    :alert-messages="props.alertMessages"
-    :messages-fields="props.messagesFields"
-  />
-
-  <common-backup-storage-actions-add-steps-name-and-configure-old
-    v-else
-    v-model="formModel"
-    v-model:alert-info="isShowAlertInfo"
-    :alert-messages="props.alertMessages"
-    :messages-fields="props.messagesFields"
-    @hide-alert="(e) => emits('hide-alert', e)"
-  />
-</template>
-
-<script lang="ts" setup>
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
-import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
-
-const formModel = defineModel<UI_I_CreateDatastoreForm>({ required: true })
-const props = defineProps<{
-  project: UI_T_Project
-  alertMessages: string[]
-  messagesFields: UI_I_WizardStep['fields']
-}>()
-const emits = defineEmits<{
-  (event: 'hide-alert', value: number): void
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const isShowAlertInfo = ref<boolean>(true)
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-backup-storage-actions-add-steps-name-and-configure-new
+    v-if="isNewView"
+    v-model="formModel"
+    v-model:alert-info="isShowAlertInfo"
+    :alert-messages="props.alertMessages"
+    :messages-fields="props.messagesFields"
+  />
+
+  <common-backup-storage-actions-add-steps-name-and-configure-old
+    v-else
+    v-model="formModel"
+    v-model:alert-info="isShowAlertInfo"
+    :alert-messages="props.alertMessages"
+    :messages-fields="props.messagesFields"
+    @hide-alert="(e) => emits('hide-alert', e)"
+  />
+</template>
+
+<script lang="ts" setup>
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
+
+const formModel = defineModel<UI_I_CreateDatastoreForm>({ required: true })
+const props = defineProps<{
+  project: UI_T_Project
+  alertMessages: string[]
+  messagesFields: UI_I_WizardStep['fields']
+}>()
+const emits = defineEmits<{
+  (event: 'hide-alert', value: number): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const isShowAlertInfo = ref<boolean>(true)
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/backup/storage/actions/add/steps/nameAndConfigure/NameAndConfigureNew.vue

@@ -36,13 +36,13 @@
           {{ localization.common.folder }}
         </span>
         <common-tooltip-help
-            test-id="backup-storage-tooltip-info-folder"
-            help-id="backup-storage-tooltip-info-folder-icon"
-            :title="localization.common.information"
-            :help-text="localization.backup.specifyFolderPathExample"
-            dropdown-width="272px"
-            dropdown-left
-            dropdown-top
+          test-id="backup-storage-tooltip-info-folder"
+          help-id="backup-storage-tooltip-info-folder-icon"
+          :title="localization.common.information"
+          :help-text="localization.backup.specifyFolderPathExample"
+          dropdown-width="272px"
+          dropdown-left
+          dropdown-top
         />
       </div>
       <div class="basics-step-row-content">
@@ -64,13 +64,13 @@
           {{ localization.common.server }}
         </span>
         <common-tooltip-help
-            test-id="backup-storage-tooltip-info-server"
-            help-id="backup-storage-tooltip-info-server-icon"
-            :title="localization.common.information"
-            :help-text="localization.backup.specifyServerAddressExample"
-            dropdown-width="272px"
-            dropdown-left
-            dropdown-top
+          test-id="backup-storage-tooltip-info-server"
+          help-id="backup-storage-tooltip-info-server-icon"
+          :title="localization.common.information"
+          :help-text="localization.backup.specifyServerAddressExample"
+          dropdown-width="272px"
+          dropdown-left
+          dropdown-top
         />
       </div>
       <div class="basics-step-row-content">
@@ -138,7 +138,6 @@ const props = defineProps<{
   messagesFields: UI_I_WizardStep['fields']
 }>()
 
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const isEmptyAlertMessages = computed<boolean>(() => {
@@ -152,6 +151,8 @@ const isEmptyAlertMessages = computed<boolean>(() => {
 const nameErrorText = computed<string>(() => {
   if (isEmptyAlertMessages.value && props.messagesFields?.name?.field) {
     return props.messagesFields.name.field
+  } else if (!formModelLocal.value.name) {
+    return localization.value.common.fieldRequired
   }
   return ''
 })