bfg-common 1.5.182 → 1.5.184

package/assets/localization/local_be.json

@@ -1436,6 +1436,7 @@
     "stopDirectConsoleUIService": "Спыніць службу інтэрфейсу Direct Console?",
     "stopTheService": "Спыніць службу",
     "storage": "Захоўванне",
+    "storages": "Сховішчы",
     "storageAdapter": "Адаптар для захоўвання",
     "storageAdapters": "Адаптары для захоўвання дадзеных",
     "storageArrayTypePolicy": "Палітыка тыпу захоўвання",
@@ -2354,6 +2355,10 @@
     "compatibilityItem1": "Прокуратар 1.0.0 і больш познія версіі",
     "compatibilityItem2": "Гарызонт-VS 1.0.74 і больш познія версіі",
     "compatibilityItem3": "ESXi 6.7 і больш познія версіі",
+    "guestOsVersionsItem1": "Іншае Linux (64-bit)",
+    "guestOsVersionsItem2": "Іншае Linux (32-bit)",
+    "guestOsVersionsItem3": "Іншае (64-bit)",
+    "guestOsVersionsItem4": "Іншае (32-bit)",
     "associated": "Звязаны",
     "hostMonitoring": "Гаспадар мониторинг",
     "admissionControl": "Прыём кіраванне",

package/assets/localization/local_en.json

@@ -1435,6 +1435,7 @@
     "stopDirectConsoleUIService": "Stop Direct Console UI service?",
     "stopTheService": " Stop the service",
     "storage": "Storage",
+    "storages": "Storages",
     "storageAdapter": "Storage Adapter",
     "storageAdapters": "Storage Adapters",
     "storageArrayTypePolicy": "Storage Type Policy",
@@ -2358,6 +2359,10 @@
     "compatibilityItem1": "Procurator 1.0.0 and later",
     "compatibilityItem2": "Gorizont-VS 1.0.74 and later",
     "compatibilityItem3": "ESXi 6.7 and later",
+    "guestOsVersionsItem1": "Other Linux (64-bit)",
+    "guestOsVersionsItem2": "Other Linux (32-bit)",
+    "guestOsVersionsItem3": "Other (64-bit)",
+    "guestOsVersionsItem4": "Other (32-bit)",
     "associated": "Associated",
     "hostMonitoring": "Host Monitoring",
     "admissionControl": "Admission Control",

package/assets/localization/local_hy.json

@@ -1435,6 +1435,7 @@
     "stopDirectConsoleUIService": "Դադարեցնե՞լ Direct Console UI ծառայությունը",
     "stopTheService": "Դադարեցնել ծառայությունը",
     "storage": "պահեստավորում",
+    "storages": "Պահոցներ",
     "storageAdapter": "Պահպանման ադապտեր",
     "storageAdapters": "Տվյալների պահպանման ադապտերներ",
     "storageArrayTypePolicy": "Պահպանման տեսակի քաղաքականություն",
@@ -2358,6 +2359,10 @@
     "compatibilityItem1": "Պրոկուրատոր 1.0.0 և ավելի ուշ տարբերակները",
     "compatibilityItem2": "Հորիզոն-VS 1.0.74 և ավելի ուշ տարբերակները",
     "compatibilityItem3": "ESXi 6.7 և ավելի ուշ տարբերակները",
+    "guestOsVersionsItem1": "Այլ Linux (64-bit)",
+    "guestOsVersionsItem2": "Այլ Linux (32-bit)",
+    "guestOsVersionsItem3": "Այլ (64-bit)",
+    "guestOsVersionsItem4": "Այլ (32-bit)",
     "associated": "Կապված",
     "hostMonitoring": "Հանգույցի մոնիտորինգ",
     "admissionControl": "Ընդունելության վերահսկում",

package/assets/localization/local_kk.json

@@ -1435,6 +1435,7 @@
     "stopDirectConsoleUIService": "Тікелей консоль UI қызметін тоқтату керек пе?",
     "stopTheService": "Қызметті тоқтату",
     "storage": "сақтау",
+    "storages": "Сақтағыштар",
     "storageAdapter": "Сақтау адаптері",
     "storageAdapters": "Деректерді сақтауға арналған адаптерлер",
     "storageArrayTypePolicy": "Сақтау түрі саясаты",
