bfg-common 1.5.225 → 1.5.226

package/assets/localization/local_be.json

@@ -2369,7 +2369,8 @@
     "deleteDatacenterDesc": "Вы ўпэўненыя, што хочаце выдаліць цэнтр апрацоўкі дадзеных \" {0}\"? Гэта дзеянне таксама прывядзе да выдалення ўсіх яго аварыйных сігналаў і выдаленні ўсіх звязаных хастоў і віртуальных машын з спісу.",
     "gotIt": "Зразумець",
     "nodeSetupStarted": "Запусціла налада вузла",
-    "nodeSetupStartedDesc": "Налада вузла была паспяхова запушчана. Гэта можа заняць хвіліну. Далейшыя дзеянні не патрабуецца."
+    "nodeSetupStartedDesc": "Налада вузла была паспяхова запушчана. Гэта можа заняць хвіліну. Далейшыя дзеянні не патрабуецца.",
+    "valueMustBeAtLeastOneHourAfterStart": "Значэнне павінна быць не менш чым на гадзіну пазней часу пачатку"
   },
   "auth": {
     "welcomeTo": "Сардэчна запрашаем у",
@@ -3135,5 +3136,10 @@
   },
   "bottomPanel": {
     "failed": "Няўдалы"
+  },
+  "role": {
+    "roleManagement": "Кіраванне ролямі",
+    "selectRoleToViewItsDetails": "Выберыце ролю для прагляду яе дэталяў.",
+    "roleUsage": "Выкарыстанне ролі"
   }
 }

package/assets/localization/local_en.json

@@ -1578,7 +1578,7 @@
     "uploadImage": "Upload Image",
     "uppercaseCharacters": "uppercase characters",
     "urlErrorText": "Please enter a valid URL",
-    "usage": "USAGE",
+    "usage": "Usage",
     "usageCap": "Usage",
     "usbRedirection": "USB Redirection",
     "useAllAvailablePartitions": "Use all available partitions",
@@ -2373,7 +2373,8 @@
     "deleteDatacenterDesc": "Are you sure you want to delete the datacenter “{0}”? This action will also delete all its alarms and remove all associated hosts and virtual machines from the inventory.",
     "gotIt": "Got It",
     "nodeSetupStarted": "Node Setup Started",
-    "nodeSetupStartedDesc": "Node setup has been successfully started. This may take a moment to complete. No further action is required."
+    "nodeSetupStartedDesc": "Node setup has been successfully started. This may take a moment to complete. No further action is required.",
+    "valueMustBeAtLeastOneHourAfterStart": "The value must be at least one hour later than the start time."
   },
   "auth": {
     "welcomeTo": "Welcome to",
@@ -2626,7 +2627,7 @@
     "receiveBandwidth": "Receive bandwidth",
     "averageAmountDataReceive": "Average amount of data receive per second",
     "dataReceive": "Data receive",
-    "networkUsageName": "USAGE",
+    "networkUsageName": "Usage",
     "networkUtilizationDuringInterval": "Network utilization (combined transmit-rates and receive-rates) during the interval",
     "dataUsage": "Data usage",
     "packetsReceived": "Packets received",
@@ -3139,5 +3140,10 @@
   },
   "bottomPanel": {
     "failed": "Failed"
+  },
+  "role": {
+    "roleManagement": "Role Management",
+    "selectRoleToViewItsDetails": "Select a role to view its details.",
+    "roleUsage": "Role Usage"
   }
 }

package/assets/localization/local_hy.json

@@ -2373,7 +2373,8 @@
     "deleteDatacenterDesc": "Համոզված եք, որ ցանկանում եք ջնջել \"{0} \" տվյալների կենտրոնը: Այս գործողությունը նաև կջնջի դրա բոլոր ահազանգերը և կհեռացնի բոլոր հարակից սերվերներն ու վիրտուալ մեքենաները ցուցակից:",
     "gotIt": "հասկացա",
     "nodeSetupStarted": "Հանգույցի կարգավորումը սկսվեց",
