bfg-common 1.5.574 → 1.5.575

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

@@ -21,87 +21,87 @@
         <!--        TODO возможно вернем, НЕ УДАЛЯТЬ-->
 
         <!--        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-type-->
-        <!--          v-models:remote-console-type="model.type"-->
+        <!--          v-models:remote-console-type="remoteConsoleType"-->
         <!--          :error-validation-fields="props.errorValidationFields"-->
         <!--          :disabled="props.isDisabled"-->
         <!--          @input="changeRemoteConsoleType"-->
         <!--          @remove-error-by-title="emits('remove-error-by-title', $event)"-->
         <!--        />-->
         <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-keymap
-          v-model="model.keymap"
+          v-model:keymap="keymap"
           :disabled="props.isDisabled"
         />
         <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-password
-          v-model="model.password"
+          v-model:password="password"
           :disabled="props.isDisabled"
           @valid="passwordIsValid = $event"
         />
         <!--        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-power-control-->
-        <!--          v-if="model.type === 'vnc'"-->
+        <!--          v-if="remoteConsoleType === 'vnc'"-->
         <!--          v-models:power-control="powerControl"-->
         <!--        />-->
         <!--        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-share-policy-->
-        <!--          v-if="model.type === 'vnc'"-->
+        <!--          v-if="remoteConsoleType === 'vnc'"-->
         <!--          v-models:share-policy="sharePolicy"-->
         <!--        />-->
         <!--        TODO возможно вернем, НЕ УДАЛЯТЬ-->
         <!--        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-img-compression-->
-        <!--          v-if="model.type === 'spice'"-->
+        <!--          v-if="remoteConsoleType === 'spice'"-->
         <!--          v-models:img-compression="imgCompression"-->
         <!--          :error-validation-fields="props.errorValidationFields"-->
         <!--          :disabled="props.isDisabled"-->
         <!--          @remove-error-by-title="emits('remove-error-by-title', $event)"-->
         <!--        />-->
         <!--        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-jpeg-compression-->
-        <!--          v-if="model.type === 'spice'"-->
+        <!--          v-if="remoteConsoleType === 'spice'"-->
         <!--          v-models:jpeg-compression="jpegCompression"-->
         <!--          :error-validation-fields="props.errorValidationFields"-->
         <!--          :disabled="props.isDisabled"-->
         <!--          @remove-error-by-title="emits('remove-error-by-title', $event)"-->
         <!--        />-->
         <!--        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-zlib-compression-->
-        <!--          v-if="model.type === 'spice'"-->
+        <!--          v-if="remoteConsoleType === 'spice'"-->
         <!--          v-models:zlib-compression="zlibCompression"-->
         <!--          :error-validation-fields="props.errorValidationFields"-->
         <!--          :disabled="props.isDisabled"-->
         <!--          @remove-error-by-title="emits('remove-error-by-title', $event)"-->
         <!--        />-->
         <!--        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-playback-compression-->
-        <!--          v-if="model.type === 'spice'"-->
+        <!--          v-if="remoteConsoleType === 'spice'"-->
         <!--          :disabled="props.isDisabled"-->
         <!--          v-models:playback-compression="playbackCompression"-->
         <!--        />-->
         <!--        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-streaming-mode-->
-        <!--          v-if="model.type === 'spice'"-->
+        <!--          v-if="remoteConsoleType === 'spice'"-->
         <!--          v-models:streaming-mode="streamingMode"-->
         <!--          :error-validation-fields="props.errorValidationFields"-->
         <!--          :disabled="props.isDisabled"-->
         <!--          @remove-error-by-title="emits('remove-error-by-title', $event)"-->
         <!--        />-->
         <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-copy-paste
-          v-if="model.type === 'spice'"
-          v-model:copy-paste="model.spice.clipboard"
+          v-if="remoteConsoleType === 'spice'"
+          v-model:copy-paste="copyPaste"
           :disabled="props.isDisabled"
         />
         <!--        TODO возможно вернем, НЕ УДАЛЯТЬ-->
         <!--        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-mouse-mode-->
-        <!--          v-if="model.type === 'spice'"-->
+        <!--          v-if="remoteConsoleType === 'spice'"-->
         <!--          v-models:mouse-mode="mouseMode"-->
         <!--        />-->
         <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-file-transfer
-          v-if="model.type === 'spice'"
-          v-model:file-transfer="model.spice.file_transfer"
+          v-if="remoteConsoleType === 'spice'"
+          v-model:file-transfer="fileTransfer"
           :disabled="props.isDisabled"
         />
         <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-usb-redirection