@@ -2357,6 +2358,10 @@
     "compatibilityItem1": "Прокуратор 1.0.0 және одан кейінгі нұсқалар",
     "compatibilityItem2": "Горизонт-VS 1.0.74 және одан кейінгі нұсқалар",
     "compatibilityItem3": "ESXi 6.7 және одан кейінгі нұсқалар",
+    "guestOsVersionsItem1": "Басқа Linux (64-bit)",
+    "guestOsVersionsItem2": "Басқа Linux (32-bit)",
+    "guestOsVersionsItem3": "Басқа (64-bit)",
+    "guestOsVersionsItem4": "Басқа (32-bit)",
     "associated": "Байланысты",
     "hostMonitoring": "Түйін бақылау",
     "admissionControl": "Қабылдау басқару",

package/assets/localization/local_ru.json

@@ -1435,6 +1435,7 @@
     "stopDirectConsoleUIService": "Остановить службу пользовательского интерфейса Direct Console?",
     "stopTheService": " Остановить службу",
     "storage": "Хранилище",
+    "storages": "Хранилища",
     "storageAdapter": "Адаптер хранения",
     "storageAdapters": "Адаптеры для хранения данных",
     "storageArrayTypePolicy": "Политика типа хранилища",
@@ -2357,6 +2358,10 @@
     "compatibilityItem1": "Прокуратор 1.0.0 и более поздние версии",
     "compatibilityItem2": "Горизонт-VS 1.0.74 и более поздние версии",
     "compatibilityItem3": "ESXi 6.7 и более поздние версии",
+    "guestOsVersionsItem1": "Другой Linux (64-bit)",
+    "guestOsVersionsItem2": "Другой Linux (32-bit)",
+    "guestOsVersionsItem3": "Другой (64-bit)",
+    "guestOsVersionsItem4": "Другой (32-bit)",
     "associated": "Связан",
     "hostMonitoring": "Мониторинг узла",
     "admissionControl": "Контроль приема",

package/assets/localization/local_zh.json

@@ -1434,6 +1434,7 @@
     "stopDirectConsoleUIService": "停止直接控制台 UI 服務？",
     "stopTheService": "停止服務",
     "storage": "贮存",
+    "storages": "多个存储",
     "storageAdapter": "存储适配器",
     "storageAdapters": "存储适配器",
     "storageArrayTypePolicy": "存储类型策略",
@@ -2355,6 +2356,10 @@
     "compatibilityItem1": "检察官 1.0.0及更高版本",
     "compatibilityItem2": "地平线-VS 1.0.74及更高版本",
     "compatibilityItem3": "ESXi 6.7及更高版本",
+    "guestOsVersionsItem1": "其他 Linux (64-位)",
+    "guestOsVersionsItem2": "其他 Linux (32-位)",
+    "guestOsVersionsItem3": "其他 (64-位)",
+    "guestOsVersionsItem4": "其他 (32-位)",
     "associated": "相关联",
     "hostMonitoring": "结 监控",
     "admissionControl": "入場費 控制",

package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareNew.vue

@@ -211,74 +211,15 @@ const themeMode = useLocalStorage('themeMode')
     margin-top: 12px;
   }
 }
