bfg-common 1.5.47 → 1.5.49

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/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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.47",
+  "version": "1.5.49",
   "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.401",
+    "bfg-uikit": "1.0.402",
     "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