-          v-if="model.type === 'spice'"
+          v-if="remoteConsoleType === 'spice'"
           v-model:usb-redirection="usbRedirection"
           :disabled="props.isDisabled"
         />
         <!--        TODO 700-->
         <!--        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-folder-sharing-->
-        <!--          v-if="model.type === 'spice'"-->
-        <!--          v-model:folder-sharing="model.spice.folder_sharing"-->
+        <!--          v-if="remoteConsoleType === 'spice'"-->
+        <!--          v-model:folder-sharing="folderSharing"-->
         <!--          :disabled="props.isDisabled"-->
         <!--        />-->
       </template>
@@ -111,16 +111,22 @@
 
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateVmData['options']['remote_console']>({ required: true })
 
+const keymap = defineModel<string>('keymap', { required: true })
+const password = defineModel<string>('password', { required: true })
 const passwordIsValid = defineModel<boolean>('passwordIsValid', {
   required: true,
 })
-
-// TODO use from model
-const usbRedirection = ref<number>(3)
+const remoteConsoleType = defineModel<string>('remoteConsoleType', {
+  required: true,
+})
+const copyPaste = defineModel<boolean>('copyPaste', { required: true })
+const fileTransfer = defineModel<boolean>('fileTransfer', { required: true })
+const usbRedirection = defineModel<number>('usbRedirection', {
+  required: true,
+})
+// TODO 700
+// const folderSharing = defineModel<boolean>('folderSharing', { required: true })
 
 const props = defineProps<{
   // TODO возможно вернем, НЕ УДАЛЯТЬ

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

@@ -1,37 +1,50 @@
 <template>
   <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-new
     v-if="isNewView"
-    v-model="model"
+    v-model:keymap="keymap"
+    v-model:password="password"
     v-model:password-is-valid="passwordIsValid"
+    v-model:remote-console-type="remoteConsoleType"
+    v-model:copy-paste="copyPaste"
+    v-model:file-transfer="fileTransfer"
+    v-model:usb-redirection="usbRedirection"
+    v-model:folder-sharing="folderSharing"
     :remote-console-options-invalid="remoteConsoleOptionsInvalid"
     :is-disabled="isDisabled"
   />
   <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-old
     v-else
-    v-model="model"
+    v-model:keymap="keymap"
+    v-model:password="password"
     v-model:password-is-valid="passwordIsValid"
+    v-model:remote-console-type="remoteConsoleType"
+    v-model:copy-paste="copyPaste"
+    v-model:file-transfer="fileTransfer"
+    v-model:usb-redirection="usbRedirection"
+    v-model:folder-sharing="folderSharing"
     :remote-console-options-invalid="remoteConsoleOptionsInvalid"
     :is-disabled="isDisabled"
   />
 </template>
 
 <script setup lang="ts">
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateVmData['options']['remote_console']>({ required: true })
+import type { UI_I_SendDataRemoteConsoleOptions } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/lib/models/interfaces'
 
 const props = withDefaults(
   defineProps<{
     isEdit: boolean
+    remoteConsoleOptions?: UI_I_SendDataRemoteConsoleOptions
     // TODO возможно вернем, НЕ УДАЛЯТЬ
     // errorValidationFields: UI_I_ErrorValidationField<string>[]
     state?: string | number
   }>(),
   {
+    remoteConsoleOptions: undefined,
     state: undefined,
   }
 )
 const emits = defineEmits<{
+  (event: 'send-data', value: UI_I_SendDataRemoteConsoleOptions): void
   (event: 'invalid', value: boolean): void
   // TODO возможно вернем, НЕ УДАЛЯТЬ
   // (event: 'remove-error-by-title', value: string): void
@@ -42,6 +55,7 @@ const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const isDisabled = computed<boolean>(() => props.isEdit && props.state !== 1)
 
+const remoteConsoleType = ref<string>('spice')
 // TODO возможно вернем, НЕ УДАЛЯТЬ
 // const changeRemoteConsoleType = (): void => {
 //   // powerControl.value = false
@@ -51,14 +65,104 @@ const isDisabled = computed<boolean>(() => props.isEdit && props.state !== 1)
 //   zlibCompression.value = 'auto'
 //   playbackCompression.value = true
 //   streamingMode.value = 'all'
-//   model.spice.clipboard = true
+//   copyPaste.value = true
 //   mouseMode.value = 'client'
-//   model.spice.file_transfer = true
-//   model.spice.folder_sharing = true
+//   fileTransfer.value = true
+//   usbRedirection.value = 3
+//   folderSharing.value = true
 // }
 
+const keymap = ref<string>('en_US')
+
+const password = ref<string>('')
 const passwordIsValid = ref<boolean>(true)
 
+// const powerControl = ref<boolean>(false)
+
+// const sharePolicy = ref<string>('allow-exclusive')
+
+const imgCompression = ref<string>('auto_glz')
+
+const jpegCompression = ref<string>('auto')
+
+const zlibCompression = ref<string>('auto')
+
+const playbackCompression = ref<boolean>(true)
+
+const streamingMode = ref<string>('all')
+
+const copyPaste = ref<boolean>(true)
+
+const mouseMode = ref<string>('client')
+
+const fileTransfer = ref<boolean>(true)
+
+const usbRedirection = ref<number>(3)
+
+const folderSharing = ref<boolean>(true)
+
+watch(
+  [
+    remoteConsoleType,
+    keymap,
+    password,
+    // powerControl,
+    // sharePolicy,
+    imgCompression,
+    jpegCompression,
+    zlibCompression,
+    playbackCompression,
+    streamingMode,
+    copyPaste,
+    mouseMode,
+    fileTransfer,
+    usbRedirection,
+    folderSharing,
+  ],
+  () => {
+    emits('send-data', {
+      type: remoteConsoleType.value,
+      port: 0,
+      keymap: keymap.value,
+      password: password.value,
+      guest_os_lock: false,
+      limit_sessions: 0,
+      spice: {
+        img_compression: imgCompression.value,
+        jpeg_compression: jpegCompression.value,
+        zlib_glz_compression: zlibCompression.value,
+        streaming_mode: streamingMode.value,
+        playback_compression: playbackCompression.value,
+        file_transfer: fileTransfer.value,
+        clipboard: copyPaste.value,
+      },
+    })
+  },
+  { immediate: true }
+)
+
+// Добавляем данные для редактирования
+watch(
+  () => props.remoteConsoleOptions,
+  (newValue) => {
+    if (!newValue || !props.remoteConsoleOptions) return
+
+    remoteConsoleType.value = props.remoteConsoleOptions.type
+    keymap.value = props.remoteConsoleOptions.keymap
+    password.value = props.remoteConsoleOptions.password
+    imgCompression.value = props.remoteConsoleOptions.spice.img_compression
+    jpegCompression.value = props.remoteConsoleOptions.spice.jpeg_compression
+    zlibCompression.value =
+      props.remoteConsoleOptions.spice.zlib_glz_compression
+    streamingMode.value = props.remoteConsoleOptions.spice.streaming_mode
+    playbackCompression.value =
+      props.remoteConsoleOptions.spice.playback_compression
+    fileTransfer.value = props.remoteConsoleOptions.spice.file_transfer
+    copyPaste.value = props.remoteConsoleOptions.spice.clipboard
+  },
+  { immediate: true }
+)
+
 const remoteConsoleOptionsInvalid = computed<boolean>(
   () => !passwordIsValid.value
 )

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/Keymap.vue

@@ -1,13 +1,13 @@
 <template>
   <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-keymap-new
     v-if="isNewView"
-    v-model="model"
+    v-model:keymap="keymap"
     :disabled="props.disabled"
     :keymap-options="keymapOptions"
   />
   <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-keymap-old
     v-else
-    v-model="model"
+    v-model:keymap="keymap"
     :disabled="props.disabled"
     :keymap-options="keymapOptions"
   />
@@ -17,7 +17,7 @@
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import { keymapOptionsConfig } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/lib/config/config'
 
-const model = defineModel<string>({ required: true })
+const keymap = defineModel<string>('keymap', { required: true })
 
 const props = defineProps<{
   disabled: boolean

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/{New.vue → KeymapNew.vue}

@@ -1,7 +1,7 @@
 <template>
   <ui-stack-block
-    :has-children="false"
-    test-id="remote-console-keymap-stack-block"
+      :has-children="false"
+      test-id="remote-console-keymap-stack-block"
   >
     <template #stackBlockKey>
       <span class="mt-2">{{ localization.common.keymap }}</span>
@@ -9,7 +9,7 @@
     <template #stackBlockContent>
       <ui-select
         id="keymap-select"
-        v-model="model"
+        v-model="keymap"
         :items="props.keymapOptions"
         :disabled="props.disabled"
         width="auto"
@@ -25,7 +25,7 @@
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-const model = defineModel<string>({ required: true })
+const keymap = defineModel<string>('keymap', { required: true })
 
 const props = defineProps<{
   disabled: boolean
@@ -40,6 +40,6 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   width: 108px;
 }
 :deep(.stack-block-label .stack-block-content) {
-  flex: unset !important;
-}
+   flex: unset !important;
+ }
 </style>

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/{Old.vue → KeymapOld.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="model"
+            v-model="keymap"
             :disabled="props.disabled"
-            :data-value="model"
+            :data-value="keymap"
             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 model = defineModel<string>({ required: true })
+const keymap = defineModel<string>('keymap', { 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 model = defineModel<string>({ required: true })
+const password = defineModel<string>('password', { 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: model.value,
+    value: password.value,
     validations: [
       {
         value: 'password',
@@ -61,6 +61,7 @@ setForm()
 
 const showValidationErrors = (): void => {
   const valid = validation.touch()
+  console.log(valid, 111)
   passwordErrorText.value = !valid.isValid ? valid.errors.password[0] : ''
   emits('valid', valid.isValid)
 }
@@ -76,24 +77,24 @@ const setPasswordDisable = (): void => {
 
   removeValidationErrors()
   setForm()
-  model.value = ''
+  password.value = ''
 }
 
 const passwordErrorText = ref<string>('')
 
 const changePassword = (value: string): void => {
-  model.value = value
+  password.value = value
 
   showValidationErrors()
 }
 
-const isEnabledPassword = ref<boolean>(!!model.value)
+const isEnabledPassword = ref<boolean>(!!password.value)
 
 const onGeneratePassword = (): void => {
   const generatedPassword = generatePassword()
 
   form.value.password.value = generatedPassword
-  model.value = generatedPassword
+  password.value = generatedPassword
 
   showValidationErrors()
 }

package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/usbRedirection/UsbRedirection.vue

@@ -1,28 +1,28 @@
-<template>
-  <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-usb-redirection-new
-    v-if="isNewView"
-    v-model:usb-redirection="usbRedirection"
-    :usb-redirection-options="usbRedirectionOptions"
-  />
-  <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-usb-redirection-old
-    v-else
-    v-model:usb-redirection="usbRedirection"
-    :usb-redirection-options="usbRedirectionOptions"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import { usbRedirectionOptionsConfig } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/usbRedirection/lib/config/config'
-
-const usbRedirection = defineModel<number>('usbRedirection', { required: true })
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const usbRedirectionOptions = ref<UI_I_OptionItem[]>(
-  usbRedirectionOptionsConfig
-)
-</script>
-
-<style scoped></style>
+<template>
+  <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-usb-redirection-new
+    v-if="isNewView"
+    v-model:usb-redirection="usbRedirection"
+    :usb-redirection-options="usbRedirectionOptions"
+  />
+  <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-usb-redirection-old
+    v-else
+    v-model:usb-redirection="usbRedirection"
+    :usb-redirection-options="usbRedirectionOptions"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import { usbRedirectionOptionsConfig } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/usbRedirection/lib/config/config'
+
+const usbRedirection = defineModel<number>('usbRedirection', { required: true })
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const usbRedirectionOptions = ref<UI_I_OptionItem[]>(
+  usbRedirectionOptionsConfig
+)
+</script>
+
+<style scoped></style>

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

@@ -1,42 +1,60 @@
-<template>
-  <common-vm-actions-common-customize-hardware-vmoptions-tools-new
-    v-if="isNewView"
-    v-model:balloon="model.balloon"
-    :disabled="isDisabled"
-  />
-  <common-vm-actions-common-customize-hardware-vmoptions-tools-old
-    v-else
-    v-model:balloon="model.balloon"
-    :disabled="isDisabled"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateVmData['options']['guest_tools']>({
-  required: true,
-})
-
-const props = withDefaults(
-  defineProps<{
-    isEdit: boolean
-    state?: string | number
-  }>(),
-  {
-    state: undefined,
-  }
-)
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const isDisabled = computed<boolean>(() => props.isEdit && props.state !== 1)
-</script>
-
-<style scoped lang="scss">
-#tools-1,
-#tools-2 {
-  margin: 0 4px 4px 0;
-}
-</style>
+<template>
+  <common-vm-actions-common-customize-hardware-vmoptions-tools-new
+    v-if="isNewView"
+    v-model:balloon="balloonLocal"
+    :disabled="isDisabled"
+  />
+  <common-vm-actions-common-customize-hardware-vmoptions-tools-old
+    v-else
+    v-model:balloon="balloonLocal"
+    :disabled="isDisabled"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_SendDataTools } from '~/components/common/vm/actions/common/customizeHardware/vmoptions/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 { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>
+
+<style scoped lang="scss">
+#tools-1,
+#tools-2 {
+  margin: 0 4px 4px 0;
+}
+</style>