-//
-//.light-theme {
-//  :deep(.stack-block-label .ui-main-select-toggle) {
-//    background-color: #ffffff;
-//  }
-//  :deep(.stack-block-expanded > .stack-block-label .ui-main-select-toggle) {
-//    background-color: #1b2a371f;
-//    border-color: #e9ebed3d;
-//
-//    .ui-arrow-icon {
-//      color: #e9eaec;
-//    }
-//  }
-//  :deep(.stack-block-expanded > .stack-block-label .combobox-input) {
-//    color: #e9eaec;
-//  }
-//  :deep(.stack-block-expanded > .stack-block-label .ui-selected-text) {
-//    color: #e9eaec;
-//  }
-//
-//  :deep(.stack-block-label .ui-main-input) {
-//    background-color: #ffffff;
-//  }
-//  :deep(.stack-block-expanded > .stack-block-label .ui-main-input) {
-//    background-color: #1b2a371f;
-//    border-color: #e9ebed3d;
-//    color: #e9eaec;
-//  }
-//}
-//
-//.dark-theme {
-//  :deep(.stack-block-label .ui-main-select-toggle) {
-//    background-color: #1b2a371f;
-//  }
-//  :deep(.stack-block-expanded > .stack-block-label .ui-main-select-toggle) {
-//    background-color: #ffffff;
-//    border-color: #d3d6da;
-//
-//    .ui-arrow-icon {
-//      color: #182531;
-//    }
-//  }
-//  :deep(.stack-block-expanded > .stack-block-label .combobox-input) {
-//    color: #182531;
-//  }
-//  :deep(.stack-block-expanded > .stack-block-label .ui-selected-text) {
-//    color: #182531;
-//  }
-//
-//  :deep(.stack-block-label .ui-main-input) {
-//    background-color: #1b2a371f;
-//  }
-//  :deep(.stack-block-expanded > .stack-block-label .ui-main-input) {
-//    background-color: #ffffff;
-//    border-color: #d3d6da;
-//    color: #182531;
-//  }
-//  :deep(.ui-select-toggle-button:disabled) {
-//    background-color: linear-gradient(
-//        0deg,
-//        rgba(189, 195, 199, 0.08) 0%,
-//        rgba(189, 195, 199, 0.08) 100%
-//      ),
-//      rgba(27, 42, 55, 0.12);
-//    border-color: #D3D6DA14;
-//    color: #BDC3C770;
-//  }
-//}
+
+:deep(.stack-block .stack-block-label .stack-view-key) {
+  //flex: 0 0 280px;
+  max-width: 280px;
+  margin-right: 12px;
+}
+:deep(.stack-block .stack-block-label .stack-block-content) {
+  width: unset;
+}
 </style>
 <style lang="scss">
 .light-theme {
@@ -287,12 +228,16 @@ const themeMode = useLocalStorage('themeMode')
   }
   .stack-block-expanded > .stack-block-label .ui-main-select-toggle {
     background-color: #1b2a371f;
-    border-color: #e9ebed3d;
 
-    .ui-arrow-icon {
-      color: #e9eaec;
+    &:not(.open) {
+      border-color: #e9ebed3d;
+
+      .ui-arrow-icon {
+        color: #e9eaec;
+      }
     }
   }
+
   .stack-block-expanded > .stack-block-label .combobox-input {
     color: #e9eaec;
   }

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareNew.vue

@@ -477,13 +477,4 @@ const onAddDevice = (data: number): void => {
   padding-bottom: 12px;
   background-color: var(--vm-wizard-block-view-bg-color);
 }
-
-:deep(.stack-block .stack-block-label .stack-view-key) {
-  //flex: 0 0 280px;
-  max-width: 280px;
-  margin-right: 12px;
-}
-:deep(.stack-block .stack-block-label .stack-block-content) {
-  width: unset;
-}
 </style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/tooltip/TooltipNew.vue

@@ -77,10 +77,10 @@ const isShowCpuHelp = ref<boolean>(false)
 
 <style>
 :root {
-  --cpu-help-icon-color: #4d5d69;
+  --cpu-help-icon-hover-color: #4d5d69;
 }
 :root.dark-theme {
-  --cpu-help-icon-color: #e9eaec;
+  --cpu-help-icon-hover-color: #e9eaec;
 }
 </style>
 <style lang="scss" scoped>
@@ -88,7 +88,7 @@ const isShowCpuHelp = ref<boolean>(false)
   color: #9da6ad; // for light and dark
 
   &:hover {
-    color: var(--cpu-help-icon-color);
+    color: var(--cpu-help-icon-hover-color);
   }
   &.active {
     color: #008fd6;
@@ -128,3 +128,10 @@ const isShowCpuHelp = ref<boolean>(false)
   }
 }
 </style>
+<style lang="scss">
+.light-theme {
+  .stack-block-expanded {
+    --cpu-help-icon-hover-color: #e9eaec;
+  }
+}
+</style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/location/StorageModalNew.vue

@@ -4,13 +4,21 @@
     show
     :title="localization.common.selectStorage"
     :texts="texts"
+    :is-disabled-accept="isDisabledAccept"
     test-id="storage-modal-new"
     size="md"
+    width="720px"
     @hide="emits('hide')"
     @submit="emits('submit')"
   >
     <template #content>
