bfg-common 1.5.239 → 1.5.241

package/assets/scss/common/theme.scss

@@ -169,6 +169,9 @@
   --diagram-content-third-text: #9da6ad;
   --diagram-info-text: #4d5d69;
   --diagram-info-second-text: #9da6ad;
+
+  // VM Add Edit new view
+  --select-file-type-label: #4d5d69;
 }
 
 :root.dark-theme {
@@ -330,4 +333,7 @@
   --diagram-content-third-text: #9da6ad;
   --diagram-info-text: #e9eaec;
   --diagram-info-second-text: #9da6ad;
+
+  // VM Add Edit new view
+  --select-file-type-label: #e9eaec;
 }

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

@@ -819,7 +819,7 @@ const headItemsPresent = computed<UI_I_HeadItem[]>(() => {
 const bodyItemsPresent = computed<UI_I_BodyItem[][]>(() => {
   let items: UI_I_BodyItem[][] = props.bodyItems.map((row) => {
     return row.map((item) => {
-      const text = item.text.toString()
+      const text = item.text?.toString() || ''
       return {
         ...item,
         // Если текст пустой нужно поставить '--' для экспорта

package/components/common/browse/BrowseNew.vue

@@ -37,7 +37,9 @@
                         :class="['browse-tree-item', { active: node.isActive }]"
                       >
                         <span :class="node.iconClassName"></span>
-                        <span class="text-ellipsis">{{ node.name }}</span>
+                        <span class="text-ellipsis datastore-node-name">{{
+                          node.name
+                        }}</span>
                       </div>
                     </template>
                   </ui-tree>
@@ -204,7 +206,7 @@ const selectedFileTypeLocal = computed<any>({
 
 <style scoped lang="scss">
 .file-type-label {
-  color: #4d5d69;
+  color: var(--select-file-type-label);
 }
 
 .new-view-info {
@@ -239,6 +241,10 @@ const selectedFileTypeLocal = computed<any>({
   display: flex;
   align-items: center;
   column-gap: 8px;
+
+  .datastore-node-name {
+    font-size: 12px;
+  }
 }
 .first-block-content {
   :deep(.tree-content) {

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

@@ -227,7 +227,10 @@ const themeMode = useLocalStorage('themeMode')
   //flex: 0 0 280px;
   max-width: 280px;
   margin-right: 12px;
-  line-height: 32px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  //line-height: 32px;
 
   .ui-checkbox-label {
     min-height: 32px;
@@ -246,7 +249,7 @@ const themeMode = useLocalStorage('themeMode')
 </style>
 <style lang="scss">
 .light-theme {
-  .stack-block-label .ui-main-select-toggle:not(.error) {
+  .stack-block-label .ui-main-select-toggle:not(.error):not(:disabled) {
     background-color: #ffffff;
   }
   .stack-block-expanded > .stack-block-label .ui-main-select-toggle {

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

@@ -24,7 +24,7 @@
           elem-id="add-device-dropdown"
           test-id="add-device-dropdown"
           left
-          max-height="300px"
+          max-height="400px"
           @select="onAddDevice"
           @hide="isShowAddDeviceDropdown = false"
         />
@@ -442,11 +442,11 @@ const onAddDevice = (data: number): void => {
       }
       :deep(.ui-popup-window) {
         overflow: hidden;
-        padding: 12px 0;
+        padding: 8px 0;
 
         .ui-dropdown {
           overflow: auto;
-          max-height: calc(300px - 24px);
+          //max-height: calc(300px - 24px);
 
           .ui-dropdown-menu.md {
             padding: 0 8px;
@@ -459,10 +459,10 @@ const onAddDevice = (data: number): void => {
               &:not(:last-child) {
                 margin-bottom: 4px;
               }
-              &:last-child ul li:last-child {
-                height: 26px;
-                align-items: flex-end;
-              }
+              //&:last-child ul li:last-child {
+              //height: 26px;
+              //align-items: flex-end;
+              //}
             }
           }
         }

package/components/common/vm/actions/common/customizeHardware/virtualHardware/bus/BusNew.vue

@@ -24,8 +24,8 @@
         >
           <ui-icon
             :data-id="`${props.testId}-show-help-icon`"
-            width="16"
-            height="16"
+            width="20"
+            height="20"
             name="info"
             :class="['bus-help-icon cursor-pointer', {active: isShowHelp}]"
             @click.stop="isShowHelp = !isShowHelp"

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDriveNew.vue

@@ -4,6 +4,7 @@
     :is-roll-back="props.type === 'removed'"
     :removable="props.isRemovable"
     :test-id="`cd-dvd-drive-stack-block-${props.index}`"
+    is-toggle-on-stack-view-key
     @remove="emits('remove')"
     @roll-back="emits('roll-back')"
   >
@@ -173,6 +174,9 @@ const onChangeCdDvdDrive = (data: string): void => {
     gap: 0;
   }
 
+  #device-will-removed-text-main {
+    color: #9da6ad;
+  }
   .device-will-removed-text {
     font-size: 13px;
     color: #9da6ad;

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/CpuNew.vue

@@ -1,190 +1,194 @@
-<template>
-  <div class="hardware-cpu">
-    <ui-stack-block :has-children="true" test-id="cpu-stack-block">
-      <template #stackBlockKey>
-        <div
-          id="vm-wizard-toggle-block-cpu"
-          data-id="vm-wizard-toggle-block-cpu"
-          class="flex-align-center"
-        >
-          <span class="title">{{ localization.common.cpu }}</span>
-          <ui-icon
-            v-show="props.cpuInvalid"
-            width="18px"
-            height="18px"
-            name="error-outline"
-            class="ml-2"
-          />
-        </div>
-      </template>
-      <template #stackBlockContent>
-        <div class="flex-align-center flex-space-between">
-          <ui-combobox
-            v-model.number="selectedCpu"
-            :items="props.cpuOptions"
-            :disabled="props.isCpuDisabled"
-            :error-text="props.vcpusLocalAndApiErrorsTexts"
-            class="cpu-select"
-            test-id="vm-wizard-cpu-combobox"
-            size="sm"
-            width="auto"
-          />
-
-          <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-tooltip
-            :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
-          />
-        </div>
-      </template>
-      <template #stackChildren>
-        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-cores-per-socket
-          v-model:selected-core-per-socket="selectedCorePerSocket"
-          :selected-cpus="props.selectedCpus"
-          :cpu-options="props.cpuOptions"
-          :is-edit="props.isEdit"
-          :disabled="props.isDisabled"
-          :error-validation-fields="props.errorValidationFields"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-hot-plug
-          v-model:enable-cpu-hot-add="enableCpuHotAdd"
-          :disabled="props.enableCpuHotAddDisabled"
-        />
-        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-max-cpu
-          v-show="enableCpuHotAdd"
-          v-model:selected-max-cpu.number="selectedMaxCpu"
-          :cpu-options="props.maxCpuOptions"
-          :error-validation-fields="props.errorValidationFields"
-          :disabled="props.isDisabled"
-          @invalid="emits('max-cpu-invalid', $event)"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-        <common-vm-actions-common-customize-hardware-virtual-hardware-reservation
-          v-model:reservation="reservation"
-          v-model:reservation-type="reservationType"
-          :error-validation-fields="props.errorValidationFields"
-          :disabled="props.isDisabled"
-          type="mhz"
-          component-type="cpu"
-          @invalid="emits('reservation-invalid', $event)"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-        <common-vm-actions-common-customize-hardware-virtual-hardware-limit
-          v-model:limit="limit"
-          v-model:limit-type="limitType"
-          :error-validation-fields="props.errorValidationFields"
-          :disabled="props.isDisabled"
-          type="mhz"
-          component-type="cpu"
-          @invalid="emits('limit-invalid', $event)"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-shares
-          v-model:shares="shares"
-          v-model:shares-type="sharesType"
-          :error-validation-fields="props.errorValidationFields"
-          :disabled="props.isDisabled"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-          @invalid="emits('shares-invalid', $event)"
-        />
-        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-hv-->
-        <!--          v-models:hardwareVirtualization="hardwareVirtualization"-->
-        <!--        />-->
-        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-pc-->
-        <!--          v-models:performanceCounters="performanceCounters"-->
-        <!--        />-->
-        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-sa-->
-        <!--          v-models:schedulingAffinity="schedulingAffinity"-->
-        <!--        />-->
-        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-iommu-->
-        <!--          v-models:iommu="iommu"-->
-        <!--        />-->
-        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-model
-          v-model:cpu-model="cpuModel"
-          v-model:passthrough-host-cpu="passthroughHostCpu"
-          v-model:host-model-cpu="hostModelCpu"
-          :cpu-models="props.cpuModels"
-          :is-edit="props.isEdit"
-          :error-validation-fields="props.errorValidationFields"
-          :disabled="props.isDisabled"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-      </template>
-    </ui-stack-block>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-const selectedCpu = defineModel<number>('selectedCpu', { required: true })
-const selectedCorePerSocket = defineModel<number>('selectedCorePerSocket', {
-  required: true,
-})
-const enableCpuHotAdd = defineModel<boolean>('enableCpuHotAdd', {
-  required: true,
-})
-const selectedMaxCpu = defineModel<number>('selectedMaxCpu', {
-  required: true,
-})
-const reservation = defineModel<string>('reservation', { required: true })
-const reservationType = defineModel<string>('reservationType', {
-  required: true,
-})
-const limit = defineModel<string>('limit', { required: true })
-const limitType = defineModel<string>('limitType', { required: true })
-const shares = defineModel<string>('shares', { required: true })
-const sharesType = defineModel<string>('sharesType', { required: true })
-const cpuModel = defineModel<string>('cpuModel', { required: true })
-const passthroughHostCpu = defineModel<boolean>('passthroughHostCpu', {
-  required: true,
-})
-const hostModelCpu = defineModel<boolean>('hostModelCpu', { required: true })
-
-const props = defineProps<{
-  maxCpus: number
-  cpuModels: UI_I_OptionItem[]
-  isEdit: boolean
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
-  cpuInvalid: boolean
-  vcpusLocalAndApiErrorsTexts: string
-  cpuOptions: UI_I_OptionItem[]
-  isCpuDisabled: boolean
-  selectedCpus: number[]
-  isDisabled: boolean
-  enableCpuHotAddDisabled: boolean
-  maxCpuOptions: UI_I_OptionItem[]
-  vmCpuHelpTextSecond?: string
-}>()
-const emits = defineEmits<{
-  (event: 'remove-error-by-title', value: string): void
-  (event: 'remove-validation-error'): void
-  (event: 'max-cpu-invalid', value: boolean): void
-  (event: 'reservation-invalid', value: boolean): void
-  (event: 'limit-invalid', value: boolean): void
-  (event: 'shares-invalid', value: boolean): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style scoped lang="scss">
-:deep(.ui-main-select-toggle) {
-  display: flex;
-  justify-content: space-between;
-  width: 108px;
-}
-//:deep(.cpu-select .ui-main-select-toggle) {
-//  background-color: #ffffff;
-//}
-.light-theme {
-  :deep(.ui-main-select-toggle) {
-    background-color: #ffffff;
-  }
-}
-
-:deep(.unit .ui-main-select-toggle) {
-  width: 80px;
-}
-</style>
+<template>
+  <div class="hardware-cpu">
+    <ui-stack-block
+      :has-children="true"
+      test-id="cpu-stack-block"
+      is-toggle-on-stack-view-key
+    >
+      <template #stackBlockKey>
+        <div
+          id="vm-wizard-toggle-block-cpu"
+          data-id="vm-wizard-toggle-block-cpu"
+          class="flex-align-center"
+        >
+          <span class="title">{{ localization.common.cpu }}</span>
+          <ui-icon
+            v-show="props.cpuInvalid"
+            width="18px"
+            height="18px"
+            name="error-outline"
+            class="ml-2"
+          />
+        </div>
+      </template>
+      <template #stackBlockContent>
+        <div class="flex-align-center flex-space-between">
+          <ui-combobox
+            v-model.number="selectedCpu"
+            :items="props.cpuOptions"
+            :disabled="props.isCpuDisabled"
+            :error-text="props.vcpusLocalAndApiErrorsTexts"
+            class="cpu-select"
+            test-id="vm-wizard-cpu-combobox"
+            size="sm"
+            width="auto"
+          />
+
+          <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-tooltip
+            :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
+          />
+        </div>
+      </template>
+      <template #stackChildren>
+        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-cores-per-socket
+          v-model:selected-core-per-socket="selectedCorePerSocket"
+          :selected-cpus="props.selectedCpus"
+          :cpu-options="props.cpuOptions"
+          :is-edit="props.isEdit"
+          :disabled="props.isDisabled"
+          :error-validation-fields="props.errorValidationFields"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-hot-plug
+          v-model:enable-cpu-hot-add="enableCpuHotAdd"
+          :disabled="props.enableCpuHotAddDisabled"
+        />
+        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-max-cpu
+          v-show="enableCpuHotAdd"
+          v-model:selected-max-cpu.number="selectedMaxCpu"
+          :cpu-options="props.maxCpuOptions"
+          :error-validation-fields="props.errorValidationFields"
+          :disabled="props.isDisabled"
+          @invalid="emits('max-cpu-invalid', $event)"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+        <common-vm-actions-common-customize-hardware-virtual-hardware-reservation
+          v-model:reservation="reservation"
+          v-model:reservation-type="reservationType"
+          :error-validation-fields="props.errorValidationFields"
+          :disabled="props.isDisabled"
+          type="mhz"
+          component-type="cpu"
+          @invalid="emits('reservation-invalid', $event)"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+        <common-vm-actions-common-customize-hardware-virtual-hardware-limit
+          v-model:limit="limit"
+          v-model:limit-type="limitType"
+          :error-validation-fields="props.errorValidationFields"
+          :disabled="props.isDisabled"
+          type="mhz"
+          component-type="cpu"
+          @invalid="emits('limit-invalid', $event)"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-shares
+          v-model:shares="shares"
+          v-model:shares-type="sharesType"
+          :error-validation-fields="props.errorValidationFields"
+          :disabled="props.isDisabled"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+          @invalid="emits('shares-invalid', $event)"
+        />
+        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-hv-->
+        <!--          v-models:hardwareVirtualization="hardwareVirtualization"-->
+        <!--        />-->
+        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-pc-->
+        <!--          v-models:performanceCounters="performanceCounters"-->
+        <!--        />-->
+        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-sa-->
+        <!--          v-models:schedulingAffinity="schedulingAffinity"-->
+        <!--        />-->
+        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-iommu-->
+        <!--          v-models:iommu="iommu"-->
+        <!--        />-->
+        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-model
+          v-model:cpu-model="cpuModel"
+          v-model:passthrough-host-cpu="passthroughHostCpu"
+          v-model:host-model-cpu="hostModelCpu"
+          :cpu-models="props.cpuModels"
+          :is-edit="props.isEdit"
+          :error-validation-fields="props.errorValidationFields"
+          :disabled="props.isDisabled"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+      </template>
+    </ui-stack-block>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const selectedCpu = defineModel<number>('selectedCpu', { required: true })
+const selectedCorePerSocket = defineModel<number>('selectedCorePerSocket', {
+  required: true,
+})
+const enableCpuHotAdd = defineModel<boolean>('enableCpuHotAdd', {
+  required: true,
+})
+const selectedMaxCpu = defineModel<number>('selectedMaxCpu', {
+  required: true,
+})
+const reservation = defineModel<string>('reservation', { required: true })
+const reservationType = defineModel<string>('reservationType', {
+  required: true,
+})
+const limit = defineModel<string>('limit', { required: true })
+const limitType = defineModel<string>('limitType', { required: true })
+const shares = defineModel<string>('shares', { required: true })
+const sharesType = defineModel<string>('sharesType', { required: true })
+const cpuModel = defineModel<string>('cpuModel', { required: true })
+const passthroughHostCpu = defineModel<boolean>('passthroughHostCpu', {
+  required: true,
+})
+const hostModelCpu = defineModel<boolean>('hostModelCpu', { required: true })
+
+const props = defineProps<{
+  maxCpus: number
+  cpuModels: UI_I_OptionItem[]
+  isEdit: boolean
+  errorValidationFields: UI_I_ErrorValidationField<string>[]
+  cpuInvalid: boolean
+  vcpusLocalAndApiErrorsTexts: string
+  cpuOptions: UI_I_OptionItem[]
+  isCpuDisabled: boolean
+  selectedCpus: number[]
+  isDisabled: boolean
+  enableCpuHotAddDisabled: boolean
+  maxCpuOptions: UI_I_OptionItem[]
+  vmCpuHelpTextSecond?: string
+}>()
+const emits = defineEmits<{
+  (event: 'remove-error-by-title', value: string): void
+  (event: 'remove-validation-error'): void
+  (event: 'max-cpu-invalid', value: boolean): void
+  (event: 'reservation-invalid', value: boolean): void
+  (event: 'limit-invalid', value: boolean): void
+  (event: 'shares-invalid', value: boolean): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style scoped lang="scss">
+:deep(.ui-main-select-toggle) {
+  display: flex;
+  justify-content: space-between;
+  width: 108px;
+}
+//:deep(.cpu-select .ui-main-select-toggle) {
+//  background-color: #ffffff;
+//}
+.light-theme {
+  :deep(.ui-main-select-toggle) {
+    background-color: #ffffff;
+  }
+}
+
+:deep(.unit .ui-main-select-toggle) {
+  width: 80px;
+}
+</style>