bfg-common 1.5.517 → 1.5.519

package/assets/localization/local_be.json

@@ -2479,7 +2479,8 @@
     "specifyValidHostDestinationComputeResource": "Укажыце сапраўдны хост як мэтавы вылічальны рэсурс.",
     "selectValidHostDestinationComputeResource": "Выберыце сапраўдны хост як мэтавы вылічальны рэсурс.",
     "generalSettings": "Агульныя налады",
-    "configureBackupStrategyAndBandwidth": "Канфігурацыя старатэгіі і прывядкі"
+    "configureBackupStrategyAndBandwidth": "Канфігурацыя старатэгіі і прывядкі",
+    "editTheNotesFor": "Рэдагаваць нататкі для "
   },
   "auth": {
     "welcomeTo": "Сардэчна запрашаем у",

package/assets/localization/local_en.json

@@ -2483,7 +2483,8 @@
     "specifyValidHostDestinationComputeResource": "Specify a valid host as destination compute resource.",
     "selectValidHostDestinationComputeResource": "Select a valid host as destination compute resource.",
     "generalSettings": "General Settings",
-    "configureBackupStrategyAndBandwidth": "Configure backup strategy and bandwidth limits."
+    "configureBackupStrategyAndBandwidth": "Configure backup strategy and bandwidth limits.",
+    "editTheNotesFor": "Edit the notes for "
   },
   "auth": {
     "welcomeTo": "Welcome to",

package/assets/localization/local_hy.json

@@ -2483,7 +2483,8 @@
     "specifyValidHostDestinationComputeResource": "Նշեք վավեր հոստ՝ որպես նպատակային հաշվարկային ռեսուրս։",
     "selectValidHostDestinationComputeResource": "Ընտրեք վավեր հոստ՝ որպես նպատակային հաշվարկային ռեսուրս։",
     "generalSettings": "Ընդհանուր պարամետրեր",
-    "configureBackupStrategyAndBandwidth": "Կարգավորել պահուստավորման ռազմավարությունը և թողունակության սահմանաչափերը։"
+    "configureBackupStrategyAndBandwidth": "Կարգավորել պահուստավորման ռազմավարությունը և թողունակության սահմանաչափերը։",
+    "editTheNotesFor": "Խմբագրել գրառումները "
   },
   "auth": {
     "welcomeTo": "Բարի գալուստ",

package/assets/localization/local_kk.json

@@ -2482,7 +2482,8 @@
     "specifyValidHostDestinationComputeResource": "Мақсатты есептеу ресурсы ретінде жарамды хостты көрсетіңіз.",
     "selectValidHostDestinationComputeResource": "Мақсатты есептеу ресурсы ретінде жарамды хостты таңдаңыз.",
     "generalSettings": "Жалпы Параметрлер",
-    "configureBackupStrategyAndBandwidth": "Сақтық көшірме жасау стратегиясы мен өткізу қабілеттілігі шектеулерін конфигурациялаңыз."
+    "configureBackupStrategyAndBandwidth": "Сақтық көшірме жасау стратегиясы мен өткізу қабілеттілігі шектеулерін конфигурациялаңыз.",
+    "editTheNotesFor": "Үшін жазбаларды өңдеңіз "
   },
   "auth": {
     "welcomeTo": "Қош келдіңіз",

package/assets/localization/local_ru.json

@@ -2482,7 +2482,8 @@
     "specifyValidHostDestinationComputeResource": "Укажите допустимый хост в качестве целевого вычислительного ресурса.",
     "selectValidHostDestinationComputeResource": "Выберите допустимый хост в качестве целевого вычислительного ресурса.",
     "generalSettings": "Общие настройки",
-    "configureBackupStrategyAndBandwidth": "Настройте стратегию резервного копирования и ограничения пропускной способности."
+    "configureBackupStrategyAndBandwidth": "Настройте стратегию резервного копирования и ограничения пропускной способности.",
+    "editTheNotesFor": "Редактирование заметки для "
   },
   "auth": {
     "welcomeTo": "Добро пожаловать в",

package/assets/localization/local_zh.json

@@ -2480,7 +2480,8 @@
     "specifyValidHostDestinationComputeResource": "请指定一个有效的主机作为目标计算资源。",
     "selectValidHostDestinationComputeResource": "请选择一个有效的主机作为目标计算资源。",
     "generalSettings": "常规设置",
-    "configureBackupStrategyAndBandwidth": "配置备份策略和带宽限制。"
+    "configureBackupStrategyAndBandwidth": "配置备份策略和带宽限制。",
+    "editTheNotesFor": "编辑笔记 "
   },
   "auth": {
     "welcomeTo": "欢迎来到",

package/components/atoms/sortableView/SortableView.vue

@@ -16,7 +16,7 @@
           :class="['portlet-js portlet-container', themeMode]"
           :data-id="item.id"
           :style="item.id === draggedPortletId && style"
-          @mousedown.prevent.stop="onmousedown($event, item)"
+          @mousedown="onmousedown($event, item)"
         >
           <slot :portlet-id="item.id"></slot>
         </div>
@@ -57,7 +57,7 @@
           :class="['portlet-js portlet-container', themeMode]"
           :data-id="item.id"
           :style="item.id === draggedPortletId && style"
-          @mousedown.prevent.stop="onmousedown($event, item)"
+          @mousedown="onmousedown($event, item)"
         >
           <slot :portlet-id="item.id"></slot>
         </div>

package/components/common/monitor/overview/OverviewNew.vue

@@ -76,6 +76,9 @@ watch([width, height], () => {
     .chart-container:nth-child(3) {
     grid-column: 1 / -1;
   }
+  &:has(.chart-container:nth-child(5)) .chart-container:nth-child(5) {
+    grid-column: 1 / -1;
+  }
 
   .graph-empty-block {
     display: flex;

package/components/common/monitor/overview/filters/Filters.vue

@@ -40,6 +40,7 @@
 </template>
 
 <script setup lang="ts">
+import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_MonitorGraphPayload } from '~/components/common/monitor/lib/models/interfaces'
@@ -65,9 +66,11 @@ const props = withDefaults(
     validDateEnd: number
     selectedNodeName: string
     formatTime?: string
+    project?: UI_T_Project
   }>(),
   {
     formatTime: undefined,
+    project: undefined,
   }
 )
 
@@ -138,7 +141,7 @@ const disabledPeriodOptions = computed<boolean>(() => props.chartType === 'pie')
 
 const selectedView = ref<string>('')
 const viewOptions = computed<UI_I_OptionItem[]>(() =>
-  viewFunc(localization.value, props.view)
+  viewFunc(localization.value, props.view, props.project)
 )
 watch(
   () => viewOptions.value,

package/components/common/monitor/overview/filters/lib/config/filterOptions.ts

@@ -2,6 +2,7 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_OverviewViewOptionData } from '~/components/common/monitor/overview/filters/lib/models/interfaces'
 import type { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
+import type { UI_T_Project } from '~/lib/models/types'
 
 export const periodFunc = (
   localization: UI_I_Localization
@@ -34,7 +35,8 @@ export const periodFunc = (
 
 export const viewFunc = (
   localization: UI_I_Localization,
-  viewType: UI_T_OverviewViewType
+  viewType: UI_T_OverviewViewType,
+  project?: UI_T_Project
 ): UI_I_OptionItem[] => {
   const host = [
     { text: localization.inventoryMonitor.overview, value: 'overview' },
@@ -48,6 +50,10 @@ export const viewFunc = (
     // { text: localization.common.virtual_machines, value: 'virtual_machines' },
   ]
 
+  if (project === 'procurator') {
+    host.push({ text: localization.common.services, value: 'services' })
+  }
+
   const viewData: UI_I_OverviewViewOptionData = {
     zone: [{ text: localization.inventoryMonitor.overview, value: 'overview' }],
     datacenter: [

package/components/common/pages/backups/modals/createBackup/CreateBackup.vue

@@ -1,196 +1,196 @@
-<template>
-  <common-pages-backups-modals-create-backup-new
-    v-if="isNewView"
-    v-model="backupForm"
-    v-model:scheduler-form="schedulerForm"
-    :wizard="wizard"
-    :selected-scheme="selectedScheme"
-    :alert-messages="alertMessages"
-    :title="title"
-    :is-scheduled-tasks="props.isScheduledTasks"
-    :is-edit-scheduled-tasks="props.isEditScheduledTasks"
-    :target="props.target"
-    :selected-vm-name="props.selectedVmName"
-    :disks="props.disks"
-    :disks-loading="props.disksLoading"
-    :datastore-table="props.datastoreTable"
-    :datastore-table-loading="props.datastoreTableLoading"
-    :ready-to-complete-data="readyToCompleteInfo"
-    @change-steps="onChangeSteps"
-    @submit="emits('finish')"
-    @hide="emits('hide')"
-  />
-  <common-pages-backups-modals-create-backup-old
-    v-else
-    v-model="backupForm"
-    v-model:scheduler-form="schedulerForm"
-    :wizard="wizard"
-    :selected-scheme="selectedScheme"
-    :alert-messages="alertMessages"
-    :title="title"
-    :alert-errors="errors"
-    :is-scheduled-tasks="props.isScheduledTasks"
-    :is-edit-scheduled-tasks="props.isEditScheduledTasks"
-    :target="props.target"
-    :selected-vm-name="props.selectedVmName"
-    :disks="props.disks"
-    :disks-loading="props.disksLoading"
-    :datastore-table="props.datastoreTable"
-    :datastore-table-loading="props.datastoreTableLoading"
-    :ready-to-complete-data="readyToCompleteInfo"
-    @change-step-create-backup="onChangeSteps"
-    @remove-validation-errors="onRemoveValidationErrors"
-    @finish="emits('finish')"
-    @hide="emits('hide')"
-  />
-</template>
-
-<script setup lang="ts">
-
-import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
-import type { UI_I_ValidationReturn } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import type {UI_I_Localization} from "~/lib/models/interfaces";
-import {
-  stepsSchemeInitial,
-  stepsFunc,
-  dynamicSteps
-} from '~/components/common/pages/backups/modals/createBackup/lib/config/steps'
-import type {
-  UI_I_BackupDatastoreTable,
-  UI_I_CreateBackupForm,
-  UI_I_Pvm
-} from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
-import {
-  readyToCompleteOptions
-} from '~/components/common/pages/backups/modals/createBackup/lib/config/readyToCompleteOptions'
-import {
-  checkName,
-  checkDisks,
-  checkDatastore,
-  checkConfiguration
-} from '~/components/common/pages/backups/modals/createBackup/lib/validation/validations'
-import type {UI_I_NameCheck} from "~/components/common/pages/backups/modals/restore/name/lib/models/interfaces";
-import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
-import type {UI_I_TableInfoItem} from "~/components/atoms/table/info/lib/models/interfaces";
-
-
-const backupForm = defineModel<UI_I_CreateBackupForm>({ required: true })
-const schedulerForm = defineModel('schedulerForm', { required: true })
-
-const props = defineProps<{
-  isEdit: boolean // ToDo проверить на использование
-  target: string
-  isScheduledTasks: boolean
-  isEditScheduledTasks: boolean
-  selectedVmName: string
-  disks: UI_I_Pvm['disk_devices']
-  disksLoading: boolean
-  datastoreTable: UI_I_BackupDatastoreTable | null
-  datastoreTableLoading: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'change-step-create-backup', value: UI_I_WizardStep[]): void
-  (event: 'check-name', value: UI_I_NameCheck): void
-  (event: 'finish'): void
-  (event: 'hide'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const title = computed<string>(() => {
-  const { createBackup, updateBackup, scheduleNewTasks, scheduleTaskEdit } =
-    localization.value.common
-  let result = props.isEdit ? updateBackup : createBackup
-  if (props.isScheduledTasks) {
-    const schedulerMode = props.isEditScheduledTasks
-      ? scheduleTaskEdit
-      : scheduleNewTasks
-
-    result = `${schedulerMode} (${createBackup})`
-  }
-
-  return result
-})
-
-
-const wizard: Wizard = new Wizard(
-  stepsFunc(localization.value),
-  stepsSchemeInitial(props.isScheduledTasks)
-)
-
-const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
-const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
-
-const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
-  emits('change-step-create-backup', value)
-  wizard.changeSteps(value, validationFunc)
-}
-
-const validationFunc = async (
-  value: UI_I_WizardStep[],
-  currentStep: UI_I_WizardStep,
-  nextStep: UI_I_WizardStep
-): Promise<UI_I_ValidationReturn> => {
-  let stepHasError = false
-  const stepShouldStop = {
-    ifOnCurrentStep: false,
-    ifFromAnyStep: false,
-    stoppageStepId: -1
-  }
-
-  if (wizard.isValidateForStep(dynamicSteps.general, currentStep.id, nextStep.id)) {
-    const nameValidation = await checkName(value, backupForm.value.name, wizard, localization.value, emits)
-    value = nameValidation.newValue
-    stepHasError = nameValidation.stepHasError
-  }
-
-  if (wizard.isValidateForStep(dynamicSteps.disks, currentStep.id, nextStep.id)) {
-    const disksValidation = checkDisks(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
-    value = disksValidation.newValue
-    stepHasError = disksValidation.stepHasError
-  }
-
-  if (wizard.isValidateForStep(dynamicSteps.datastores, currentStep.id, nextStep.id)) {
-    const datastoreValidation = checkDatastore(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
-    value = datastoreValidation.newValue
-    stepHasError = datastoreValidation.stepHasError
-  }
-
-  if (wizard.isValidateForStep(dynamicSteps.configuration, currentStep.id, nextStep.id)) {
-    const configurationValidation = checkConfiguration(value, backupForm.value.bandwidth_limit, wizard, localization.value)
-    value = configurationValidation.newValue
-    stepHasError = configurationValidation.stepHasError
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-    stepShouldStop
-  }
-}
-
-const errors = ref<string[]>([])
-const showValidationErrors = (data: string[]): void => {
-  errors.value = data
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
-
-const strategyOptions = ref<UI_I_SelectInputItem[]>(
-  strategyOptionsFunc(localization.value)
-)
-
-const readyToCompleteInfo = computed<UI_I_TableInfoItem[]>(() => {
-  return readyToCompleteOptions(backupForm.value, localization.value, strategyOptions.value)
-})
-
-</script>
+<template>
+  <common-pages-backups-modals-create-backup-new
+    v-if="isNewView"
+    v-model="backupForm"
+    v-model:scheduler-form="schedulerForm"
+    :wizard="wizard"
+    :selected-scheme="selectedScheme"
+    :alert-messages="alertMessages"
+    :title="title"
+    :is-scheduled-tasks="props.isScheduledTasks"
+    :is-edit-scheduled-tasks="props.isEditScheduledTasks"
+    :target="props.target"
+    :selected-vm-name="props.selectedVmName"
+    :disks="props.disks"
+    :disks-loading="props.disksLoading"
+    :datastore-table="props.datastoreTable"
+    :datastore-table-loading="props.datastoreTableLoading"
+    :ready-to-complete-data="readyToCompleteInfo"
+    @change-steps="onChangeSteps"
+    @submit="emits('finish')"
+    @hide="emits('hide')"
+  />
+  <common-pages-backups-modals-create-backup-old
+    v-else
+    v-model="backupForm"
+    v-model:scheduler-form="schedulerForm"
+    :wizard="wizard"
+    :selected-scheme="selectedScheme"
+    :alert-messages="alertMessages"
+    :title="title"
+    :alert-errors="errors"
+    :is-scheduled-tasks="props.isScheduledTasks"
+    :is-edit-scheduled-tasks="props.isEditScheduledTasks"
+    :target="props.target"
+    :selected-vm-name="props.selectedVmName"
+    :disks="props.disks"
+    :disks-loading="props.disksLoading"
+    :datastore-table="props.datastoreTable"
+    :datastore-table-loading="props.datastoreTableLoading"
+    :ready-to-complete-data="readyToCompleteInfo"
+    @change-step-create-backup="onChangeSteps"
+    @remove-validation-errors="onRemoveValidationErrors"
+    @finish="emits('finish')"
+    @hide="emits('hide')"
+  />
+</template>
+
+<script setup lang="ts">
+
+import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import type { UI_I_ValidationReturn } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type {UI_I_Localization} from "~/lib/models/interfaces";
+import {
+  stepsSchemeInitial,
+  stepsFunc,
+  dynamicSteps
+} from '~/components/common/pages/backups/modals/createBackup/lib/config/steps'
+import type {
+  UI_I_BackupDatastoreTable,
+  UI_I_CreateBackupForm,
+  UI_I_Pvm
+} from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
+import {
+  readyToCompleteOptions
+} from '~/components/common/pages/backups/modals/createBackup/lib/config/readyToCompleteOptions'
+import {
+  checkName,
+  checkDisks,
+  checkDatastore,
+  checkConfiguration
+} from '~/components/common/pages/backups/modals/createBackup/lib/validation/validations'
+import type {UI_I_NameCheck} from "~/components/common/pages/backups/modals/restore/name/lib/models/interfaces";
+import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
+import type {UI_I_TableInfoItem} from "~/components/atoms/table/info/lib/models/interfaces";
+
+
+const backupForm = defineModel<UI_I_CreateBackupForm>({ required: true })
+const schedulerForm = defineModel('schedulerForm', { required: true })
+
+const props = defineProps<{
+  isEdit: boolean // ToDo проверить на использование
+  target: string
+  isScheduledTasks: boolean
+  isEditScheduledTasks: boolean
+  selectedVmName: string
+  disks: UI_I_Pvm['disk_devices']
+  disksLoading: boolean
+  datastoreTable: UI_I_BackupDatastoreTable | null
+  datastoreTableLoading: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'change-step-create-backup', value: UI_I_WizardStep[]): void
+  (event: 'check-name', value: UI_I_NameCheck): void
+  (event: 'finish'): void
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const title = computed<string>(() => {
+  const { createBackup, updateBackup, scheduleNewTasks, scheduleTaskEdit } =
+    localization.value.common
+  let result = props.isEdit ? updateBackup : createBackup
+  if (props.isScheduledTasks) {
+    const schedulerMode = props.isEditScheduledTasks
+      ? scheduleTaskEdit
+      : scheduleNewTasks
+
+    result = `${schedulerMode} (${createBackup})`
+  }
+
+  return result
+})
+
+
+const wizard: Wizard = new Wizard(
+  stepsFunc(localization.value),
+  stepsSchemeInitial(props.isScheduledTasks)
+)
+
+const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
+const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
+
+const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
+  emits('change-step-create-backup', value)
+  wizard.changeSteps(value, validationFunc)
+}
+
+const validationFunc = async (
+  value: UI_I_WizardStep[],
+  currentStep: UI_I_WizardStep,
+  nextStep: UI_I_WizardStep
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+  const stepShouldStop = {
+    ifOnCurrentStep: false,
+    ifFromAnyStep: false,
+    stoppageStepId: -1
+  }
+
+  if (wizard.isValidateForStep(dynamicSteps.general, currentStep.id, nextStep.id)) {
+    const nameValidation = await checkName(value, backupForm.value.name, wizard, localization.value, emits)
+    value = nameValidation.newValue
+    stepHasError = nameValidation.stepHasError
+  }
+
+  if (wizard.isValidateForStep(dynamicSteps.disks, currentStep.id, nextStep.id)) {
+    const disksValidation = checkDisks(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
+    value = disksValidation.newValue
+    stepHasError = disksValidation.stepHasError
+  }
+
+  if (wizard.isValidateForStep(dynamicSteps.datastores, currentStep.id, nextStep.id)) {
+    const datastoreValidation = checkDatastore(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
+    value = datastoreValidation.newValue
+    stepHasError = datastoreValidation.stepHasError
+  }
+
+  if (wizard.isValidateForStep(dynamicSteps.configuration, currentStep.id, nextStep.id)) {
+    const configurationValidation = checkConfiguration(value, backupForm.value.bandwidth_limit, wizard, localization.value)
+    value = configurationValidation.newValue
+    stepHasError = configurationValidation.stepHasError
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+    stepShouldStop
+  }
+}
+
+const errors = ref<string[]>([])
+const showValidationErrors = (data: string[]): void => {
+  errors.value = data
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
+}
+
+const strategyOptions = ref<UI_I_SelectInputItem[]>(
+  strategyOptionsFunc(localization.value)
+)
+
+const readyToCompleteInfo = computed<UI_I_TableInfoItem[]>(() => {
+  return readyToCompleteOptions(backupForm.value, localization.value, strategyOptions.value)
+})
+
+</script>
 <style scoped lang="scss"></style>