bfg-common 1.6.47 → 1.6.49

package/components/common/vm/actions/add/New.vue

@@ -55,13 +55,13 @@
           <div ref="subTitleBlockName">
             <div class="subtitle-block">
               <div
-                id="name-alert-wrapper"
-                :class="[{ 'mb-4': !isNameAlertWrapperEmpty }]"
+                  id="name-alert-wrapper"
+                  :class="[{ 'mb-4': !isNameAlertWrapperEmpty }]"
               ></div>
               <ui-wizard-subtitle
-                :sub-title="
-                  localization.vmWizard.specifyUniqueNameAndTargetLocationForVm
-                "
+                  :sub-title="
+                localization.vmWizard.specifyUniqueNameAndTargetLocationForVm
+              "
               />
             </div>
           </div>
@@ -153,8 +153,7 @@
             :datastore="props.datastore"
             :is-datastore-loading="props.isDatastoreLoading"
             :get-datastore-table-func="props.getDatastoreTableFunc"
-            :storage="storageLocal"
-            @change-storage="setSelectedStorageIdLocal"
+            :storage="props.vmtSettings?.storage"
             @submit="emits('change-storage', $event)"
             @has-errors="isStorageAlertWrapperEmpty = $event"
           />
@@ -594,20 +593,6 @@ const isNameAlertWrapperEmpty = ref<boolean>(false)
 // const isComputeResourceAlertWrapperEmpty = ref<boolean>(false)
 const isStorageAlertWrapperEmpty = ref<boolean>(false)
 const isCompatibilityAlertWrapperEmpty = ref<boolean>(false)
-
-const storageLocal = computed<UI_I_DatastoreTableItem | undefined>(() => {
-  return selectedStorageLocal.value ?? props.vmtSettings?.storage
-})
-
-/* TODO: В дальнейшем необходимо вынести все данные наружу и передавать его через v-model */
-// рефакторинг. При возврате на шаг выбора хранилища ранее выбранное хранилище не отображается как выбранное.
-// Для хранилища в v-model необходимо сохранять ID хранилища, а не ключ индекса.
-const selectedStorageLocal = ref<UI_I_DatastoreTableItem | null>(null)
-const setSelectedStorageIdLocal = (datastore: UI_I_DatastoreTableItem) => {
-  selectedStorageLocal.value = {
-    id: datastore.id,
-  } as UI_I_DatastoreTableItem
-}
 </script>
 
 <style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/Media.vue

@@ -1,7 +1,7 @@
 <template>
   <component
     :is="currentComponent"
-    v-model:cd-dvd-media="localCdDvdMedia"
+    v-model:cd-dvd-media="cdDvdMedia"
     :index="props.index"
     @browse="emits('browse')"
   />
@@ -24,19 +24,6 @@ const currentComponent = computed(() =>
     ? defineAsyncComponent(() => import('./New.vue'))
     : defineAsyncComponent(() => import('./Old.vue'))
 )
