bfg-common 1.5.453 → 1.5.454

package/assets/localization/local_be.json

@@ -2749,7 +2749,8 @@
     "template": "Шаблон",
     "convertToTemplate": "Пераўтварыць у шаблон",
     "newTemplate": "Новы шаблон",
-    "createTemplateFromVM": "Стварыць шаблон з ВМ"
+    "createTemplateFromVM": "Стварыць шаблон з ВМ",
+    "actionsNumObjects": "Дзеянні – {0} аб’ектаў"
   },
   "networks": {
     "active_ports": "Актыўныя Парты",

package/assets/localization/local_en.json

@@ -2753,7 +2753,8 @@
     "template": "Template",
     "convertToTemplate": "Convert to Template",
     "newTemplate": "New Template",
-    "createTemplateFromVM": "Create Template from VM"
+    "createTemplateFromVM": "Create Template from VM",
+    "actionsNumObjects": "Actions - {0} Objects"
   },
   "networks": {
     "active_ports": "Active ports",

package/assets/localization/local_hy.json

@@ -2753,7 +2753,8 @@
     "template": "Ձևանմուշ",
     "convertToTemplate": "Վերափոխել ձևանմուշի",
     "newTemplate": "Նոր ձևանմուշ",
-    "createTemplateFromVM": "Ստեղծել ձևանմուշ ՎՄ-ից"
+    "createTemplateFromVM": "Ստեղծել ձևանմուշ ՎՄ-ից",
+    "actionsNumObjects": "Գործողություններ – {0} օբյեկտ"
   },
   "networks": {
     "active_ports": "Ակտիվ պորտեր",

package/assets/localization/local_kk.json

@@ -2752,7 +2752,8 @@
     "template": "Үлгі",
     "convertToTemplate": "Үлгіге айналдыру",
     "newTemplate": "Жаңа үлгі",
-    "createTemplateFromVM": "ВМ негізінде үлгі жасау"
+    "createTemplateFromVM": "ВМ негізінде үлгі жасау",
+    "actionsNumObjects": "Әрекеттер – {0} нысан"
   },
   "networks": {
     "active_ports": "Белсенді порттар",

package/assets/localization/local_ru.json

@@ -2752,7 +2752,8 @@
     "template": "Шаблон",
     "convertToTemplate": "Преобразовать в шаблон",
     "newTemplate": "Новый шаблон",
-    "createTemplateFromVM": "Создать шаблон из ВМ"
+    "createTemplateFromVM": "Создать шаблон из ВМ",
+    "actionsNumObjects": "Действия – {0} объектов"
   },
   "networks": {
     "active_ports": "Активные порты",

package/assets/localization/local_zh.json

@@ -2750,7 +2750,8 @@
     "template": "模板",
     "convertToTemplate": "转换为模板",
     "newTemplate": "新模板",
-    "createTemplateFromVM": "从虚拟机创建模板"
+    "createTemplateFromVM": "从虚拟机创建模板",
+    "actionsNumObjects": "操作 – {0} 个对象"
   },
   "networks": {
     "active_ports": "活动端口",

package/components/atoms/table/dataGrid/DataGrid.vue

@@ -211,6 +211,7 @@
                       :data-id="`${item[0].testId}-select-row`"
                       class="datagrid-row-master datagrid-row-flex"
                       @click.stop="selectRowById(item[0])"
+                      @contextmenu.prevent="onShowContextMenu($event, item[0])"
                     >
                       <div
                         v-if="props.type || $slots.toggleBlock"
@@ -601,6 +602,7 @@ const emits = defineEmits<{
   (event: 'sorting', value: [string, boolean]): void
   (event: 'change', value: any): void
   (event: 'row-detail', value: number): void
+  (event: 'show-context-menu', value: Event): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -1086,6 +1088,19 @@ const exportSelected = (): void => {
   generateCsvAndDownload([header, ...Array.from(rows)])
 }
 
+const onShowContextMenu = (event: Event, item: UI_I_BodyItem): void => {
+  const { id } = item
+  let has = false
+  if (props.type === 'checkbox' && Array.isArray(selectedRowLocal.value)) {
+    has = selectedRowLocal.value.includes(id)
+  } else {
+    has = selectedRowLocal.value === id
+  }
+  if (!has) selectRowById(item)
+
+  emits('show-context-menu', event)
+}
+
 onMounted(() => {
   window.addEventListener('mousemove', mousemove)
   window.addEventListener('mouseup', mouseup)

package/components/common/monitor/overview/filters/customIntervalModal/CustomIntervalModalOld.vue

@@ -107,12 +107,12 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const alertShow = defineModel<boolean>('alert-show')
-const currentDateFrom = defineModel<boolean>('current-date-from')
-const dateFrom = defineModel<boolean>('date-from')
-const currentTimeFrom = defineModel<boolean>('current-time-from')
-const currentDateTo = defineModel<boolean>('current-date-to')
-const dateTo = defineModel<boolean>('date-to')
-const currentTimeTo = defineModel<boolean>('current-time-to')
+const currentDateFrom = defineModel<string>('current-date-from')
+const dateFrom = defineModel<number>('date-from')
+const currentTimeFrom = defineModel<string>('current-time-from')
+const currentDateTo = defineModel<string>('current-date-to')
+const dateTo = defineModel<number>('date-to')
+const currentTimeTo = defineModel<string>('current-time-to')
 
 const props = defineProps<{
   titleIntervalModal: string

package/components/common/pages/backups/Backups.vue

@@ -1,102 +1,102 @@
-<template>
-  <div class="main-content-backups h-full overflow-hidden">
-    <common-pages-backups-tools
-      :project="props.project"
-      :backups-count="backupsTree.length"
-      :backups-loading="backupsLoading"
-      :selected-node="selectedNode"
-      :target-type="typeFromRoute"
-      @select="onShowModal"
-    />
-
-    <atoms-loader-pre-loader
-      v-show="backupsLoading"
-      id="loader"
-      :show="true"
-      class="backups-loading w-full h-full flex items-center justify-center"
-      test-id="backups-tree-spinner"
-    />
-    <div class="fill-parent w-full h-full">
-      <div v-if="backupsTree.length" class="backup-view mt-1 flex w-full">
-        <common-tree-view
-          :loading="backupsLoading"
-          :nodes="backupsTree"
-          @select-node="onSelectNode"
-          @show-nodes="onShowNodes"
-        />
-        <common-pages-backups-detail-view :detail="detailData" />
-      </div>
-      <div v-else class="empty-block flex justify-center items-center w-full">
-        {{ localization.common.noBackupAvailable }}
-      </div>
-    </div>
-  </div>
-</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_T_TargetType,
-  UI_T_BackupActionType,
-} from '~/components/common/pages/backups/lib/models/types'
-import type {
-  UI_I_Backup,
-  UI_I_BackupsTreeNode,
-} from '~/components/common/pages/backups/lib/models/interfaces'
-
-const props = defineProps<{
-  project: UI_T_Project
-  backups: UI_I_Backup[]
-  backupsTree: UI_I_BackupsTreeNode[]
-  backupsLoading: boolean
-  selectedNode: UI_I_BackupsTreeNode
-}>()
-const emits = defineEmits<{
-  (event: 'select-node', value: string | number): void
-  (event: 'show-nodes', value: string | number): void
-  (event: 'set-action', value: UI_T_BackupActionType): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $recursion }: any = useNuxtApp()
-
-const typeFromRoute = computed<UI_T_TargetType>(
-  () => useRoute().params.type.toString() as UI_T_TargetType
-)
-
-const detailData = computed<UI_I_BackupsTreeNode | null>(() => {
-  const node =
-    $recursion.find(props.backupsTree, true, 'isActive', 'nodes') || null
-  return node?.type === 'backup' ? node : null
-})
-
-const onSelectNode = (item: UI_I_BackupsTreeNode): void => {
-  emits('select-node', item.id)
-  if (item.type === 'group') {
-    onShowNodes(item.id.toString())
-  }
-}
-const onShowNodes = (id: string | number): void => {
-  emits('show-nodes', id)
-}
-
-const onShowModal = (action: UI_T_BackupActionType): void => {
-  emits('set-action', action)
-}
-</script>
-
-<style scoped lang="scss">
-.main-content-backups {
-  padding: 10px 5px 10px 0;
-
-  .fill-parent {
-    overflow: visible;
-
-    .backup-view {
-      // TODO fix
-      height: calc(90% - 24px);
-    }
-  }
-}
-</style>
+<template>
+  <div class="main-content-backups h-full overflow-hidden">
+    <common-pages-backups-tools
+      :project="props.project"
+      :backups-count="backupsTree.length"
+      :backups-loading="backupsLoading"
+      :selected-node="selectedNode"
+      :target-type="typeFromRoute"
+      @select="onShowModal"
+    />
+
+    <atoms-loader-pre-loader
+      v-show="backupsLoading"
+      id="loader"
+      :show="true"
+      class="backups-loading w-full h-full flex items-center justify-center"
+      test-id="backups-tree-spinner"
+    />
+    <div class="fill-parent w-full h-full">
+      <div v-if="backupsTree.length" class="backup-view mt-1 flex w-full">
+        <common-tree-view
+          :loading="backupsLoading"
+          :nodes="backupsTree"
+          @select-node="onSelectNode"
+          @show-nodes="onShowNodes"
+        />
+        <common-pages-backups-detail-view :detail="detailData" />
+      </div>
+      <div v-else class="empty-block flex justify-center items-center w-full">
+        {{ localization.common.noBackupAvailable }}
+      </div>
+    </div>
+  </div>
+</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_T_TargetType,
+  UI_T_BackupActionType,
+} from '~/components/common/pages/backups/lib/models/types'
+import type {
+  UI_I_Backup,
+  UI_I_BackupsTreeNode,
+} from '~/components/common/pages/backups/lib/models/interfaces'
+
+const props = defineProps<{
+  project: UI_T_Project
+  backups: UI_I_Backup[]
+  backupsTree: UI_I_BackupsTreeNode[]
+  backupsLoading: boolean
+  selectedNode: UI_I_BackupsTreeNode | null
+}>()
+const emits = defineEmits<{
+  (event: 'select-node', value: string | number): void
+  (event: 'show-nodes', value: string | number): void
+  (event: 'set-action', value: UI_T_BackupActionType): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $recursion }: any = useNuxtApp()
+
+const typeFromRoute = computed<UI_T_TargetType>(
+  () => useRoute().params.type.toString() as UI_T_TargetType
+)
+
+const detailData = computed<UI_I_BackupsTreeNode | null>(() => {
+  const node =
+    $recursion.find(props.backupsTree, true, 'isActive', 'nodes') || null
+  return node?.type === 'backup' ? node : null
+})
+
+const onSelectNode = (item: UI_I_BackupsTreeNode): void => {
+  emits('select-node', item.id)
+  if (item.type === 'group') {
+    onShowNodes(item.id.toString())
+  }
+}
+const onShowNodes = (id: string | number): void => {
+  emits('show-nodes', id)
+}
+
+const onShowModal = (action: UI_T_BackupActionType): void => {
+  emits('set-action', action)
+}
+</script>
+
+<style scoped lang="scss">
+.main-content-backups {
+  padding: 10px 5px 10px 0;
+
+  .fill-parent {
+    overflow: visible;
+
+    .backup-view {
+      // TODO fix
+      height: calc(90% - 24px);
+    }
+  }
+}
+</style>

package/components/common/pages/backups/modals/Modals.vue

@@ -43,7 +43,10 @@
 <script lang="ts" setup>
 import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_SendTaskParams, UI_I_ModalPayload } from '~/lib/models/interfaces'
+import type {
+  UI_I_SendTaskParams,
+  UI_I_ModalPayload,
+} from '~/lib/models/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import type {
   UI_I_BackupDatastoreTable,
@@ -69,7 +72,7 @@ const props = defineProps<{
   selectedVmName: string
   disks: UI_I_Pvm['disk_devices']
   disksLoading: boolean
-  datastoreTable: UI_I_BackupDatastoreTable
+  datastoreTable: UI_I_BackupDatastoreTable | null
   datastoreTableLoading: boolean
   restoreDatastore: UI_I_DatastoreTableItem[]
   isRestoreDatastoreLoading: boolean

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

@@ -101,7 +101,7 @@ const props = defineProps<{
   selectedVmName: string
   disks: UI_I_Pvm['disk_devices']
   disksLoading: boolean
-  datastoreTable: UI_I_BackupDatastoreTable
+  datastoreTable: UI_I_BackupDatastoreTable | null
   datastoreTableLoading: boolean
 }>()
 

package/components/common/pages/backups/modals/createBackup/datastores/Datastores.vue

@@ -1,59 +1,59 @@
-<template>
-  <div class="datastores h-full">
-    <common-pages-backups-modals-create-backup-datastores-table-view
-      v-model:selected="model.backup_storage"
-      :data-table="props.datastoreTable?.items"
-      :total-items="props.datastoreTable?.total_items || 0"
-      :total-pages="props.datastoreTable?.total_pages || 1"
-      :loading="props.datastoreTableLoading"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type {
-  UI_I_BackupDatastoreTable,
-  UI_I_CreateBackupForm
-} from '~/components/common/pages/backups/modals/lib/models/interfaces'
-
-const props = defineProps<{
-  datastoreTable: UI_I_BackupDatastoreTable
-  datastoreTableLoading: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'change', value: string[]): void
-}>()
-
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
-const selectedKeys = ref<string[]>([])
-
-watch(
-  () => props.datastoreTable,
-  () => {
-    selectedKeys.value = []
-  },
-  { deep: true, immediate: true }
-)
-
-watch(
-  () => model.value.backup_storage,
-  (newValue: string) => {
-    const selectedNames: string[] = []
-
-    props.datastoreTable?.items.forEach((item) => {
-      if (newValue === item.id) selectedNames.push(item.name)
-    })
-
-    emits('change', selectedNames)
-  },
-  { deep: true, immediate: true }
-)
-</script>
-
-<style lang="scss" scoped>
-.backups-table-content {
-  height: 100%;
-  padding: 0 10px 10px 10px;
-}
-</style>
+<template>
+  <div class="datastores h-full">
+    <common-pages-backups-modals-create-backup-datastores-table-view
+      v-model:selected="model.backup_storage"
+      :data-table="props.datastoreTable?.items || []"
+      :total-items="props.datastoreTable?.total_items || 0"
+      :total-pages="props.datastoreTable?.total_pages || 1"
+      :loading="props.datastoreTableLoading"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type {
+  UI_I_BackupDatastoreTable,
+  UI_I_CreateBackupForm
+} from '~/components/common/pages/backups/modals/lib/models/interfaces'
+
+const props = defineProps<{
+  datastoreTable: UI_I_BackupDatastoreTable | null
+  datastoreTableLoading: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'change', value: string[]): void
+}>()
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
+
+const selectedKeys = ref<string[]>([])
+
+watch(
+  () => props.datastoreTable,
+  () => {
+    selectedKeys.value = []
+  },
+  { deep: true, immediate: true }
+)
+
+watch(
+  () => model.value.backup_storage,
+  (newValue: string) => {
+    const selectedNames: string[] = []
+
+    props.datastoreTable?.items.forEach((item) => {
+      if (newValue === item.id) selectedNames.push(item.name)
+    })
+
+    emits('change', selectedNames)
+  },
+  { deep: true, immediate: true }
+)
+</script>
+
+<style lang="scss" scoped>
+.backups-table-content {
+  height: 100%;
+  padding: 0 10px 10px 10px;
+}
+</style>

package/package.json

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