-      <div class="select-storage-modal-container">
+      <div
+        ref="selectStorageModalContainer"
+        :class="[
+          'select-storage-modal-container',
+          { 'has-scroll': isHasScroll },
+        ]"
+      >
         <span class="description-text">{{
           localization.common
             .followingDatastoresAccessibleDestinationResourceThatSelected
@@ -22,7 +30,12 @@
           hide-compatibility
           hide-alert
           @submit="emits('change-storage', $event)"
+          @is-selected-row="isDisabledAccept = !$event"
         />
+        <span class="count-text"
+          >{{ props.datastore.length }}
+          {{ localization.common.datastores }}</span
+        >
       </div>
     </template>
     <template #footerLeftContent>
@@ -32,6 +45,7 @@
 </template>
 
 <script setup lang="ts">
+import { useElementSize } from '@vueuse/core'
 import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/models/interfaces'
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
@@ -52,18 +66,43 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const isDisabledAccept = ref<boolean>(false)
+
 const texts = ref<UI_I_ModalTexts>({
+  button1: localization.value.common.cancel,
   button2: localization.value.common.select,
 })
+
+const selectStorageModalContainer = ref<any>(null)
+const { width, height } = useElementSize(selectStorageModalContainer)
+const isHasScroll = ref<boolean>(false)
+const isScrollVisible = (element: HTMLElement): boolean =>
+  element.scrollHeight > element.clientHeight
+
+watch([width, height], () => {
+  if (!selectStorageModalContainer.value) return
+
+  isHasScroll.value = isScrollVisible(selectStorageModalContainer.value)
+})
 </script>
 
 <style scoped lang="scss">
 .select-storage-modal-container {
+  height: calc(100vh - 300px);
+  overflow-y: auto;
   display: flex;
   flex-direction: column;
-  grid-gap: 12px;
+  //grid-gap: 12px;
   padding-left: 32px;
-  padding-bottom: 5px;
+  padding-top: 8px;
+  padding-bottom: 8px;
+
+  &:not(.has-scroll) {
+    padding-right: 32px;
+  }
+  &.has-scroll {
+    padding-right: 18px;
+  }
 
   .description-text {
     font-size: 12px;
@@ -71,5 +110,14 @@ const texts = ref<UI_I_ModalTexts>({
     line-height: 14.52px;
     color: #9da6ad;
   }
+  .count-text {
+    text-align: right;
+    font-size: 12px;
+    font-weight: 400;
+    color: #9da6ad;
+    margin-bottom: 8px;
+    margin-top: 8px;
+    text-transform: lowercase;
+  }
 }
 </style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/location/new/New.vue

@@ -25,6 +25,9 @@
               @select="emits('select', $event)"
             />
           </div>
+          <p class="count-text">
+            {{ props.networksTable.length }} {{ localization.common.networks }}
+          </p>
         </template>
         <template #footerLeftContent>
           <span></span>
@@ -60,4 +63,14 @@ const modalTexts = ref<UI_I_ModalTexts>({
 })
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.count-text {
+  text-align: right;
+  font-size: 12px;
+  font-weight: 400;
+  color: #9da6ad;
+  margin-bottom: 8px;
+  margin-top: 8px;
+  text-transform: lowercase;
+}
+</style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/location/new/table/Table.vue

@@ -2,6 +2,7 @@
   <ui-data-table
     :data="data"
     :options="options"
+    size="sm"
     test-id="data-table-main"
     class="network-table"
     server-off

package/components/common/vm/actions/common/customizeHardware/vmoptions/VmoptionsNew.vue

@@ -94,9 +94,12 @@ const emits = defineEmits<{
 
 <style scoped lang="scss">
 .vm-options {
+  height: calc(100% - 20px);
   display: flex;
   flex-direction: column;
   gap: 12px;
-  padding-top: 12px;
+  margin-top: 20px;
+  padding: 0 32px 12px;
+  overflow: auto;
 }
 </style>

package/components/common/vm/actions/common/customizeHardware/vmoptions/generalOptions/GeneralOptionsNew.vue

@@ -131,6 +131,11 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   gap: 4px;
 }
 
+.vsphere-icon-vm {
+  width: 20px;
+  height: 20px;
+}
+
 :deep(.guest-os-family-select .ui-main-select-toggle),
 :deep(.guest-machine-type-select .ui-main-select-toggle) {
   width: 108px;

package/components/common/vm/actions/common/lib/config/capabilities.ts

@@ -358,10 +358,10 @@ setTimeout(() => {
       capabilities.value.compatibility[1].text = newValue.common.compatibilityItem2
       capabilities.value.compatibility[2].text = newValue.common.compatibilityItem3
       capabilities.value.guestOsFamilies[2].text = newValue.common.other
-      capabilities.value.guestOsVersions.linux[19].text = capabilities.value.guestOsVersions.linux[19].text.replace('Other', newValue.common.other)
-      capabilities.value.guestOsVersions.linux[20].text = capabilities.value.guestOsVersions.linux[20].text.replace('Other', newValue.common.other)
-      capabilities.value.guestOsVersions.other[4].text = capabilities.value.guestOsVersions.other[4].text.replace('Other', newValue.common.other)
-      capabilities.value.guestOsVersions.other[5].text = capabilities.value.guestOsVersions.other[5].text.replace('Other', newValue.common.other)
+      capabilities.value.guestOsVersions.linux[19].text = newValue.common.guestOsVersionsItem1
+      capabilities.value.guestOsVersions.linux[20].text = newValue.common.guestOsVersionsItem2
+      capabilities.value.guestOsVersions.other[4].text = newValue.common.guestOsVersionsItem3
+      capabilities.value.guestOsVersions.other[5].text = newValue.common.guestOsVersionsItem4
 
     },
     { deep: true }

package/components/common/vm/actions/common/select/storage/Storage.vue

@@ -42,6 +42,7 @@ const props = defineProps<{
 }>()
 const emits = defineEmits<{
   (event: 'submit', value: UI_I_DatastoreTableItem): void
+  (event: 'is-selected-row', value: boolean): void
 }>()
 
 const { $store }: any = useNuxtApp()
@@ -97,6 +98,13 @@ watch(
   },
   { immediate: true }
 )
+watch(
+  selectedRow,
+  (newValue) => {
+    emits('is-selected-row', typeof newValue === 'number')
+  },
+  { immediate: true }
+)
 
 watch(
   () => props.storageSubmit,

package/components/common/vm/actions/common/select/storage/new/New.vue

@@ -17,6 +17,7 @@
         :options="tableOptions"
         :loading="loading"
         :default-layout="false"
+        :texts="tableTexts"
         test-id="select-storage-data-table"
         server-off
         size="sm"
@@ -62,7 +63,10 @@
 </template>
 
 <script setup lang="ts">
-import type { UI_I_DataTable } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
+import type {
+  UI_I_DataTable,
+  UI_I_TableTexts,
+} from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import {
@@ -70,6 +74,7 @@ import {
   tableDataFunc,
   tableOptions,
 } from '~/components/common/vm/actions/common/select/storage/new/lib/config/table'
+import { tableTextsFunc } from '~/lib/config/uiTable'
 
 const selectedRow = defineModel<number | null>('selectedRow')
 
@@ -87,6 +92,10 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const tableTexts = computed<UI_I_TableTexts>(() =>
+  tableTextsFunc(localization.value)
+)
+
 const storageCount = computed<string>(() =>
   localization.value.vmWizard.storageCount.replace(
     '{0}',

package/components/common/vm/actions/common/select/storage/new/lib/config/table.ts

@@ -238,8 +238,16 @@ export const tableBodyFunc = (
             text: localization.common.supported,
           }
 
-    thinProvisioningData = getStatus(item.thin_provisioning)
-    storage_io_control = getStatus(item.storage_io_control)
+    thinProvisioningData = getStatus(
+      item.thin_provisioning,
+      localization.common.yes,
+      localization.common.no
+    )
+    storage_io_control = getStatus(
+      item.storage_io_control,
+      localization.common.yes,
+      localization.common.no
+    )
 
     result.push({
       row: key,
@@ -257,7 +265,7 @@ export const tableBodyFunc = (
           key: 'state',
           col: 1,
           text: stateData.text,
-          data: stateData
+          data: stateData,
         },
         { col: 2, text: $binary.round(item.capacity.capacity_mb) },
         {
@@ -282,7 +290,7 @@ export const tableBodyFunc = (
           text: item.thin_provisioning
             ? localization.common.yes
             : localization.common.no,
-          data: thinProvisioningData
+          data: thinProvisioningData,
         },
         {
           col: 8,
@@ -292,7 +300,7 @@ export const tableBodyFunc = (
           key: 'state',
           col: 9,
           text: item.hardware_acceleration,
-          data: hardwareAccelerationData
+          data: hardwareAccelerationData,
         },
         {
           col: 10,
@@ -306,7 +314,7 @@ export const tableBodyFunc = (
           key: 'state',
           col: 12,
           text: item.storage_io_control,
-          data: storage_io_control
+          data: storage_io_control,
         },
       ],
     })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.182",
+  "version": "1.5.184",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -34,7 +34,7 @@
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
-    "bfg-nuxt-3-graph": "1.0.24",
+    "bfg-nuxt-3-graph": "1.0.25",
     "bfg-uikit": "1.0.417",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"