-
-const localCdDvdMedia = ref<string>('')
-
-watch(cdDvdMedia, (newValue) => {
-  localCdDvdMedia.value = newValue.replace(/^([^:]+):\//, '[$1]:/')
-}, { immediate: true })
-
-watch(localCdDvdMedia, (newValue) => {
-  const cleaned = newValue.replace(/^\[([^\]]+)\]:\//, '$1:/')
-  if (cleaned !== cdDvdMedia.value) {
-    cdDvdMedia.value = cleaned
-  }
-})
 </script>
 
 <style scoped></style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/New.vue

@@ -56,11 +56,6 @@ const emits = defineEmits<{
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-
-onMounted(() => {
-  const cdDvdMediaInputElement = document.getElementById('vm-wizard-dvd-media-input')
-  cdDvdMediaInputElement?.classList.remove('text-ellipsis')
-})
 </script>
 
 <style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/Old.vue

@@ -12,7 +12,6 @@
           <input
             id="vm-wizard-dvd-media-input"
             v-model="cdDvdMedia"
-            :title="cdDvdMedia"
             data-id="vm-wizard-dvd-media-input"
             type="text"
             disabled

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

@@ -242,7 +242,6 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 .cpu-info-block {
   :deep(.help-text) {
     margin-bottom: 12px;
-    color: var(--stack-block-text-color);
   }
   :deep(.cpu-more-info) {
     font-size: 13px;

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue

@@ -315,7 +315,8 @@ const isDisabledMode = computed<boolean>(() => {
 })
 const isDisabledCache = computed<boolean>(() => {
   if (isNewHardDisk.value) return false
-  return props.isEdit || isRunning.value
+  // return props.isEdit || isRunning.value
+  return isRunning.value
 })
 const isDisabledBus = computed<boolean>(() => {
   return !isNewHardDisk.value && isRunning.value

package/components/common/vm/actions/common/customizeHardware/virtualHardware/reservation/New.vue

@@ -106,8 +106,6 @@ const onSelectReservation = (value: number): void => {
 
   .ui-checkbox-label {
     min-height: unset !important;
-    height: max-content;
-    word-break: break-word;
   }
 }
 </style>

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

@@ -9,7 +9,9 @@ import type { UI_I_StatusData } from '~/components/common/vm/actions/common/sele
 import { datastoreLocalizationByState } from '~/components/common/lib/config/states'
 import { getStatus } from '~/components/common/vm/actions/common/select/storage/new/lib/utils/utils'
 
-export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable => ({
+export const tableDataFunc = (
+  localization: UI_I_Localization
+): UI_I_DataTable => ({
   id: 'select-storage',
   header: [
     {
@@ -29,7 +31,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.inventorySummary.state,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '160px',
       show: true,
       filter: true,
@@ -40,7 +42,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.capacity,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '150px',
       show: true,
       filter: true,
@@ -51,7 +53,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.provisioned,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '150px',
       show: true,
       filter: true,
@@ -62,7 +64,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.free,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '150px',
       show: true,
       filter: true,
@@ -73,7 +75,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.used,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '150px',
       show: true,
       filter: true,
@@ -84,7 +86,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.type,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '120px',
       show: true,
       filter: true,
@@ -95,7 +97,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.thinProvisioning,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '160px',
       show: true,
       filter: true,
@@ -106,7 +108,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.access,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '120px',
       show: true,
       filter: true,
@@ -117,7 +119,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.hardwareAcceleration,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '200px',
       show: true,
       filter: true,
@@ -128,7 +130,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.driverType,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '150px',
       show: true,
       filter: true,
@@ -139,7 +141,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.device,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '150px',
       show: true,
       filter: true,
@@ -150,7 +152,7 @@ export const tableDataFunc = (localization: UI_I_Localization): UI_I_DataTable =
       text: localization.common.storageIoControl,
       isSortable: false,
       sort: 'asc',
-      sortColumn: false,
+      sortColumn: true,
       width: '180px',
       show: true,
       filter: true,

package/components/common/vm/actions/confirm/Confirm.vue

@@ -4,7 +4,6 @@
     :sub-title="props.subTitle"
     :description="props.description"
     :modal-texts="props.modalTexts"
-    :loading="props.isLoading"
     @hide-modal="emits('hide')"
     @confirm="emits('confirm')"
   >
@@ -23,11 +22,9 @@ const props = withDefaults(
     subTitle: string
     description: string
     modalTexts?: UI_I_ModalTexts
-    isLoading?: boolean
   }>(),
   {
     modalTexts: undefined,
-    isLoading: false
   }
 )
 

package/components/common/vm/snapshots/DetailView.vue

@@ -7,13 +7,13 @@
     >
       <tbody>
         <tr>
-          <td class="left" data-id="vm-snapshot-name-label">{{ localization.common.name }}</td>
+          <td class="left">{{ localization.common.name }}</td>
           <td class="left snapshot-name-label" data-id="vm-snapshot-name">
             {{ detailData.name }}
           </td>
         </tr>
         <tr>
-          <td class="left" data-id="vm-snapshot-description-label">{{ localization.common.description }}</td>
+          <td class="left">{{ localization.common.description }}</td>
           <td
             class="left snapshot-name-label"
             data-id="vm-snapshot-description"
@@ -22,17 +22,17 @@
           </td>
         </tr>
         <tr>
-          <td class="left" data-id="vm-snapshot-timestamp-label">{{ localization.snapshots.timestamp }}</td>
+          <td class="left">{{ localization.snapshots.timestamp }}</td>
           <td class="left snapshot-name-label" data-id="vm-snapshot-timestamp">
             {{ detailData.timestamp }}
           </td>
         </tr>
         <tr>
-          <td class="left" data-id="vm-snapshot-size-label">{{ localization.common.size }}</td>
+          <td class="left">{{ localization.common.size }}</td>
           <td class="left snapshot-name-label">{{ detailData.size }}</td>
         </tr>
         <tr>
-          <td class="left" data-id="vm-snapshot-of-memory-label">
+          <td class="left">
             {{ localization.common.snapshotTheVirtualMachinesMemory }}
           </td>
           <td class="left snapshot-name-label" data-id="vm-snapshot-of-memory">
@@ -40,7 +40,7 @@
           </td>
         </tr>
         <tr>
-          <td class="left" data-id="vm-snapshot-file-system-label">
+          <td class="left">
             {{ localization.common.quiesceGuestFileSystem }}
           </td>
           <td

package/components/common/wizards/datastore/add/New.vue

@@ -256,10 +256,4 @@ const onCreateDatastore = (): void => emits('submit')
     padding: 10px 12px;
   }
 }
-:deep(.ui-wizard-content-right-container) {
-  padding: 0 30px;
-}
-:deep(.ui-wizard-subtitle-container) + *, :deep(.ui-wizard-subtitle-container) {
-  padding-left: 2px;
-}
 </style>

package/components/common/wizards/datastore/add/lib/config/steps.ts

@@ -130,7 +130,7 @@ export const stepsFunc = (
   // },
   {
     id: dynamicSteps.readyComplete,
-    title: localization.vmWizard.readyComplete,
+    title: localization.common.readyComplete,
     subTitle: localization.common.readyCompleteDatastoreDesc,
     status: UI_E_WIZARD_STATUS.INACTIVE,
     fields: {},

package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDeviceNew.vue

@@ -179,7 +179,7 @@ const onSelectHost = (event: string): void => {
   display: flex;
   flex-direction: column;
   row-gap: 16px;
-  margin: 16px 0;
+  margin: 16px 0 16px 2px;
 
   &__alert {
     align-items: flex-start;

package/components/common/wizards/datastore/add/steps/nameAndDevice/advancedOptions/New.vue

@@ -3,7 +3,7 @@
     <ui-button
       variant="text"
       test-id="advanced-options-button"
-      class="advanced-options-btn"
+      class="advanced-options-btn btn btn-link"
       @click="isShowAdvancedOptions = !isShowAdvancedOptions"
     >
       <template #icon>

package/components/common/wizards/network/add/Add.vue

@@ -618,20 +618,9 @@ const finalValidationFunc = async (
     const stepId = wizard.getStepIdByFieldName(fieldName)
 
     if (stepId !== -1) {
-      let message = ''
-
-      if (validationFields[fieldName]) {
-        message = `${validationFields[
-          fieldName
-        ][0].toUpperCase()}${validationFields[fieldName].substring(1)}`
-
-        message =
-          message.charAt(message.length - 1) !== '.' ? message + '.' : message
-      }
-
       stepHasError = wizard.setValidation(stepId, fieldName, {
-        fieldMessage: message,
-        alertMessage: message,
+        fieldMessage: validationFields[fieldName],
+        alertMessage: validationFields[fieldName],
       })
     }
   }

package/components/common/wizards/network/add/AddNew.vue

@@ -44,21 +44,22 @@
         >
           <template #subTitle>
             <div ref="selectTargetDeviceBlock">
-              <div class="alert-block flex flex-col">
+              <div class="subtitle-block flex flex-col">
                 <template
                   v-for="(message, field, key) in selectedStep.fields"
                   :key="key"
                 >
                   <ui-alert
-                    v-if="!!message.alert"
                     :messages="[message.alert]"
                     test-id="select-target-device-alert"
+                    :class="{
+                      'mb-4':
+                        props.alertMessages[selectedStep.id].length - 1 === key,
+                    }"
                     size="md"
                     @hide="emits('hide-alert', selectedStep.id, field)"
                   />
                 </template>
-              </div>
-              <div class="subtitle-block flex flex-col">
                 <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
                 <ui-line margin="12px 0 0" />
               </div>
@@ -88,21 +89,22 @@
         >
           <template #subTitle>
             <div ref="createStandardSwitchBlock">
-              <div class="alert-block flex flex-col">
+              <div class="subtitle-block flex flex-col">
                 <template
                   v-for="(message, field, key) in selectedStep.fields"
                   :key="key"
                 >
                   <ui-alert
-                    v-if="!!message.alert"
                     :messages="[message.alert]"
                     test-id="create-standard-switch-alert"
+                    :class="{
+                      'mb-4':
+                        props.alertMessages[selectedStep.id].length - 1 === key,
+                    }"
                     size="md"
                     @hide="emits('hide-alert', selectedStep.id, field)"
                   />
                 </template>
-              </div>
-              <div class="subtitle-block flex flex-col">
                 <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
                 <ui-line margin="12px 0 0" />
               </div>
@@ -144,21 +146,22 @@
         >
           <template #subTitle>
             <div ref="portPropertiesBlock">
-              <div class="alert-block flex flex-col">
+              <div class="subtitle-block flex flex-col">
                 <template
                   v-for="(message, field, key) in selectedStep.fields"
                   :key="key"
                 >
                   <ui-alert
-                    v-if="!!message.alert"
                     :messages="[message.alert]"
                     test-id="port-properties-alert"
+                    :class="{
+                      'mb-4':
+                        props.alertMessages[selectedStep.id].length - 1 === key,
+                    }"
                     size="md"
                     @hide="emits('hide-alert', selectedStep.id, field)"
                   />
                 </template>
-              </div>
-              <div class="subtitle-block flex flex-col">
                 <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
                 <ui-line margin="12px 0 0" />
               </div>
@@ -187,21 +190,22 @@
         >
           <template #subTitle>
             <div ref="ipFourSettingsBlock">
-              <div class="alert-block flex flex-col">
+              <div class="subtitle-block flex flex-col">
                 <template
                   v-for="(message, field, key) in selectedStep.fields"
                   :key="key"
                 >
                   <ui-alert
-                    v-if="!!message.alert"
                     :messages="[message.alert]"
                     test-id="ip-four-settings-alert"
+                    :class="{
+                      'mb-4':
+                        props.alertMessages[selectedStep.id].length - 1 === key,
+                    }"
                     size="md"
                     @hide="emits('hide-alert', selectedStep.id, field)"
                   />
                 </template>
-              </div>
-              <div class="subtitle-block flex flex-col">
                 <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
                 <ui-line margin="12px 0 0" />
               </div>
@@ -229,21 +233,22 @@
         >
           <template #subTitle>
             <div ref="connectionSettingsBlock">
-              <div class="alert-block flex flex-col">
+              <div class="subtitle-block flex flex-col">
                 <template
                   v-for="(message, field, key) in selectedStep.fields"
                   :key="key"
                 >
                   <ui-alert
-                    v-if="!!message.alert"
                     :messages="[message.alert]"
                     test-id="connection-settings-alert"
+                    :class="{
+                      'mb-4':
+                        props.alertMessages[selectedStep.id].length - 1 === key,
+                    }"
                     size="md"
                     @hide="emits('hide-alert', selectedStep.id, field)"
                   />
                 </template>
-              </div>
-              <div class="subtitle-block flex flex-col">
                 <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
                 <ui-line margin="12px 0 0" />
               </div>
@@ -458,7 +463,6 @@ const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
   }
   :deep(.ui-wizard-content-with-subtitle) {
     padding-right: 0;
-    scrollbar-gutter: unset;
   }
 }
 
@@ -473,7 +477,7 @@ const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
 :deep(.ui-alert-item) {
   margin-bottom: 12px;
 
-  &:last-of-type {
+  &.mb-4 {
     margin-bottom: 16px;
   }
 }

package/components/common/wizards/network/add/lib/config/initialData.ts

@@ -37,7 +37,7 @@ export const portPropertiesInitial = (
   localization: UI_I_Localization
 ): UI_I_PortProperties => ({
   networkLabel: '',
-  vlanId: `${localization.common.none2} (0)`,
+  vlanId: `${localization.common.none} (0)`,
   mtu: {
     option: '0',
     size: 1500,
@@ -62,21 +62,19 @@ export const connectionSettingsInitial = (
   localization: UI_I_Localization
 ): UI_I_ConnectionSettings => ({
   networkLabel: 'VM Network',
-  vlanId: `${localization.common.none2} (0)`,
+  vlanId: `${localization.common.none} (0)`,
 })
 
 export const vlanIdSelectDataFunc = (
   localization: UI_I_Localization
 ): UI_I_VlanIdData[] => [
   {
-    text: `${localization.common.none2} (0)`,
-    value: `${localization.common.none2} (0)`,
-    testId: 'vlan-id-start'
+    text: `${localization.common.none} (0)`,
+    value: `${localization.common.none} (0)`,
   },
   {
     text: `${localization.common.all} (4095)`,
     value: `${localization.common.all} (4095)`,
-    testId: 'vlan-id-end'
   },
 ]
 

package/components/common/wizards/network/add/lib/config/steps.ts

@@ -145,7 +145,7 @@ export const stepsFunc = (
   },
   {
     id: 7,
-    title: localization.vmWizard.readyComplete,
+    title: localization.common.readyComplete,
     subTitle: localization.common.addNetworkingReadyCompleteSubtitle,
     status: UI_E_WIZARD_STATUS.INACTIVE,
     fields: {},

package/components/common/wizards/network/add/lib/models/interfaces.ts

@@ -177,7 +177,6 @@ export interface UI_I_AddNetworkingFourthOrFifthSchemeDataSend {
 export interface UI_I_VlanIdData {
   text: string
   value: string
-  testId?: string
 }
 
 export interface UI_I_NetworkValidation {

package/components/common/wizards/network/add/lib/utils/utils.ts

@@ -5,5 +5,5 @@ export const getVlanId = (
   localization: UI_I_Localization
 ): string =>
   (vlanId === `${localization.common.all} (4095)` && '4095') ||
-  (vlanId === `${localization.common.none2} (0)` && '0') ||
+  (vlanId === `${localization.common.none} (0)` && '0') ||
   vlanId

package/components/common/wizards/network/add/steps/connectionSettings/ConnectionSettingsOld.vue

@@ -18,7 +18,6 @@
               <fieldset>
                 <atoms-tooltip-error
                   :has-error="!!props.messagesFields.name.field"
-                  test-id="network-label-error"
                 >
                   <template #elem>
                     <input
@@ -73,10 +72,7 @@
                         class="is-error tooltip-trigger"
                         name="info"
                       />
-                      <div
-                        class="tooltip-top-left tooltip-content error"
-                        data-id="vlan-id-error"
-                      >
+                      <div class="tooltip-top-left tooltip-content error">
                         {{ props.messagesFields.vlan.field }}
                       </div>
                     </div>

package/components/common/wizards/network/add/steps/ipFourSettings/IpFourSettingsNew.vue

@@ -281,8 +281,14 @@ const fields = computed({
   }
 }
 :deep(.ui-checkbox-label) {
-  &.md {
-    height: unset;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+
+  .ui-checkbox-label-text {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
   }
 }
 .tooltip-text {

package/components/common/wizards/network/add/steps/ipFourSettings/IpFourSettingsOld.vue

@@ -53,7 +53,6 @@
                     :has-error="
                       !!props.messagesFields['ipv4_settings.ipv4'].field
                     "
-                    test-id="address-error"
                   >
                     <template #elem>
                       <input
@@ -89,7 +88,6 @@
                     :has-error="
                       !!props.messagesFields['ipv4_settings.mask'].field
                     "
-                    test-id="mask-error"
                   >
                     <template #elem>
                       <input
@@ -144,7 +142,6 @@
                       :has-error="
                         !!props.messagesFields['ipv4_settings.gateway'].field
                       "
-                      test-id="gateway-error"
                     >
                       <template #elem>
                         <input