bfg-common 1.5.752 → 1.5.753

package/components/common/layout/theHeader/feedback/new/email/Email.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script setup lang="ts">
-import { RegExp } from '~/lib/config/regExp'
+import { allRegExp } from '~/lib/config/regExp'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const emailModelLocal = defineModel<string>({ required: true })
@@ -23,7 +23,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const emailErrorText = computed<string>(() => {
   if (!emailModelLocal.value) return ''
 
-  return RegExp.email.test(emailModelLocal.value)
+  return allRegExp.email.test(emailModelLocal.value)
     ? ''
     : localization.value.common.emailErrorText
 })

package/components/common/layout/theHeader/userMenu/modals/changePassword/lib/utils.ts

@@ -1,5 +1,5 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { RegExp } from '~/lib/config/regExp'
+import { allRegExp } from '~/lib/config/regExp'
 
 export const getPasswordMismatchError = (
   localization: UI_I_Localization,
@@ -16,7 +16,7 @@ export const validateField = (
   password: string,
   newPassword: string
 ): string => {
-  if (!RegExp.password.test(newPassword)) {
+  if (!allRegExp.password.test(newPassword)) {
     return localization.common.currentPasswordIncorrect
   }
 

package/components/common/pages/backups/modals/createBackup/configuration/backupWindow/BackupWindow.vue

@@ -1,29 +1,29 @@
-<template>
-  <atoms-stack-block
-      :has-children="false"
-      test-id="backup-window-stack-block"
-  >
-    <template #stackBlockKey>
-      <span>{{ localization.common.backupWindow }}</span>
-    </template>
-    <template #stackBlockContent>
-      <input
-        v-model="model.start_window_min"
-        data-id="hours-input"
-        type="number"
-        class="hrs"
-      />
-    </template>
-  </atoms-stack-block>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <atoms-stack-block
+      :has-children="false"
+      test-id="backup-window-stack-block"
+  >
+    <template #stackBlockKey>
+      <span>{{ localization.common.backupWindow }}</span>
+    </template>
+    <template #stackBlockContent>
+      <input
+        v-model="model.start_window_min"
+        data-id="hours-input"
+        type="number"
+        class="hrs"
+      />
+    </template>
+  </atoms-stack-block>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/MaxBandwidth.vue

@@ -1,69 +1,69 @@
-<template>
-  <atoms-stack-block
-      :has-children="false"
-      test-id="backup-max-bandwidth-stack-block"
-  >
-    <template #stackBlockKey>
-      <span>{{ localization.common.maxBandwidth }}</span>
-    </template>
-    <template #stackBlockContent>
-      <div class="flex-align-center">
-        <input
-          v-model="maxBindwidthLocal"
-          data-id="mbps-input"
-          type="number"
-          class="mbps"
-        />
-
-        <common-select-input
-          v-model="selectedType"
-          :data="maxBandwidthOptionsLocal"
-          test-id="backup-max-bandwidth-type"
-          class="ml-1"
-        />
-      </div>
-    </template>
-  </atoms-stack-block>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_T_BandwidthOption } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/models/types'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-import { maxBandwidthOptions } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options'
-
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $binary }: any = useNuxtApp()
-
-const maxBandwidthOptionsLocal =
-  ref<UI_I_SelectInputItem[]>(maxBandwidthOptions)
-
-const maxBindwidthLocal = computed<number>({
-  get() {
-    return selectedType.value === 1
-      ? $binary.bToGb(model.value.bandwidth_limit)
-      : $binary.bToMb(model.value.bandwidth_limit)
-  },
-  set(newValue: number) {
-    model.value.bandwidth_limit =
-      selectedType.value === 1
-        ? $binary.gbToB(newValue)
-        : $binary.mbToB(newValue)
-  },
-})
-
-const selectedType = ref<UI_T_BandwidthOption>(0)
-watch(selectedType, (newValue) => {
-  if (newValue === 1) model.value.bandwidth_limit *= 1_024
-  else model.value.bandwidth_limit /= 1_024
-})
-</script>
-
-<style lang="scss" scoped>
-#backup-transaction-logs {
-  margin: 4px 4px 0 0;
-}
-</style>
+<template>
+  <atoms-stack-block
+      :has-children="false"
+      test-id="backup-max-bandwidth-stack-block"
+  >
+    <template #stackBlockKey>
+      <span>{{ localization.common.maxBandwidth }}</span>
+    </template>
+    <template #stackBlockContent>
+      <div class="flex-align-center">
+        <input
+          v-model="maxBindwidthLocal"
+          data-id="mbps-input"
+          type="number"
+          class="mbps"
+        />
+
+        <common-select-input
+          v-model="selectedType"
+          :data="maxBandwidthOptionsLocal"
+          test-id="backup-max-bandwidth-type"
+          class="ml-1"
+        />
+      </div>
+    </template>
+  </atoms-stack-block>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_T_BandwidthOption } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/models/types'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+import { maxBandwidthOptions } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options'
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $binary }: any = useNuxtApp()
+
+const maxBandwidthOptionsLocal =
+  ref<UI_I_SelectInputItem[]>(maxBandwidthOptions)
+
+const maxBindwidthLocal = computed<number>({
+  get() {
+    return selectedType.value === 1
+      ? $binary.bToGb(model.value.bandwidth_limit)
+      : $binary.bToMb(model.value.bandwidth_limit)
+  },
+  set(newValue: number) {
+    model.value.bandwidth_limit =
+      selectedType.value === 1
+        ? $binary.gbToB(newValue)
+        : $binary.mbToB(newValue)
+  },
+})
+
+const selectedType = ref<UI_T_BandwidthOption>(0)
+watch(selectedType, (newValue) => {
+  if (newValue === 1) model.value.bandwidth_limit *= 1_024
+  else model.value.bandwidth_limit /= 1_024
+})
+</script>
+
+<style lang="scss" scoped>
+#backup-transaction-logs {
+  margin: 4px 4px 0 0;
+}
+</style>

