bfg-common 1.3.374 → 1.3.376

package/components/common/vm/actions/common/customizeHardware/lib/config/navItems.ts

@@ -9,11 +9,13 @@ export const navItemsFunc = (
       text: localization.virtualHardware,
       value: 0,
       disabled: false,
+      testId: 'virtual-hardware'
     },
     {
       text: localization.vMOptions,
       value: 1,
       disabled: false,
+      testId: 'vm-options'
     },
   ]
 }

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptions.vue

@@ -1,110 +1,114 @@
-<template>
-  <div class="boot-options">
-    <atoms-stack-block :has-children="true">
-      <template #stackBlockKey>
-        <div id="vm-wizard-toggle-block-boot-option" class="flex-align-center">
-          <span>{{ localization.bootOptions }}</span>
-        </div>
-      </template>
-      <template #stackChildren>
-        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-firmware
-          v-model:firmware="firmware"
-          :error-validation-fields="props.errorValidationFields"
-          :is-edit="props.isEdit"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-secure
-          v-if="firmware === 'uefi'"
-          v-model:secure-boot="secureBoot"
-        />
-        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-menu
-          v-model:boot-menu="bootMenu"
-        />
-        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-delay
-          v-model:boot-delay="bootDelay"
-        />
-        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order
-          :hard-disks="props.hardDisks"
-          :cd-dvd-drives="props.cdDvdDrives"
-          :networks="props.networks"
-          @change="onChangeBootOrder"
-        />
-      </template>
-    </atoms-stack-block>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_SendDataBootOptions } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
-import {
-  UI_I_SendDataNewCdDvdDrive,
-  UI_I_SendDataNewHardDisk,
-  UI_I_SendDataNewNetwork,
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/models/types'
-
-const emits = defineEmits<{
-  (
-    event: 'change-boot-order',
-    value: [
-      UI_I_SendDataNewHardDisk[],
-      UI_I_SendDataNewCdDvdDrive[],
-      UI_I_SendDataNewNetwork[]
-    ]
-  ): void
-  (event: 'send-data', value: UI_I_SendDataBootOptions): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  errorValidationFields: UI_I_ErrorValidationField[]
-  hardDisks: UI_I_SendDataNewHardDisk[] | null
-  cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
-  networks: UI_I_SendDataNewNetwork[] | null
-  bootOptions?: UI_I_SendDataBootOptions
-  isEdit: boolean
-}>()
-
-const firmware = ref<string>('efi')
-
-const secureBoot = ref<boolean>(true)
-
-const bootMenu = ref<boolean>(true)
-
-const bootDelay = ref<number>(1000)
-
-const onChangeBootOrder = (data: UI_T_ChangeBootOrder): void => {
-  emits('change-boot-order', data)
-}
-
-watch(
-  [firmware, secureBoot, bootMenu, bootDelay],
-  () => {
-    emits('send-data', {
-      firmware: firmware.value,
-      boot_delay_ms: bootDelay.value,
-      boot_menu: bootMenu.value,
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.bootOptions,
-  (newValue) => {
-    if (!newValue || !props.bootOptions) return
-
-    firmware.value = props.bootOptions.firmware
-    bootDelay.value = props.bootOptions.boot_delay_ms
-    bootMenu.value = props.bootOptions.boot_menu
-  },
-  { immediate: true }
-)
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <div class="boot-options">
+    <atoms-stack-block :has-children="true">
+      <template #stackBlockKey>
+        <div
+          id="vm-wizard-toggle-block-boot-option"
+          data-id="vm-wizard-toggle-block-boot-option"
+          class="flex-align-center"
+        >
+          <span>{{ localization.bootOptions }}</span>
+        </div>
+      </template>
+      <template #stackChildren>
+        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-firmware
+          v-model:firmware="firmware"
+          :error-validation-fields="props.errorValidationFields"
+          :is-edit="props.isEdit"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-secure
+          v-if="firmware === 'uefi'"
+          v-model:secure-boot="secureBoot"
+        />
+        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-menu
+          v-model:boot-menu="bootMenu"
+        />
+        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-delay
+          v-model:boot-delay="bootDelay"
+        />
+        <common-vm-actions-common-customize-hardware-vmoptions-boot-options-order
+          :hard-disks="props.hardDisks"
+          :cd-dvd-drives="props.cdDvdDrives"
+          :networks="props.networks"
+          @change="onChangeBootOrder"
+        />
+      </template>
+    </atoms-stack-block>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_SendDataBootOptions } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
+import {
+  UI_I_SendDataNewCdDvdDrive,
+  UI_I_SendDataNewHardDisk,
+  UI_I_SendDataNewNetwork,
+} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import { UI_T_ChangeBootOrder } from '~/components/common/vm/actions/lib/models/types'
+
+const emits = defineEmits<{
+  (
+    event: 'change-boot-order',
+    value: [
+      UI_I_SendDataNewHardDisk[],
+      UI_I_SendDataNewCdDvdDrive[],
+      UI_I_SendDataNewNetwork[]
+    ]
+  ): void
+  (event: 'send-data', value: UI_I_SendDataBootOptions): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const props = defineProps<{
+  errorValidationFields: UI_I_ErrorValidationField[]
+  hardDisks: UI_I_SendDataNewHardDisk[] | null
+  cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
+  networks: UI_I_SendDataNewNetwork[] | null
+  bootOptions?: UI_I_SendDataBootOptions
+  isEdit: boolean
+}>()
+
+const firmware = ref<string>('efi')
+
+const secureBoot = ref<boolean>(true)
+
+const bootMenu = ref<boolean>(true)
+
+const bootDelay = ref<number>(1000)
+
+const onChangeBootOrder = (data: UI_T_ChangeBootOrder): void => {
+  emits('change-boot-order', data)
+}
+
+watch(
+  [firmware, secureBoot, bootMenu, bootDelay],
+  () => {
+    emits('send-data', {
+      firmware: firmware.value,
+      boot_delay_ms: bootDelay.value,
+      boot_menu: bootMenu.value,
+    })
+  },
+  { immediate: true }
+)
+
+// Добавляем данные для редактирования
+watch(
+  () => props.bootOptions,
+  (newValue) => {
+    if (!newValue || !props.bootOptions) return
+
+    firmware.value = props.bootOptions.firmware
+    bootDelay.value = props.bootOptions.boot_delay_ms
+    bootMenu.value = props.bootOptions.boot_menu
+  },
+  { immediate: true }
+)
+</script>
+
+<style scoped lang="scss"></style>

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

@@ -1,184 +1,188 @@
-<template>
-  <div class="general-options">
-    <atoms-stack-block :has-children="true" @toggle="blockIsOpen = $event">
-      <template #stackBlockKey>
-        <div class="flex-align-center">
-          <span>{{ localization.generalOptions }}</span>
-        </div>
-      </template>
-      <template #stackBlockContent>
-        <div v-show="!blockIsOpen">
-          {{ localization.vmName }}: {{ vmNameLocal }}
-        </div>
-      </template>
-      <template #stackChildren>
-        <atoms-stack-block :has-children="false">
-          <template #stackBlockKey>
-            {{ localization.vmName }}
-          </template>
-          <template #stackBlockContent>
-            <span>{{ vmNameLocal }}</span>
-            <!--            <span v-if="!props.isEdit">{{ vmNameLocal }}</span>-->
-            <!--            <input-->
-            <!--              v-else-->
-            <!--              id="general-option-vm-name"-->
-            <!--              v-models="vmNameLocal"-->
-            <!--              type="text"-->
-            <!--            />-->
-          </template>
-        </atoms-stack-block>
-
-        <atoms-stack-block :has-children="false">
-          <template #stackBlockKey>
-            {{ localization.machineType }}
-          </template>
-          <template #stackBlockContent>
-            <select
-              v-if="props.guestMachineType"
-              id="guest-machine-type-select"
-              v-model="guestMachineTypeLocal"
-              :disabled="isDisabled"
-              data-id="guest-machine-type-select"
-            >
-              <option
-                v-for="item in machineTypeOptions"
-                :key="item.value"
-                :value="item"
-              >
-                {{ item.text }}
-              </option>
-            </select>
-          </template>
-        </atoms-stack-block>
-
-        <atoms-stack-block :has-children="false">
-          <template #stackBlockKey>
-            {{ localization.guestOsFamily }}
-          </template>
-          <template #stackBlockContent>
-            <select
-              v-if="props.guestOsFamily"
-              id="guest-os-family-select"
-              v-model="guestOsFamilyLocal"
-              data-id="guest-os-family-select"
-              :disabled="isDisabled"
-              @change="onChangeOS"
-            >
-              <option v-for="item in osOptions" :key="item.value" :value="item">
-                {{ item.text }}
-              </option>
-            </select>
-          </template>
-        </atoms-stack-block>
-
-        <atoms-stack-block :has-children="false">
-          <template #stackBlockKey>
-            {{ localization.guestOsVersion }}
-          </template>
-          <template #stackBlockContent>
-            <select
-              v-if="props.guestOsVersion"
-              id="guest-os-version-select"
-              v-model="guestOsVersionLocal"
-              data-id="guest-os-version-select"
-              :disabled="isDisabled"
-            >
-              <option
-                v-for="item in versionsOptions"
-                :key="item.value"
-                :value="item"
-              >
-                {{ item.text }}
-              </option>
-            </select>
-          </template>
-        </atoms-stack-block>
-      </template>
-    </atoms-stack-block>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  vmName: string
-  guestMachineType: UI_I_OptionItem | null
-  guestOsFamily: UI_I_OptionItem | null
-  guestOsVersion: UI_I_OptionItem | null
-  isEdit: boolean
-  isClone: boolean
-  state?: string | number
-}>()
-const emits = defineEmits<{
-  (event: 'update:vm-name', value: string): void
-  (event: 'update:guest-machine-type', value: UI_I_OptionItem | null): void
-  (event: 'update:guest-os-family', value: UI_I_OptionItem | null): void
-  (event: 'update:guest-os-version', value: UI_I_OptionItem | null): void
-}>()
-
-const isDisabled = computed<boolean>(
-  () => (!props.isEdit && !props.isClone) || (props.isEdit && props.state !== 1)
-)
-
-const vmNameLocal = computed<string>({
-  get() {
-    return props.vmName
-  },
-  set(newValue) {
-    emits('update:vm-name', newValue)
-  },
-})
-
-const guestMachineTypeLocal = computed<UI_I_OptionItem | null>({
-  get() {
-    return props.guestMachineType
-  },
-  set(newValue) {
-    emits('update:guest-machine-type', newValue)
-  },
-})
-const machineTypeOptions = ref<UI_I_OptionItem[]>(capabilities.machineTypes)
-
-const guestOsFamilyLocal = computed<UI_I_OptionItem | null>({
-  get() {
-    return props.guestOsFamily
-  },
-  set(newValue) {
-    emits('update:guest-os-family', newValue)
-  },
-})
-const osOptions = ref<UI_I_OptionItem[]>(capabilities.guestOsFamilies)
-const onChangeOS = (): void => {
-  guestOsVersionLocal.value = versionsOptions.value[0]
-}
-
-const guestOsVersionLocal = computed<UI_I_OptionItem | null>({
-  get() {
-    return props.guestOsVersion
-  },
-  set(newValue) {
-    emits('update:guest-os-version', newValue)
-  },
-})
-const versionsOptions = computed<UI_I_OptionItem[]>(() => {
-  if (!guestOsFamilyLocal.value) return []
-
-  return capabilities.guestOsVersions[guestOsFamilyLocal.value.value] || []
-})
-watch(
-  versionsOptions,
-  () => {
-    guestOsVersionLocal.value = versionsOptions.value[0]
-  }
-  // { immediate: true }
-)
-
-const blockIsOpen = ref<boolean>(false)
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <div class="general-options">
+    <atoms-stack-block :has-children="true" @toggle="blockIsOpen = $event">
+      <template #stackBlockKey>
+        <div
+          id="vm-wizard-toggle-block-general-options"
+          data-id="vm-wizard-toggle-block-general-options"
+          class="flex-align-center"
+        >
+          <span>{{ localization.generalOptions }}</span>
+        </div>
+      </template>
+      <template #stackBlockContent>
+        <div v-show="!blockIsOpen">
+          {{ localization.vmName }}: {{ vmNameLocal }}
+        </div>
+      </template>
+      <template #stackChildren>
+        <atoms-stack-block :has-children="false">
+          <template #stackBlockKey>
+            {{ localization.vmName }}
+          </template>
+          <template #stackBlockContent>
+            <span>{{ vmNameLocal }}</span>
+            <!--            <span v-if="!props.isEdit">{{ vmNameLocal }}</span>-->
+            <!--            <input-->
+            <!--              v-else-->
+            <!--              id="general-option-vm-name"-->
+            <!--              v-models="vmNameLocal"-->
+            <!--              type="text"-->
+            <!--            />-->
+          </template>
+        </atoms-stack-block>
+
+        <atoms-stack-block :has-children="false">
+          <template #stackBlockKey>
+            {{ localization.machineType }}
+          </template>
+          <template #stackBlockContent>
+            <select
+              v-if="props.guestMachineType"
+              id="guest-machine-type-select"
+              v-model="guestMachineTypeLocal"
+              :disabled="isDisabled"
+              data-id="guest-machine-type-select"
+            >
+              <option
+                v-for="item in machineTypeOptions"
+                :key="item.value"
+                :value="item"
+              >
+                {{ item.text }}
+              </option>
+            </select>
+          </template>
+        </atoms-stack-block>
+
+        <atoms-stack-block :has-children="false">
+          <template #stackBlockKey>
+            {{ localization.guestOsFamily }}
+          </template>
+          <template #stackBlockContent>
+            <select
+              v-if="props.guestOsFamily"
+              id="guest-os-family-select"
+              v-model="guestOsFamilyLocal"
+              data-id="guest-os-family-select"
+              :disabled="isDisabled"
+              @change="onChangeOS"
+            >
+              <option v-for="item in osOptions" :key="item.value" :value="item">
+                {{ item.text }}
+              </option>
+            </select>
+          </template>
+        </atoms-stack-block>
+
+        <atoms-stack-block :has-children="false">
+          <template #stackBlockKey>
+            {{ localization.guestOsVersion }}
+          </template>
+          <template #stackBlockContent>
+            <select
+              v-if="props.guestOsVersion"
+              id="guest-os-version-select"
+              v-model="guestOsVersionLocal"
+              data-id="guest-os-version-select"
+              :disabled="isDisabled"
+            >
+              <option
+                v-for="item in versionsOptions"
+                :key="item.value"
+                :value="item"
+              >
+                {{ item.text }}
+              </option>
+            </select>
+          </template>
+        </atoms-stack-block>
+      </template>
+    </atoms-stack-block>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const props = defineProps<{
+  vmName: string
+  guestMachineType: UI_I_OptionItem | null
+  guestOsFamily: UI_I_OptionItem | null
+  guestOsVersion: UI_I_OptionItem | null
+  isEdit: boolean
+  isClone: boolean
+  state?: string | number
+}>()
+const emits = defineEmits<{
+  (event: 'update:vm-name', value: string): void
+  (event: 'update:guest-machine-type', value: UI_I_OptionItem | null): void
+  (event: 'update:guest-os-family', value: UI_I_OptionItem | null): void
+  (event: 'update:guest-os-version', value: UI_I_OptionItem | null): void
+}>()
+
+const isDisabled = computed<boolean>(
+  () => (!props.isEdit && !props.isClone) || (props.isEdit && props.state !== 1)
+)
+
+const vmNameLocal = computed<string>({
+  get() {
+    return props.vmName
+  },
+  set(newValue) {
+    emits('update:vm-name', newValue)
+  },
+})
+
+const guestMachineTypeLocal = computed<UI_I_OptionItem | null>({
+  get() {
+    return props.guestMachineType
+  },
+  set(newValue) {
+    emits('update:guest-machine-type', newValue)
+  },
+})
+const machineTypeOptions = ref<UI_I_OptionItem[]>(capabilities.machineTypes)
+
+const guestOsFamilyLocal = computed<UI_I_OptionItem | null>({
+  get() {
+    return props.guestOsFamily
+  },
+  set(newValue) {
+    emits('update:guest-os-family', newValue)
+  },
+})
+const osOptions = ref<UI_I_OptionItem[]>(capabilities.guestOsFamilies)
+const onChangeOS = (): void => {
+  guestOsVersionLocal.value = versionsOptions.value[0]
+}
+
+const guestOsVersionLocal = computed<UI_I_OptionItem | null>({
+  get() {
+    return props.guestOsVersion
+  },
+  set(newValue) {
+    emits('update:guest-os-version', newValue)
+  },
+})
+const versionsOptions = computed<UI_I_OptionItem[]>(() => {
+  if (!guestOsFamilyLocal.value) return []
+
+  return capabilities.guestOsVersions[guestOsFamilyLocal.value.value] || []
+})
+watch(
+  versionsOptions,
+  () => {
+    guestOsVersionLocal.value = versionsOptions.value[0]
+  }
+  // { immediate: true }
+)
+
+const blockIsOpen = ref<boolean>(false)
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/RemoteConsoleOptions.vue

@@ -4,6 +4,7 @@
       <template #stackBlockKey>
         <div
           id="vm-wizard-toggle-block-remote-console"
+          data-id="vm-wizard-toggle-block-remote-console"
           class="flex-align-center"
         >
           <span>{{ localization.remoteConsoleOptions }}</span>