-    "nodeSetupStartedDesc": "Հանգույցի կարգավորումը հաջողությամբ սկսվեց: Սա կարող է տեւել մի պահ: Այլ գործողություն չի պահանջվում:"
+    "nodeSetupStartedDesc": "Հանգույցի կարգավորումը հաջողությամբ սկսվեց: Սա կարող է տեւել մի պահ: Այլ գործողություն չի պահանջվում:",
+    "valueMustBeAtLeastOneHourAfterStart": "Արժեքը պետք է լինի առնվազն մեկ ժամ ուշ, քան մեկնարկի ժամանակը"
   },
   "auth": {
     "welcomeTo": "Բարի գալուստ",
@@ -3139,5 +3140,10 @@
   },
   "bottomPanel": {
     "failed": "Անհաջող"
+  },
+  "role": {
+    "roleManagement": "Դերի կառավարում",
+    "selectRoleToViewItsDetails": "Ընտրեք դեր, դրա մանրամասները դիտելու համար:",
+    "roleUsage": "Դերի օգտագործումը"
   }
 }

package/assets/localization/local_kk.json

@@ -2372,7 +2372,8 @@
     "deleteDatacenterDesc": "\"{0} \" деректер орталығын жойғыңыз келетініне сенімдісіз бе? Бұл әрекет сонымен қатар оның барлық дабылдарын жояды және барлық байланысты хосттар мен виртуалды машиналарды тізімнен жояды.",
     "gotIt": "Түсіндім",
     "nodeSetupStarted": "Түйін орнату басталды",
-    "nodeSetupStartedDesc": "Түйін орнату сәтті басталды. Бұл біраз уақыт алуы мүмкін. Бұдан әрі әрекет қажет емес."
+    "nodeSetupStartedDesc": "Түйін орнату сәтті басталды. Бұл біраз уақыт алуы мүмкін. Бұдан әрі әрекет қажет емес.",
+    "valueMustBeAtLeastOneHourAfterStart": "Мән басталу уақытынан кемінде бір сағат кеш болуы керек"
   },
   "auth": {
     "welcomeTo": "Қош келдіңіз",
@@ -3138,5 +3139,10 @@
   },
   "bottomPanel": {
     "failed": "Сәтсіз"
+  },
+  "role": {
+    "roleManagement": "Рөлдерді басқару",
+    "selectRoleToViewItsDetails": "Оның мәліметтерін көру үшін рөлді таңдаңыз.",
+    "roleUsage": "Рөлді пайдалану"
   }
 }

package/assets/localization/local_ru.json

@@ -2372,7 +2372,8 @@
     "deleteDatacenterDesc": "Вы уверены, что хотите удалить центр обработки данных “{0}”? Это действие также приведет к удалению всех его аварийных сигналов и удалению всех связанных хостов и виртуальных машин из списка.",
     "gotIt": "Понял",
     "nodeSetupStarted": "Начата настройка узла",
-    "nodeSetupStartedDesc": "Настройка узла успешно запущена. Это может занять некоторое время. Никаких дальнейших действий не требуется."
+    "nodeSetupStartedDesc": "Настройка узла успешно запущена. Это может занять некоторое время. Никаких дальнейших действий не требуется.",
+    "valueMustBeAtLeastOneHourAfterStart": "Значение должно быть не менее чем на час позже времени начала"
   },
   "auth": {
     "welcomeTo": "Добро пожаловать в",
@@ -3138,5 +3139,10 @@
   },
   "bottomPanel": {
     "failed": "Неудавшиеся"
+  },
+  "role": {
+    "roleManagement": "Управление ролями",
+    "selectRoleToViewItsDetails": "Выберите роль, чтобы просмотреть сведения о ней.",
+    "roleUsage": "Использование ролей"
   }
 }

package/assets/localization/local_zh.json

@@ -2370,7 +2370,8 @@
     "deleteDatacenterDesc": "你确定要删除数据中心“{0}”吗？此操作将同时删除所有警报和从库中移除所有关联的主机和虚拟机。",
     "gotIt": "得到了",
     "nodeSetupStarted": "节点设置开始",
