bfg-common 1.5.53 → 1.5.55

package/components/common/pages/home/lib/config/configResourceMeterBlock.ts

@@ -1,21 +1,35 @@
 import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
-export const optionsDefault: UI_I_Resources[] = [
-  {
-    type: 'cpu',
-    free: { text: '0', value: 0 },
-    used: { text: '0', value: 0 },
-    capacity: { text: '0', value: 0 },
-  },
-  {
-    type: 'memory',
-    free: { text: '0', value: 0 },
-    used: { text: '0', value: 0 },
-    capacity: { text: '0', value: 0 },
-  },
-  {
-    type: 'storage',
-    free: { text: '0', value: 0 },
-    used: { text: '0', value: 0 },
-    capacity: { text: '0', value: 0 },
-  },
-]
+
+export const optionsDefaultFunc = (
+  value: UI_I_Resources[] | null | undefined
+): UI_I_Resources[] => {
+  const defaultValue: UI_I_Resources[] = [
+    {
+      type: 'cpu',
+      free: { text: '0', value: 0 },
+      used: { text: '0', value: 0 },
+      capacity: { text: '0', value: 0 },
+    },
+    {
+      type: 'memory',
+      free: { text: '0', value: 0 },
+      used: { text: '0', value: 0 },
+      capacity: { text: '0', value: 0 },
+    },
+    {
+      type: 'storage',
+      free: { text: '0', value: 0 },
+      used: { text: '0', value: 0 },
+      capacity: { text: '0', value: 0 },
+    },
+  ]
+  if (!value || value.length === 0) {
+    return defaultValue
+  }
+
+  return [
+    value[0] || defaultValue[0],
+    value[1] || defaultValue[1],
+    value[2] || defaultValue[2],
+  ]
+}

package/components/common/pages/home/resource/ResourceOld.vue

