bfg-common 1.5.572 → 1.5.573

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/{KeymapOld.vue → Old.vue}

@@ -1,8 +1,8 @@
 <template>
   <div class="">
     <atoms-stack-block
-        :has-children="false"
-        test-id="remote-console-keymap-stack-block"
+      :has-children="false"
+      test-id="remote-console-keymap-stack-block"
     >
       <template #stackBlockKey>
         {{ localization.common.keymap }}
@@ -11,9 +11,9 @@
         <div class="select">
           <select
             id="keymap-select"
-            v-model="keymap"
+            v-model="model"
             :disabled="props.disabled"
-            :data-value="keymap"
+            :data-value="model"
             data-id="keymap-select"
           >
             <option
@@ -34,7 +34,7 @@
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-const keymap = defineModel<string>('keymap', { required: true })
+const model = defineModel<string>({ required: true })
 
 const props = defineProps<{
   disabled: boolean

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/Password.vue

@@ -26,7 +26,7 @@ import type { UI_I_DefaultForm } from '~/components/common/vm/actions/common/cus
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import { generatePassword } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/lib/utils'
 
-const password = defineModel<string>('password', { required: true })
+const model = defineModel<string>({ required: true })
 
 const props = defineProps<{
   disabled: boolean
@@ -43,7 +43,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const validation = $validation.call({})
 const defaultForm: UI_I_DefaultForm = {
   password: {
-    value: password.value,
+    value: model.value,
     validations: [
       {
         value: 'password',
@@ -61,7 +61,6 @@ setForm()
 
 const showValidationErrors = (): void => {
   const valid = validation.touch()
-  console.log(valid, 111)
   passwordErrorText.value = !valid.isValid ? valid.errors.password[0] : ''
   emits('valid', valid.isValid)
 }
@@ -77,24 +76,24 @@ const setPasswordDisable = (): void => {
 
   removeValidationErrors()
   setForm()
-  password.value = ''
+  model.value = ''
 }
 
 const passwordErrorText = ref<string>('')
 
 const changePassword = (value: string): void => {
-  password.value = value
+  model.value = value
 
   showValidationErrors()
 }
 
-const isEnabledPassword = ref<boolean>(!!password.value)
+const isEnabledPassword = ref<boolean>(!!model.value)
 
 const onGeneratePassword = (): void => {
   const generatedPassword = generatePassword()
 
   form.value.password.value = generatedPassword
-  password.value = generatedPassword
+  model.value = generatedPassword
 
   showValidationErrors()
 }

package/components/common/vm/actions/common/customizeHardware/vmoptions/tools/Tools.vue

@@ -1,52 +1,18 @@
 <template>
   <common-vm-actions-common-customize-hardware-vmoptions-tools-new
     v-if="isNewView"
-    v-model:balloon="balloonLocal"
-    :disabled="isDisabled"
+    v-model:tools="model.enabled"
   />
   <common-vm-actions-common-customize-hardware-vmoptions-tools-old
     v-else
-    v-model:balloon="balloonLocal"
-    :disabled="isDisabled"
+    v-model:tools="model.enabled"
   />
 </template>
 
 <script setup lang="ts">
-import type { UI_I_SendDataTools } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
+import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 
-const props = withDefaults(
-  defineProps<{
-    tools: boolean
-    balloon: boolean
-    isEdit: boolean
-    state?: string | number
-  }>(),
-  {
-    tools: true,
-    balloon: false,
-    state: undefined,
-  }
-)
-const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataTools): void
-}>()
-
-const toolsLocal = ref<boolean>(props.tools)
-const balloonLocal = ref<boolean>(props.balloon)
-
-const isDisabled = computed<boolean>(() => props.isEdit && props.state !== 1)
-
-watch(
-  balloonLocal,
-  () => {
-    emits('send-data', {
-      enabled: toolsLocal.value,
-      synchronized_time: toolsLocal.value,
-      balloon: balloonLocal.value,
-    })
-  },
-  { immediate: true }
-)
+const model = defineModel<UI_I_CreateVmData['options']['guest_tools']>({ required: true })
 
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])

package/components/common/vm/actions/common/customizeHardware/vmoptions/tools/ToolsNew.vue

@@ -1,5 +1,7 @@
 <template>
+  <!--  TODO 700-->
   <ui-stack-block
+    v-show="false"
     test-id="tools-stack-block"
     has-children
     is-toggle-on-stack-view-key
@@ -14,32 +16,16 @@
       </div>
     </template>
     <template #stackChildren>
-<!--      TODO 700-->
-<!--      <ui-stack-block :has-children="false">-->
-<!--        <template #stackBlockKey>-->
-<!--          <span class="mt-2">{{ localization.common.toolsEnable }}</span>-->
-<!--        </template>-->
-<!--        <template #stackBlockContent>-->
-<!--          <ui-checkbox-->
-<!--            id="tools-2"-->
-<!--            v-model="tools"-->
-<!--            :label-text="localization.common.enable"-->
-<!--            test-id="tools-2-checkbox"-->
-<!--            size="md"-->
-<!--          />-->
-<!--        </template>-->
-<!--      </ui-stack-block>-->
       <ui-stack-block :has-children="false">
         <template #stackBlockKey>
-          <span class="mt-2">{{ localization.common.balloon }}</span>
+          <span class="mt-2">{{ localization.common.toolsEnable }}</span>
         </template>
         <template #stackBlockContent>
           <ui-checkbox
-            id="balloon"
-            v-model="balloon"
+            id="tools-2"
+            v-model="tools"
             :label-text="localization.common.enable"
-            :disabled="props.disabled"
-            test-id="balloon-checkbox"
+            test-id="tools-2-checkbox"
             size="md"
           />
         </template>
@@ -51,12 +37,7 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-// const tools = defineModel<boolean>('tools', { required: true })
-const balloon = defineModel<boolean>('balloon', { required: true })
-
-const props = defineProps<{
-  disabled: boolean
-}>()
+const tools = defineModel<boolean>('tools', { required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 </script>

package/components/common/vm/actions/common/customizeHardware/vmoptions/tools/ToolsOld.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="hardware-tools">
+  <!--  TODO 700-->
+  <div v-show="false" class="hardware-tools">
     <atoms-stack-block test-id="tools-stack-block" has-children>
       <template #stackBlockKey>
         <div
@@ -11,52 +12,31 @@
         </div>
       </template>
       <template #stackChildren>
-        <!--        TODO 700-->
-        <!--        <atoms-stack-block-->
-        <!--          :has-children="false"-->
-        <!--          test-id="tools-stack-block-children"-->
-        <!--        >-->
-        <!--          <template #stackBlockKey>-->
-        <!--            {{ localization.common.toolsEnable }}-->
-        <!--          </template>-->
-        <!--          <template #stackBlockContent>-->
-        <!--            <div-->
-        <!--              :title="localization.common.inDevelopment"-->
-        <!--              class="cursor-not-allowed"-->
-        <!--            >-->
-        <!--              <input-->
-        <!--                id="tools-2"-->
-        <!--                v-model="tools"-->
-        <!--                disabled-->
-        <!--                data-id="tools-2-checkbox"-->
-        <!--                type="checkbox"-->
-        <!--              />-->
-        <!--              <label-->
-        <!--                for="tools-2"-->
-        <!--                class="label-text-normal cursor-not-allowed"-->
-        <!--                >{{ localization.common.enable }}</label-->
-        <!--              >-->
-        <!--            </div>-->
-        <!--          </template>-->
-        <!--        </atoms-stack-block>-->
         <atoms-stack-block
-          :has-children="false"
-          test-id="tools-stack-block-children"
+            :has-children="false"
+            test-id="tools-stack-block-children"
         >
           <template #stackBlockKey>
-            {{ localization.common.balloon }}
+            {{ localization.common.toolsEnable }}
           </template>
           <template #stackBlockContent>
-            <input
-              id="balloon"
-              v-model="balloon"
-              :disabled="props.disabled"
-              data-id="balloon-checkbox"
-              type="checkbox"
-            />
-            <label for="balloon" class="label-text-normal">{{
-              localization.common.enable
-            }}</label>
+            <div
+              :title="localization.common.inDevelopment"
+              class="cursor-not-allowed"
+            >
+              <input
+                id="tools-2"
+                v-model="tools"
+                disabled
+                data-id="tools-2-checkbox"
+                type="checkbox"
+              />
+              <label
+                for="tools-2"
+                class="label-text-normal cursor-not-allowed"
+                >{{ localization.common.enable }}</label
+              >
+            </div>
           </template>
         </atoms-stack-block>
       </template>
@@ -67,20 +47,14 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-// const tools = defineModel<boolean>('tools', { required: true })
-const balloon = defineModel<boolean>('balloon', { required: true })
-
-const props = defineProps<{
-  disabled: boolean
-}>()
+const tools = defineModel<boolean>('tools', { required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 </script>
 
 <style scoped lang="scss">
 #tools-1,
-#tools-2,
-#balloon {
+#tools-2 {
   margin: 0 4px 4px 0;
 }
 </style>

package/components/common/vm/actions/common/lib/models/interfaces.ts

@@ -5,7 +5,13 @@ import type {
   UI_I_SendDataNewPciDevice,
   UI_I_SendDataVideoCard,
 } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
-import type { UI_I_SendDataVmoptions } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
+import type {
+  UI_I_SendDataBootOptions,
+  UI_I_SendDataRemoteConsoleOptions,
+  UI_I_SendDataRemoteConsoleOptionsSpice,
+  UI_I_SendDataTools,
+  UI_I_SendDataVmoptions,
+} from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
 import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
 import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
 
@@ -47,25 +53,6 @@ export interface UI_I_ErrorMessage {
   descriptions: string[]
 }
 
-interface UI_I_CreateVmDataStorage {
-  id: string
-}
-interface UI_I_CreateVmDataCpu {
-  vcpus: number
-  max_vcpus: number
-  core_per_socket: number
-  model: string
-  reservation_mhz: number
-  limit_mhz: number
-  shares: number
-  hotplug: boolean
-}
-interface UI_I_CreateVmDataMemory {
-  size_mb: number
-  hotplug: boolean
-  reservation_mb: number
-  limit_mb: number
-}
 export interface UI_I_CreateVmDataUsbController {
   type: string
 }
@@ -148,10 +135,55 @@ export interface UI_I_CreateVmData {
   )[]
   network_devices: UI_I_SendDataNewNetwork[]
   passthrough_pci_devices: UI_I_SendDataNewPciDevice[]
-  options: UI_I_SendDataVmoptions
-  storage: UI_I_CreateVmDataStorage
-  cpu: UI_I_CreateVmDataCpu
-  memory: UI_I_CreateVmDataMemory
-  usb_controllers: UI_I_CreateVmDataUsbController[]
+  usb_controllers: {
+    type: string
+  }[]
   input_devices: UI_I_CreateVmDataInputDevices[]
+  cpu: {
+    vcpus: number
+    max_vcpus: number
+    core_per_socket: number
+    model: string
+    reservation_mhz: number
+    limit_mhz: number
+    shares: number
+    hotplug: boolean
+  }
+  memory: {
+    size_mb: number
+    hotplug: boolean
+    reservation_mb: number
+    limit_mb: number
+  }
+  storage: {
+    id: string
+  } | null
+  options: {
+    remote_console: {
+      type: string
+      port: number
+      keymap: string
+      password: string
+      guest_os_lock: boolean
+      limit_sessions: number
+      spice: {
+        img_compression: string
+        jpeg_compression: string
+        zlib_glz_compression: string
+        streaming_mode: string
+        playback_compression: boolean
+        file_transfer: boolean
+        clipboard: boolean
+      }
+    }
+    guest_tools: {
+      enabled: boolean
+      synchronized_time: boolean
+    }
+    boot_options: {
+      firmware: string
+      boot_delay_ms: number
+      boot_menu: boolean
+    }
+  }
 }

package/components/common/vm/actions/common/select/os/New.vue

@@ -44,20 +44,6 @@
         @change="emits('remove-error-by-title', 'guest_os_version')"
       />
     </div>
-    <div class="select-wrap mb-4">
-      <label for="profile-select" class="select-label">{{
-        localization.vmWizard.profile
-      }}</label>
-
-      <ui-select
-        v-model="profile"
-        :items="props.profileOptions"
-        :error-text="props.apiErrorProfile"
-        test-id="vm-wizard-profile-select"
-        width="max-content"
-        @change="emits('remove-error-by-title', 'profile')"
-      />
-    </div>
   </div>
 </template>
 
@@ -74,9 +60,6 @@ const guestOsFamily = defineModel<UI_I_OptionItem | null>('guest-os-family', {
 const guestOsVersion = defineModel<UI_I_OptionItem | null>('guest-os-version', {
   required: true,
 })
-const profile = defineModel<UI_I_OptionItem | null>('profile', {
-  required: true,
-})
 
 const props = defineProps<{
   apiErrorMachineType: string
@@ -85,8 +68,6 @@ const props = defineProps<{
   osOptions: UI_I_OptionItem[]
   apiErrorGuestOsVersion: string
   versionsOptions: UI_I_OptionItem[]
-  apiErrorProfile: string
-  profileOptions: UI_I_OptionItem[]
 }>()
 const emits = defineEmits<{
   (event: 'remove-error-by-title', value: string): void

package/components/common/vm/actions/common/select/os/Old.vue

@@ -91,35 +91,6 @@
         <template #content>{{ props.apiErrorGuestOsVersion }}</template>
       </atoms-tooltip-error>
     </div>
-    <div class="select-os-block os-select-wrap table-row">
-      <label for="profile-select" class="table-cell"
-        >{{ localization.vmWizard.profile }}:</label
-      >
-
-      <atoms-tooltip-error
-        :has-error="!!props.apiErrorProfile"
-        selector="#vm-wizard-profile-select"
-        @remove="emits('remove-error-by-title', 'profile')"
-      >
-        <template #elem>
-          <select
-            id="vm-wizard-profile-select"
-            v-model="profile"
-            data-id="vm-wizard-profile-select"
-            class="table-cell"
-          >
-            <option
-              v-for="item in props.profileOptions"
-              :key="item.value"
-              :value="item"
-            >
-              {{ item.text }}
-            </option>
-          </select>
-        </template>
-        <template #content>{{ props.apiErrorProfile }}</template>
-      </atoms-tooltip-error>
-    </div>
   </div>
 </template>
 
@@ -136,9 +107,6 @@ const guestOsFamily = defineModel<UI_I_OptionItem | null>('guest-os-family', {
 const guestOsVersion = defineModel<UI_I_OptionItem | null>('guest-os-version', {
   required: true,
 })
-const profile = defineModel<UI_I_OptionItem | null>('profile', {
-  required: true,
-})
 
 const props = defineProps<{
   apiErrorMachineType: string
@@ -147,8 +115,6 @@ const props = defineProps<{
   osOptions: UI_I_OptionItem[]
   apiErrorGuestOsVersion: string
   versionsOptions: UI_I_OptionItem[]
-  apiErrorProfile: string
-  profileOptions: UI_I_OptionItem[]
 }>()
 const emits = defineEmits<{
   (event: 'remove-error-by-title', value: string): void

package/components/common/vm/actions/common/select/os/Os.vue

@@ -4,15 +4,12 @@
     v-model:machine-type="machineType"
     v-model:guest-os-family="guestOsFamily"
     v-model:guest-os-version="guestOsVersion"
-    v-model:profile="profile"
     :api-error-machine-type="apiErrorMachineType"
     :machine-type-options="machineTypeOptions"
     :api-error-guest-os-family="apiErrorGuestOsFamily"
     :os-options="osOptions"
     :api-error-guest-os-version="apiErrorGuestOsVersion"
     :versions-options="versionsOptions"
-    :api-error-profile="apiErrorProfile"
-    :profile-options="profileOptions"
     @change-os="onChangeOs"
     @remove-error-by-title="onRemoveValidationError"
   />
@@ -21,15 +18,12 @@
     v-model:machine-type="machineType"
     v-model:guest-os-family="guestOsFamily"
     v-model:guest-os-version="guestOsVersion"
-    v-model:profile="profile"
     :api-error-machine-type="apiErrorMachineType"
     :machine-type-options="machineTypeOptions"
     :api-error-guest-os-family="apiErrorGuestOsFamily"
     :os-options="osOptions"
     :api-error-guest-os-version="apiErrorGuestOsVersion"
     :versions-options="versionsOptions"
-    :api-error-profile="apiErrorProfile"
-    :profile-options="profileOptions"
     @change-os="onChangeOs"
     @remove-error-by-title="onRemoveValidationError"
   />
@@ -38,7 +32,6 @@
 <script setup lang="ts">
 import type {
   UI_I_ArbitraryObject,
-  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'
@@ -52,9 +45,6 @@ const guestOsFamily = defineModel<UI_I_OptionItem | null>('guest-os-family', {
 const guestOsVersion = defineModel<UI_I_OptionItem | null>('guest-os-version', {
   required: true,
 })
-// const profile = defineModel<UI_I_OptionItem | null>('profile', {
-//   required: true,
-// })
 
 const props = defineProps<{
   familiesOptions: UI_I_OptionItem[]
@@ -69,8 +59,6 @@ const emits = defineEmits<{
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const localization = computed<UI_I_Localization>(() => useLocal())
-
 const machineTypeOptions = ref<UI_I_OptionItem[]>(props.machineTypesOptions)
 watch(
   () => props.machineTypesOptions,
@@ -119,12 +107,6 @@ watch(
   { immediate: true }
 )
 
-// TODO получать из пропсов
-const profileOptions = ref<UI_I_OptionItem[]>([
-  { text: localization.value.vmWizard.standard, value: 'standard' },
-])
-const profile = ref<UI_I_OptionItem>(profileOptions.value[0]) // TODO получать из defineModel
-
 const apiErrorMachineType = computed<string>(() => {
   return (
     props.errorValidationFields?.find(
@@ -149,13 +131,6 @@ const apiErrorGuestOsVersion = computed<string>(() => {
   )
 })
 
-const apiErrorProfile = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find((message) => message.field === 'profile')
-      ?.error_message || ''
-  )
-})
-
 const onRemoveValidationError = (type: string): void => {
   emits('remove-error-by-title', type)
 }