-    "nodeSetupStartedDesc": "节点设置已成功启动。这可能需要一些时间才能完成。无需采取进一步的行动。"
+    "nodeSetupStartedDesc": "节点设置已成功启动。这可能需要一些时间才能完成。无需采取进一步的行动。",
+    "valueMustBeAtLeastOneHourAfterStart": "该值必须至少比开始时间晚一小时。"
   },
   "auth": {
     "welcomeTo": "欢迎来到",
@@ -3136,5 +3137,10 @@
   },
   "bottomPanel": {
     "failed": "失败的"
+  },
+  "role": {
+    "roleManagement": "角色管理",
+    "selectRoleToViewItsDetails": "选择角色以查看其细节。",
+    "roleUsage": "角色使用"
   }
 }

package/components/atoms/table/info/Info.vue

@@ -59,6 +59,10 @@ table {
   .vm-name-label {
     width: 20%;
 
+    &::first-letter {
+      text-transform: uppercase;
+    }
+
     &.hard-disk-properties {
       padding-left: 25px;
     }

package/components/common/backup/storage/actions/add/Add.vue

@@ -12,6 +12,7 @@
     :get-datastore-table-func="props.getDatastoreTableFunc"
     @change-steps="onChangeSteps"
     @change-storage="onChangeStorage"
+    @submit="onCreate"
     @hide="onHideModal"
   />
   <common-backup-storage-actions-add-old
@@ -27,16 +28,14 @@
     :get-datastore-table-func="props.getDatastoreTableFunc"
     @change-steps="onChangeSteps"
     @change-storage="onChangeStorage"
+    @submit="onCreate"
     @hide="onHideModal"
   />
 </template>
 
 <script setup lang="ts">
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  // UI_T_DatastoreType,
-  UI_T_NfsType,
-} from '~/components/common/backup/storage/actions/add/lib/models/types'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
@@ -46,7 +45,6 @@ import type {
   UI_I_WizardStep,
 } from '~/components/atoms/wizard/lib/models/interfaces'
 import type { UI_T_DatastoreTypeCode } from '~/components/common/backup/storage/actions/add/lib/models/types'
-import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {
   stepsFunc,
   stepsSchemeInitial,
@@ -68,7 +66,7 @@ const props = withDefaults(
   { hosts: [] }
 )
 const emits = defineEmits<{
-  (event: 'create', value: any): void
+  (event: 'create', value: UI_I_CreateDatastoreForm): void
   (event: 'hide'): void
 }>()
 
@@ -106,7 +104,7 @@ const validationFunc = async (
       value,
       form.value,
       dynamicSteps.name,
-      'datastoreName',
+      'name',
       wizard,
       props.project
     )
@@ -134,7 +132,7 @@ const validationFunc = async (
     )
     value = nameValidation.newValue
 
-    const folderValidation = validation.checkNfsFolderSync(
+    const folderValidation = validation.checkFolderSync(
       localization.value,
       form.value.folder,
       wizard,
@@ -142,7 +140,7 @@ const validationFunc = async (
     )
     value = folderValidation.newValue
 
-    const serverValidation = validation.checkNfsServerSync(
+    const serverValidation = validation.checkServerSync(
       localization.value,
       form.value.server,
       wizard,
@@ -150,10 +148,28 @@ const validationFunc = async (
     )
     value = serverValidation.newValue
 
+    const usernameValidation = validation.checkUsernameSync(
+      localization.value,
+      form.value.user,
+      wizard,
+      value
+    )
+    value = usernameValidation.newValue
+
+    const passwordValidation = validation.checkPasswordSync(
+      localization.value,
+      form.value.password,
+      wizard,
+      value
+    )
+    value = passwordValidation.newValue
+
     stepHasError =
       nameValidation.stepHasError ||
       folderValidation.stepHasError ||
-      serverValidation.stepHasError
+      serverValidation.stepHasError ||
+      usernameValidation.stepHasError ||
+      passwordValidation.stepHasError
   }
 
   if (
@@ -163,31 +179,31 @@ const validationFunc = async (
       nextStep.id
     )
   ) {
-    const nameValidation = await validation.checkHostsAccessibilitySync(
+    const hostsValidation = await validation.checkHostsAccessibilitySync(
       localization.value,
       form.value.hosts,
       wizard,
       value
     )
 
-    value = nameValidation.newValue
+    value = hostsValidation.newValue
 
-    stepHasError = nameValidation.stepHasError
+    stepHasError = hostsValidation.stepHasError
   }
 
   if (
     wizard.isValidateForStep(dynamicSteps.storage, currentStep.id, nextStep.id)
   ) {
-    const nameValidation = await validation.checkStorageSync(
+    const storageValidation = await validation.checkStorageSync(
       localization.value,
       form.value.storm_id,
       wizard,
       value
     )
 
-    value = nameValidation.newValue
+    value = storageValidation.newValue
 
-    stepHasError = nameValidation.stepHasError
+    stepHasError = storageValidation.stepHasError
   }
 
   return {
@@ -217,12 +233,9 @@ const onChangeStorage = (storage: UI_I_DatastoreTableItem | null): void => {
   form.value.storm_id = storage.id
 }
 
-const onFinish = async (
-  form: UI_I_CreateDatastoreForm,
-  mode: UI_T_DatastoreType,
-  version: UI_T_NfsType
+const onCreate = async (
 ): Promise<void> => {
-  emits('create', { form, mode, version })
+  emits('create', form.value)
 }
 
 const onHideModal = (): void => {

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

@@ -196,9 +196,9 @@ import type {
 import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
 import { dynamicSteps } from '~/components/common/backup/storage/actions/add/lib/config/steps'
 
 const formModelLocal = defineModel<UI_I_CreateDatastoreForm>({ required: true })
@@ -279,51 +279,3 @@ const onCreateDatastore = (): void => emits('submit')
   }
 }
 </style>
-
-<!--<template>-->
-<!--  <div class="new-datastore">new-->
-<!--    <common-backup-storage-actions-add-temp-add-->
-<!--      :mode="props.mode"-->
-<!--      :finish-func="props.finishFunc"-->
-<!--      :hosts="props.hosts"-->
-<!--      :datastore="props.datastore"-->
-<!--      :get-datastore-table-func="props.getDatastoreTableFunc"-->
-<!--      @hide="onHideModal"-->
-<!--    />-->
-<!--  </div>-->
-<!--</template>-->
-
-<!--<script setup lang="ts">-->
-<!--import type {-->
-<!--  // UI_T_DatastoreType,-->
-<!--  UI_T_NfsType,-->
-<!--} from '~/components/common/backup/storage/actions/add/lib/models/types'-->
-<!--import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'-->
-<!--import type {-->
-<!--  UI_T_DatastoreType,-->
-<!--  UI_T_WizardDatastoreMode,-->
-<!--} from '~/components/common/backup/storage/actions/add/temp/lib/models/types'-->
-<!--import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'-->
-<!--import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'-->
-
-<!--const props = defineProps<{-->
-<!--  mode: UI_T_WizardDatastoreMode-->
-<!--  datastore: UI_I_DatastoreTableItem[]-->
-<!--  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>-->
-<!--  finishFunc: (-->
-<!--    datastoreForm: UI_I_CreateDatastoreForm,-->
-<!--    datastoreType: UI_T_DatastoreType,-->
-<!--    version: UI_T_NfsType-->
-<!--  ) => Promise<void>-->
-<!--  hosts?: any[]-->
-<!--}>()-->
-<!--const emits = defineEmits<{-->
-<!--  (event: 'hide'): void-->
-<!--}>()-->
-
-<!--const onHideModal = (): void => {-->
-<!--  emits('hide')-->
-<!--}-->
-<!--</script>-->
-
-<!--<style scoped lang="scss"></style>-->

package/components/common/backup/storage/actions/add/Old.vue

@@ -63,9 +63,11 @@
 
 <script setup lang="ts">
 import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'
 import { dynamicSteps } from '~/components/common/backup/storage/actions/add/lib/config/steps'
 
@@ -99,73 +101,4 @@ const onCreateDatastore = (): void => emits('submit')
 </script>
 
 <style scoped lang="scss">
-@import 'assets/scss/common/mixins.scss';
-.new-datastore {
-  &__body {
-    @include flex($dir: column);
-    height: 100%;
-    padding-left: 24px;
-  }
-}
-
-.finish-block {
-  padding: 18px 24px 24px 24px;
-
-  .add-hosts-ready-to-complete-mt-12 {
-    margin-top: 12px;
-
-    .add-hosts-ready-to-complete-bold {
-      line-height: 18px;
-      font-weight: 700;
-    }
-  }
-}
 </style>
-
-<!--<template>-->
-<!--  <div class="new-datastore">-->
-<!--    <common-backup-storage-actions-add-temp-add-->
-<!--      :mode="props.mode"-->
-<!--      :finish-func="props.finishFunc"-->
-<!--      :hosts="props.hosts"-->
-<!--      :datastore="props.datastore"-->
-<!--      :get-datastore-table-func="props.getDatastoreTableFunc"-->
-<!--      @hide="onHideModal"-->
-<!--    />-->
-<!--  </div>-->
-<!--</template>-->
-
-<!--<script setup lang="ts">-->
-<!--import type {-->
-<!--  // UI_T_DatastoreType,-->
-<!--  UI_T_NfsType,-->
-<!--} from '~/components/common/backup/storage/actions/add/lib/models/types'-->
-<!--import type { UI_I_CreateDatastoreForm } from '~/components/common/backup/storage/actions/add/lib/models/interfaces'-->
-<!--import type {-->
-<!--  UI_T_DatastoreType,-->
-<!--  UI_T_WizardDatastoreMode,-->
-<!--} from '~/components/common/backup/storage/actions/add/temp/lib/models/types'-->
-<!--import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'-->
-<!--import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'-->
-
-<!--const props = defineProps<{-->
-<!--  mode: UI_T_WizardDatastoreMode-->
-<!--  datastore: UI_I_DatastoreTableItem[]-->
-<!--  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>-->
-<!--  finishFunc: (-->
-<!--    datastoreForm: UI_I_CreateDatastoreForm,-->
-<!--    datastoreType: UI_T_DatastoreType,-->
-<!--    version: UI_T_NfsType-->
-<!--  ) => Promise<void>-->
-<!--  hosts?: any[]-->
-<!--}>()-->
-<!--const emits = defineEmits<{-->
-<!--  (event: 'hide'): void-->
-<!--}>()-->
-
-<!--const onHideModal = (): void => {-->
-<!--  emits('hide')-->
-<!--}-->
-<!--</script>-->
-
-<!--<style scoped lang="scss"></style>-->

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

@@ -1,9 +1,9 @@
 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 { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
 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,
@@ -32,7 +32,7 @@ export const stepsFunc = (
     subTitle: localization.common.nameAndDeviceSelectionDesc,
     status: UI_E_WIZARD_STATUS.INACTIVE,
     fields: {
-      datastoreName: {
+      name: {
         alert: '',
         field: '',
       }
@@ -58,7 +58,7 @@ export const stepsFunc = (
         alert: '',
         field: '',
       },
-      username: {
+      user: {
         alert: '',
         field: '',
       },

package/components/common/backup/storage/actions/add/lib/models/interfaces.ts

@@ -2,6 +2,7 @@ import type {
   UI_T_NfsType,
   UI_T_DatastoreTypeCode,
 } from '~/components/common/backup/storage/actions/add/lib/models/types'
+
 export interface UI_I_CreateDatastoreForm {
   name: string
   version: UI_T_NfsType

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

@@ -1,6 +1,6 @@
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
 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 (
@@ -28,36 +28,3 @@ export const checkValidityName = async (
   }
   sendMessage('')
 }
-
-export const validateNameAndGenerateDataId = (
-  name: string,
-  _errorMessage: string,
-  defaultDataId?: string
-): string => {
-  let baseDataId = defaultDataId || 'storage-name-alert-error'
-
-  const patterns = [
-    {
-      regex: /^[a-zA-Z0-9_\-\.]+$/,
-      error_message:
-        /invalid name, must only contain letters, numbers, and '_', '-' '.' symbols/,
-      suffix: '-invalid-name-symbols',
-    },
-    {
-      regex: /^.{3,64}$/,
-      error_message:
-        /invalid name length, must be between: \d+ and \d+ characters/,
-      suffix: '-invalid-name-length',
-    },
-  ]
-
-  // Проверка error_message на соответствие шаблонам
-
-  for (const pattern of patterns) {
-    if (!pattern.regex.test(name)) {
-      return `${baseDataId}${pattern.suffix}`
-    }
-  }
-
-  return baseDataId
-}