@@ -1,122 +1,122 @@
-<template>
-  <div class="card">
-    <div class="card-block">
-      <div class="clr-row vc-capacity-content">
-        <div
-          v-for="item in props.items"
-          :key="item.type"
-          class="clr-col-md clr-col-sm-12 clr-col-xs-12 capacity-entity"
-        >
-          <div class="capacity-entity-content">
-            <h3 class="capacity-entity-label">
-              {{ localization.common[item.type] }}
-            </h3>
-            <div class="capacity-entity-metrics-content">
-              <h4
-                class="capacity-entity-free"
-                :data-id="`capacity-entity-free-${item.type}`"
-              >
-                {{ item.free.text }} {{ localization.common.free }}
-              </h4>
-              <progress
-                class="progress-block"
-                :max="item.capacity.value"
-                :value="item.used.value"
-              />
-              <div
-                class="capacity-entity-used"
-                :data-id="`capacity-entity-used-${item.type}`"
-              >
-                {{ item.used.text }}
-                {{ localization.common.used?.toLowerCase() }} |
-                {{ item.capacity.text }}
-                {{ localization.common.total?.toLowerCase() }}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
-
-const props = defineProps<{
-  items: UI_I_Resources[]
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-<style lang="scss" scoped>
-.card {
-  color: var(--global-font-color);
-  background-color: var(--global-bg-color);
-
-  &-block {
-    .capacity-entity {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      margin: 0;
-      padding: 0 10px;
-      border-left: 1px solid var(--global-border-color);
-
-      &:first-of-type {
-        border-left: none;
-      }
-
-      .capacity-entity-content {
-        min-height: 120px;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        width: 100%;
-
-        h3 {
-          font-size: 18px;
-          font-weight: 200;
-          margin-bottom: 5px;
-        }
-
-        progress.progress-block {
-          width: 100%;
-          height: 0.6395rem;
-          line-height: 24px;
-          background-color: var(--progress-bg-color);
-        }
-        progress::-webkit-progress-value,
-        progress::-moz-progress-value {
-          background-color: var(--progress-value-bg-color);
-        }
-        progress::-webkit-progress-bar {
-          background-color: var(--progress-bg-color);
-        }
-        .capacity-entity-free {
-          font-size: 22px;
-          font-weight: 200;
-          margin-bottom: 10px;
-        }
-        .capacity-entity-used {
-          font-size: 12px;
-        }
-        .capacity-entity-label {
-          align-self: flex-start;
-          // font-size: 0.9rem;
-        }
-      }
-    }
-  }
-}
-.capacity-entity-content:nth-child(1) {
-  border-left: none;
-}
-.capacity-entity-metrics-content {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-}
-</style>
+<template>
+  <div class="card">
+    <div class="card-block">
+      <div class="clr-row vc-capacity-content">
+        <div
+          v-for="item in props.items"
+          :key="item.type"
+          class="clr-col-md clr-col-sm-12 clr-col-xs-12 capacity-entity"
+        >
+          <div class="capacity-entity-content">
+            <h3 class="capacity-entity-label">
+              {{ localization.common[item.type] }}
+            </h3>
+            <div class="capacity-entity-metrics-content">
+              <h4
+                class="capacity-entity-free"
+                :data-id="`capacity-entity-free-${item.type}`"
+              >
+                {{ item.free.text }} {{ localization.common.free }}
+              </h4>
+              <progress
+                class="progress-block"
+                :max="item.capacity.value"
+                :value="item.used.value"
+              />
+              <div
+                class="capacity-entity-used"
+                :data-id="`capacity-entity-used-${item.type}`"
+              >
+                {{ item.used.text }}
+                {{ localization.common.used?.toLowerCase() }} |
+                {{ item.capacity.text }}
+                {{ localization.common.total?.toLowerCase() }}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
+
+const props = defineProps<{
+  items: UI_I_Resources[]
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+<style lang="scss" scoped>
+.card {
+  color: var(--global-font-color);
+  background-color: var(--global-bg-color);
+
+  &-block {
+    .capacity-entity {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      margin: 0;
+      padding: 0 10px;
+      border-left: 1px solid var(--global-border-color);
+
+      &:first-of-type {
+        border-left: none;
+      }
+
+      .capacity-entity-content {
+        min-height: 120px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        width: 100%;
+
+        h3 {
+          font-size: 18px;
+          font-weight: 200;
+          margin-bottom: 5px;
+        }
+
+        progress.progress-block {
+          width: 100%;
+          height: 0.6395rem;
+          line-height: 24px;
+          background-color: var(--progress-bg-color);
+        }
+        progress::-webkit-progress-value,
+        progress::-moz-progress-value {
+          background-color: var(--progress-value-bg-color);
+        }
+        progress::-webkit-progress-bar {
+          background-color: var(--progress-bg-color);
+        }
+        .capacity-entity-free {
+          font-size: 22px;
+          font-weight: 200;
+          margin-bottom: 10px;
+        }
+        .capacity-entity-used {
+          font-size: 12px;
+        }
+        .capacity-entity-label {
+          align-self: flex-start;
+          // font-size: 0.9rem;
+        }
+      }
+    }
+  }
+}
+.capacity-entity-content:nth-child(1) {
+  border-left: none;
+}
+.capacity-entity-metrics-content {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

package/components/common/split/horizontal/HorizontalNew.vue

@@ -337,10 +337,10 @@ onUnmounted(() => {
       z-index: calc(var(--z-default) + 2);
     }
 
-    &:focus {
-      background-color: var(--gutter-active-bg-color);
-      outline: none;
-    }
+    //&:focus {
+    //background-color: var(--gutter-active-bg-color);
+    //outline: none;
+    //}
 
     &:hover {
       background-color: var(--new-gutter-hover-bg-color);

package/components/common/tools/Actions.vue

@@ -1,6 +1,10 @@
 <template>
   <!--  :style="{ 'padding-right': rightSpace + 'px' }"-->
-  <div :id="id" class="btn-group">
+  <div
+    :id="id"
+    class="btn-group"
+    :style="{ paddingRight: spaceForCollapseBtn + 'px' }"
+  >
     <div v-for="(button, key) in props.actions" :key="button.type">
       <label v-if="button.uploaded" v-development="button.development">
         <span
@@ -96,8 +100,9 @@ const collapsedItems = computed<UI_I_CollapseNavItem[]>(() => {
 })
 watch(
   () => props.actions,
-  (newValue) => {
-    visibleCount.value = newValue.length
+  () => {
+    // visibleCount.value = newValue.length
+    outputSize()
   },
   { deep: true }
 )
@@ -120,6 +125,8 @@ watch(
 //   { deep: true }
 // )
 
+
+const spaceForCollapseBtn = ref<number>(65)
 const outputSize = (): void => {
   const el = document.getElementById(id.value)
   if (!el) return
@@ -129,14 +136,21 @@ const outputSize = (): void => {
   const elItems = Array.from(el.children).filter(
     (item) => !item.classList.contains('nav-tabs')
   )
-  const elItemsMarginLeft = parseInt(getComputedStyle(elItems[0]).marginLeft)
-  const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
-  const childrenMarginY = elItemsMarginLeft + elItemsMarginRight
+  // const elItemsMarginLeft = parseInt(getComputedStyle(elItems[0]).marginLeft)
+  // const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
+  // const childrenMarginX = elItemsMarginLeft + elItemsMarginRight
 
-  let childrenWidth = -10 // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
+  // let childrenWidth = -10 // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
+  let childrenWidth = spaceForCollapseBtn.value // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
   let count = 0
   for (let i = 0; i < elItems.length; i++) {
-    childrenWidth += elItems[i].clientWidth + childrenMarginY
+    const elItemsMarginLeft = parseInt(getComputedStyle(elItems[i]).marginLeft)
+    const elItemsMarginRight = parseInt(
+      getComputedStyle(elItems[i]).marginRight
+    )
+    const childrenMarginX = elItemsMarginLeft + elItemsMarginRight
+
+    childrenWidth += elItems[i].clientWidth + childrenMarginX
     // const isWrap = elWidth - rightSpace.value < childrenWidth
     const isWrap = elWidth < childrenWidth
 

package/components/common/vm/actions/common/select/compatibility/Compatibility.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="select-compatibility">
     <p class="select-compatibility-block">
-      {{
-        localization.common.hostSupportsMoreVirtualMachineVersionSelectCompatibilityVirtualMachine
-      }}
+      {{ description }}
     </p>
     <div class="select-compatibility-block version-select-wrap">
-      <label for="version-select">{{ localization.common.compatibleWith }}:</label>
+      <label for="version-select"
+        >{{ localization.common.compatibleWith }}:</label
+      >
 
       <atoms-tooltip-error
         :has-error="!!apiError"
@@ -86,6 +86,13 @@ watch(
   { immediate: true }
 )
 
+const config = useRuntimeConfig()
+const description = computed<string>(() => {
+  return localization.value.common.hostSupportsMoreVirtualMachineVersionSelectCompatibilityVirtualMachine.replaceAll(
+    '{trademark}',
+    config.public[`TRADEMARK_${useEnvLanguage()}`]
+  )
+})
 const versionDescription = computed<string>(() => {
   if (!selectedVersion.value) return ''
 

package/lib/models/interfaces.ts

@@ -1,80 +1,80 @@
-import type { UI_I_ModalPayloadSchedulerData } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
-import type { UI_T_NotificationStatus } from '~/components/atoms/alert/lib/models/types'
-import { UI_E_State } from '~/lib/models/enums'
-
-export interface UI_I_ItemView {
-  value: number | string
-  text: string
-}
-export interface UI_I_HTMLSelectElement extends Event {
-  target: HTMLInputElement
-}
-
-export interface UI_I_ArbitraryObject<T> {
-  [key: string]: T
-}
-
-export interface UI_I_Localization {
-  common: UI_I_ArbitraryObject<string>
-  auth: UI_I_ArbitraryObject<string>
-  home: UI_I_ArbitraryObject<string>
-  tasks: UI_I_ArbitraryObject<string>
-  layout: UI_I_ArbitraryObject<string>
-  mainNavigation: UI_I_ArbitraryObject<string>
-  administration: UI_I_ArbitraryObject<string>
-  inventoryConfigure: UI_I_ArbitraryObject<string>
-  datastoreWizard: UI_I_ArbitraryObject<string>
-  inventorySummary: UI_I_ArbitraryObject<string>
-  contextMenu: UI_I_ArbitraryObject<string>
-  networks: UI_I_ArbitraryObject<string>
-  inventory: UI_I_ArbitraryObject<string>
-  inventoryMonitor: UI_I_ArbitraryObject<string>
-  inventoryTabs: UI_I_ArbitraryObject<string>
-  snapshots: UI_I_ArbitraryObject<string>
-  importVms: UI_I_ArbitraryObject<string>
-  migrateVm: UI_I_ArbitraryObject<string>
-  storageDevice: UI_I_ArbitraryObject<string>
-  scheduledTasks: UI_I_ArbitraryObject<string>
-  license: UI_I_ArbitraryObject<string>
-  events: UI_I_ArbitraryObject<string>
-  zabbix: UI_I_ArbitraryObject<string>
-  glpi: UI_I_ArbitraryObject<string>
-  remoteConsole: UI_I_ArbitraryObject<string>
-  vmWizard: UI_I_ArbitraryObject<string>
-  feedback: UI_I_ArbitraryObject<string>
-  vsphereHa: UI_I_ArbitraryObject<string>
-  adapter: UI_I_ArbitraryObject<string>
-  bottomPanel: UI_I_ArbitraryObject<string>
-}
-export interface UI_I_SendTaskParams {
-  method: string
-  target: string
-  args: any
-  encode?: boolean
-}
-export interface UI_I_NotifyBodyMessage {
-  status: UI_T_NotificationStatus
-  title: string
-  desc: string
-}
-
-export interface UI_I_ListIndex {
-  idx: number
-  count: number
-}
-
-export interface UI_I_State {
-  state: UI_E_State
-  errors: string[]
-}
-
-export interface UI_I_ItemsWithTotalCounts<T> {
-  total_items: number
-  total_pages: number
-  items: T[]
-}
-
-export interface UI_I_ModalPayload<T = any> {
-  isShow: boolean
-  scheduler: UI_I_ModalPayloadSchedulerData<T>
-}
+import type { UI_I_ModalPayloadSchedulerData } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
+import type { UI_T_NotificationStatus } from '~/components/atoms/alert/lib/models/types'
+import { UI_E_State } from '~/lib/models/enums'
+
+export interface UI_I_ItemView {
+  value: number | string
+  text: string
+}
+export interface UI_I_HTMLSelectElement extends Event {
+  target: HTMLInputElement
+}
+
+export interface UI_I_ArbitraryObject<T> {
+  [key: string]: T
+}
+
+export interface UI_I_Localization {
+  common: UI_I_ArbitraryObject<string>
+  auth: UI_I_ArbitraryObject<string>
+  home: UI_I_ArbitraryObject<string>
+  tasks: UI_I_ArbitraryObject<string>
+  layout: UI_I_ArbitraryObject<string>
+  mainNavigation: UI_I_ArbitraryObject<string>
+  administration: UI_I_ArbitraryObject<string>
+  inventoryConfigure: UI_I_ArbitraryObject<string>
+  datastoreWizard: UI_I_ArbitraryObject<string>
+  inventorySummary: UI_I_ArbitraryObject<string>
+  contextMenu: UI_I_ArbitraryObject<string>
+  networks: UI_I_ArbitraryObject<string>
+  inventory: UI_I_ArbitraryObject<string>
+  inventoryMonitor: UI_I_ArbitraryObject<string>
+  inventoryTabs: UI_I_ArbitraryObject<string>
+  snapshots: UI_I_ArbitraryObject<string>
+  importVms: UI_I_ArbitraryObject<string>
+  migrateVm: UI_I_ArbitraryObject<string>
+  storageDevice: UI_I_ArbitraryObject<string>
+  scheduledTasks: UI_I_ArbitraryObject<string>
+  license: UI_I_ArbitraryObject<string>
+  events: UI_I_ArbitraryObject<string>
+  zabbix: UI_I_ArbitraryObject<string>
+  glpi: UI_I_ArbitraryObject<string>
+  remoteConsole: UI_I_ArbitraryObject<string>
+  vmWizard: UI_I_ArbitraryObject<string>
+  feedback: UI_I_ArbitraryObject<string>
+  vsphereHa: UI_I_ArbitraryObject<string>
+  adapter: UI_I_ArbitraryObject<string>
+  bottomPanel: UI_I_ArbitraryObject<string>
+}
+export interface UI_I_SendTaskParams {
+  method: string
+  target: string
+  args: any
+  encode?: boolean
+}
+export interface UI_I_NotifyBodyMessage {
+  status: UI_T_NotificationStatus
+  title: string
+  desc: string
+}
+
+export interface UI_I_ListIndex {
+  idx: number
+  count: number
+}
+
+export interface UI_I_State {
+  state: UI_E_State
+  errors: string[]
+}
+
+export interface UI_I_ItemsWithTotalCounts<T> {
+  total_items: number
+  total_pages: number
+  items: T[]
+}
+
+export interface UI_I_ModalPayload<T = any> {
+  isShow: boolean
+  scheduler: UI_I_ModalPayloadSchedulerData<T>
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.53",
+  "version": "1.5.55",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "1.0.22",
-    "bfg-uikit": "1.0.399",
+    "bfg-uikit": "1.0.403",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }

package/plugins/recursion.ts

@@ -317,16 +317,30 @@ export default defineNuxtPlugin(() => {
       }
     }
 
-    self.calcCount = function (arr: any[], itemsProp: string): number {
+    self.calcCount = function (
+      arr: any[],
+      itemsProp: string,
+      value?: any[],
+      valueProps?: string[]
+    ): number {
       if (!arr) return 0
       let res = 0
 
       for (let i = 0; i < arr.length; i++) {
         const item: any = arr[i]
-        res++
+
+        if (value && valueProps) {
+          valueProps.forEach((valueProp) => {
+            if (value.includes(item[valueProp])) {
+              res++
+            }
+          })
+        } else {
+          res++
+        }
 
         if (item[itemsProp]?.length) {
-          res += self.calcCount(item[itemsProp], itemsProp)
+          res += self.calcCount(item[itemsProp], itemsProp, value, valueProps)
         }
       }
       return res