package/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options.ts

@@ -1,6 +1,6 @@
-import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
-
-export const maxBandwidthOptions: UI_I_SelectInputItem[] = [
-  { label: 'Mbps', value: 0 },
-  { label: 'Gbps', value: 1 },
-]
+import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
+
+export const maxBandwidthOptions: UI_I_SelectInputItem[] = [
+  { label: 'Mbps', value: 0 },
+  { label: 'Gbps', value: 1 },
+]

package/components/common/pages/backups/modals/createBackup/configuration/strategy/Strategy.vue

@@ -1,38 +1,38 @@
-<template>
-  <atoms-stack-block
-      :has-children="false"
-      test-id="backup-strategy-stack-block"
-  >
-    <template #stackBlockKey>
-      <span>{{ localization.common.strategy }}</span>
-    </template>
-    <template #stackBlockContent>
-      <common-select-input
-        v-model="model.strategy"
-        :data="strategyOptions"
-        test-id="backup-strategy"
-      />
-    </template>
-  </atoms-stack-block>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
-
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const strategyOptions = ref<UI_I_SelectInputItem[]>(
-  strategyOptionsFunc(localization.value)
-)
-</script>
-
-<style lang="scss" scoped>
-#backup-transaction-logs {
-  margin: 4px 4px 0 0;
-}
-</style>
+<template>
+  <atoms-stack-block
+      :has-children="false"
+      test-id="backup-strategy-stack-block"
+  >
+    <template #stackBlockKey>
+      <span>{{ localization.common.strategy }}</span>
+    </template>
+    <template #stackBlockContent>
+      <common-select-input
+        v-model="model.strategy"
+        :data="strategyOptions"
+        test-id="backup-strategy"
+      />
+    </template>
+  </atoms-stack-block>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const strategyOptions = ref<UI_I_SelectInputItem[]>(
+  strategyOptionsFunc(localization.value)
+)
+</script>
+
+<style lang="scss" scoped>
+#backup-transaction-logs {
+  margin: 4px 4px 0 0;
+}
+</style>

package/components/common/pages/backups/modals/createBackup/lib/models/interfaces.ts

@@ -1,8 +1,8 @@
-export interface UI_I_DynamicSteps {
-  general: number
-  disks: number
-  datastores: number
-  configuration: number
-  readyComplete: number
-  schedulingOptions: number
-}
+export interface UI_I_DynamicSteps {
+  general: number
+  disks: number
+  datastores: number
+  configuration: number
+  readyComplete: number
+  schedulingOptions: number
+}

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

@@ -290,7 +290,7 @@
         <common-vm-actions-common-customize-hardware-virtual-hardware-other />
         <div
           v-if="props.compatibilityInfo"
-          class="vm-hardware-version-wrap justify-end flex flex-1 mt-4"
+          class="vm-hardware-version-wrap justify-end flex flex-1 mt-1"
         >
           <span class="vm-hardware-version">
             {{ props.compatibilityInfo }}

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

@@ -557,6 +557,7 @@ const addPciDevice = (): void => {
   pciDevicesType.value.push('new')
 
   // pciDevicesLocal.value.push(useDeepCopy(defaultPciDevice))
+  if (!model.value.passthrough_pci_devices) model.value.passthrough_pci_devices = []
   model.value.passthrough_pci_devices.push(useDeepCopy(defaultPciDevice))
 }
 const onRemovePciDevice = (index: number): void => {

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

@@ -27,7 +27,7 @@
       :state="props.state"
       @remove-error-by-title="emits('remove-error-by-title', $event)"
     />
-    <div class="vm-hardware-version-wrap justify-end flex flex-1 mt-4">
+    <div class="vm-hardware-version-wrap justify-end flex flex-1 mt-1">
       <span class="vm-hardware-version">
         {{ props.compatibilityInfo }}
       </span>
@@ -73,7 +73,7 @@ const emits = defineEmits<{
   flex-direction: column;
   gap: 12px;
   margin-top: 20px;
-  padding: 0 0 12px;
+  padding: 0 0 16px;
   overflow: auto;
 
   .vm-hardware-version-wrap {

package/components/common/vm/snapshots/modals/confirm/New.vue

@@ -118,6 +118,11 @@ const descriptionText = computed<string>(() => {
 
   .confirm-modal-checkbox {
     height: max-content;
+
+    :deep(.ui-checkbox-label-text) {
+      line-height: 18px;
+      margin-top: 1px;
+    }
   }
 }
 </style>

package/components/common/vm/snapshots/modals/confirm/lib/models/enums.ts

@@ -11,8 +11,8 @@ export enum UI_E_TitleConfirmModal {
 export enum UI_E_TitleModal {
   'take' = '',
   'edit' = '',
-  'revert' = 'revertToSnapshotConfirmation',
-  'delete' = 'deleteSnapshotConfirmation',
+  'revert' = 'revertToSnapshot',
+  'delete' = 'deleteSnapshot',
   'delete_all' = 'deleteAllSnapshots',
   'group_delete_all' = 'deleteAllSnapshots',
   'group_take' = '',

package/components/common/vm/snapshots/modals/takeOrEdit/new/New.vue

@@ -45,7 +45,7 @@
           :label="localization.common.name"
           :error="nameError"
           test-id="vm-take-edit-snapshot-modal-name-input"
-          class="form__input mb-6"
+          class="mb-6"
           input-style="rounded"
           size="md"
           @change="onCheckNameValidation"
@@ -57,6 +57,7 @@
           test-id="vm-take-edit-snapshot-modal-name-input"
           height="84"
           size="sm"
+          class="vm-take-edit-textarea"
         />
 
         <div v-if="props.type === 'take'" class="mt-6">
@@ -64,7 +65,7 @@
             v-model="isIncludeVirtualMachinesMemory"
             :label-text="localization.snapshots.saveVirtualMachineMemory"
             :disabled="props.isDisabledSaveVm"
-            class="mb-3 flex items-start"
+            class="mb-3 flex items-start bottom-checkbox"
             test-id="vm-take-edit-snapshot-modal-save-memory-checkbox"
             size="md"
           />
@@ -73,7 +74,7 @@
             :label-text="
               localization.common.quiesceGuestFileSystemRequiresVMTools
             "
-            class="flex items-start"
+            class="flex items-start bottom-checkbox"
             test-id="vm-take-edit-snapshot-modal-quiesce-guest-file-system-checkbox"
             size="md"
             disabled
@@ -129,8 +130,8 @@ const alertMessages = ref<string[]>([])
 const title = computed<string>(() => {
   let titleType =
     props.type === 'take'
-      ? localization.value.common.takeSnapshot
-      : localization.value.common.editSnapshot
+      ? localization.value.snapshots.newSnapshot
+      : localization.value.snapshots.editSnapshot
 
   titleType = titleType.replace('snapshot', 'Snapshot')
 
@@ -158,11 +159,26 @@ const onSubmit = (): void => {
     alertMessages.value = [
       localization.value.common.nameAlreadyExists.replace('{0}', name),
     ]
-    nameError.value = ' ' // Чтобы поле отображало рамку ошибки
+    nameError.value = ' '
     return
   }
   emits('submit')
 }
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.vm-take-edit-textarea {
+  :deep(.ui-main .ui-main-textarea) {
+    line-height: 18px;
+    height: 72px !important;
+  }
+}
+.bottom-checkbox {
+  height: unset !important;
+
+  :deep(.ui-checkbox-label-text) {
+    line-height: 18px;
+    margin-top: 1px;
+  }
+}
+</style>