bfg-common 1.5.573 → 1.5.575

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/OrderNew.vue

@@ -1,34 +1,33 @@
 <template>
   <ui-stack-block
-    :has-children="false"
-    test-id="boot-options-order-stack-block"
+      :has-children="false"
+      test-id="boot-options-order-stack-block"
   >
     <template #stackBlockKey>
       {{ localization.common.bootOrder }}
     </template>
     <template #stackBlockContent>
       <ui-drag-drop-list
-        :items="localBootList"
+        :items="props.bootList"
         :disabled="props.isDisabled"
         grab-item-key="text"
         @drop="emits('change-order', $event)"
         @grab="onGrab"
       >
         <template
-          v-for="(item, index) in localBootList"
+          v-for="(item, index) in props.bootList"
           :key="index"
           #[`leftSide${index}`]
         >
           <ui-checkbox
-            :model-value="item.isChecked"
+            v-model="item.isChecked"
             :test-id="item.testId"
             :disabled="props.isDisabled"
             size="md"
-            @update:model-value="onCheckboxChange(index, $event)"
           />
         </template>
         <template
-          v-for="(item, index) in localBootList"
+          v-for="(item, index) in props.bootList"
           :key="props.bootList.length + index"
           #[`rightSide${index}`]
         >
@@ -54,48 +53,14 @@ const props = defineProps<{
   bootList: UI_I_BootItem[]
   isDisabled: boolean
 }>()
-
 const emits = defineEmits<{
   (event: 'change-order', value: UI_I_DropEvent): void
-  (event: 'update:boot-list', value: UI_I_BootItem[]): void
 }>()
 
 const grabedItem = ref<any>(null)
-const localBootList = ref<UI_I_BootItem[]>([])
-
-// Синхронизируем с props
-watch(
-  () => props.bootList,
-  (newBootList) => {
-    localBootList.value = newBootList.map((item) => ({ ...item }))
-  },
-  { deep: true, immediate: true }
-)
-
 const onGrab = (item: any): void => {
   grabedItem.value = item
 }
-
-// Обработчик изменения чекбокса
-const onCheckboxChange = (index: number, isChecked: boolean): void => {
-  localBootList.value[index].isChecked = isChecked
-
-  // Сохраняем порядок при изменении чекбокса
-  let currentOrder = 1
-  localBootList.value.forEach((item) => {
-    if (item.isChecked) {
-      item.order = currentOrder++
-    } else {
-      item.order = 0
-    }
-  })
-
-  // Сортируем список
-  localBootList.value.sort((a, b) => a.order - b.order)
-
-  // Отправляем обновленный список родителю
-  emits('update:boot-list', localBootList.value)
-}
 </script>
 
 <style scoped lang="scss">

package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/OrderOld.vue

@@ -1,36 +1,34 @@
 <template>
   <div class="boot-orders">
     <atoms-stack-block
-      :has-children="false"
-      test-id="boot-options-order-stack-block"
+        :has-children="false"
+        test-id="boot-options-order-stack-block"
     >
       <template #stackBlockKey>
         {{ localization.common.bootOrder }}
       </template>
       <template #stackBlockContent>
         <atoms-list-drag-drop-list
-          :items="localBootList"
+          :items="props.bootList"
           :disabled="props.isDisabled"
           grab-item-key="text"
           @drop="emits('change-order', $event)"
         >
           <template
-            v-for="(item, index) in localBootList"
+            v-for="(item, index) in props.bootList"
             :key="index"
             #[`leftSide${index}`]
           >
             <input
               :id="`boot-order-${index}`"
-              :key="item.name"
-              :checked="item.isChecked"
+              v-model="item.isChecked"
               :data-id="item.testId"
               :disabled="props.isDisabled"
               type="checkbox"
-              @change="onCheckboxChange(index, $event)"
             />
           </template>
           <template
-            v-for="(item, index) in localBootList"
+            v-for="(item, index) in props.bootList"
             :key="props.bootList.length + index"
             #[`rightSide${index}`]
           >
@@ -54,45 +52,9 @@ const props = defineProps<{
   bootList: UI_I_BootItem[]
   isDisabled: boolean
 }>()
-
 const emits = defineEmits<{
   (event: 'change-order', value: UI_I_DropEvent): void
-  (event: 'update:boot-list', value: UI_I_BootItem[]): void
 }>()
-
-// Локальная копия для реактивных изменений
-const localBootList = ref<UI_I_BootItem[]>([])
-
-// Синхронизируем с props
-watch(
-  () => props.bootList,
-  (newBootList) => {
-    localBootList.value = newBootList.map((item) => ({ ...item }))
-  },
-  { deep: true, immediate: true }
-)
-
-// Обработчик изменения чекбокса
-const onCheckboxChange = (index: number, event: Event): void => {
-  const target = event.target as HTMLInputElement
-  localBootList.value[index].isChecked = target.checked
-
-  // Сохраняем порядок при изменении чекбокса
-  let currentOrder = 1
-  localBootList.value.forEach((item) => {
-    if (item.isChecked) {
-      item.order = currentOrder++
-    } else {
-      item.order = 0
-    }
-  })
-
-  // Сортируем список
-  localBootList.value.sort((a, b) => a.order - b.order)
-
-  // Отправляем обновленный список родителю
-  emits('update:boot-list', localBootList.value)
-}
 </script>
 
 <style scoped lang="scss">

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

@@ -1,7 +1,10 @@
 <template>
   <common-vm-actions-common-customize-hardware-vmoptions-general-options-new
     v-if="isNewView"
-    v-model="model"
+    v-model:vm-name="vmName"
+    v-model:guest-machine-type="guestMachineType"
+    v-model:guest-os-family="guestOsFamily"
+    v-model:guest-os-version="guestOsVersion"
     v-model:block-is-open="blockIsOpen"
     :name-label="nameLabel"
     :is-disabled="isDisabled"
@@ -12,7 +15,10 @@
   />
   <common-vm-actions-common-customize-hardware-vmoptions-general-options-old
     v-else
-    v-model="model"
+    v-model:vm-name="vmName"
+    v-model:guest-machine-type="guestMachineType"
+    v-model:guest-os-family="guestOsFamily"
+    v-model:guest-os-version="guestOsVersion"
     v-model:block-is-open="blockIsOpen"
     :name-label="nameLabel"
     :is-disabled="isDisabled"
@@ -26,10 +32,19 @@
 <script setup lang="ts">
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
 import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
 
-const model = defineModel<UI_I_CreateVmData>({ required: true })
+const vmName = defineModel<string>('vmName', { required: true })
+const guestMachineType = defineModel<UI_I_OptionItem | null>(
+  'guestMachineType',
+  { required: true }
+)
+const guestOsFamily = defineModel<UI_I_OptionItem | null>('guestOsFamily', {
+  required: true,
+})
+const guestOsVersion = defineModel<UI_I_OptionItem | null>('guestOsVersion', {
+  required: true,
+})
 
 const props = withDefaults(
   defineProps<{
@@ -56,18 +71,18 @@ const machineTypeOptions = ref<UI_I_OptionItem[]>(
 
 const osOptions = ref<UI_I_OptionItem[]>(capabilities.value.guestOsFamilies)
 const onChangeOS = (): void => {
-  model.value.guest_os_version = versionsOptions.value[0].value
+  guestOsVersion.value = versionsOptions.value[0]
 }
 
 const versionsOptions = computed<UI_I_OptionItem[]>(() => {
-  if (!model.value.guest_os_family) return []
+  if (!guestOsFamily.value) return []
 
-  return capabilities.value.guestOsVersions[model.value.guest_os_family.value] || []
+  return capabilities.value.guestOsVersions[guestOsFamily.value.value] || []
 })
 watch(
   versionsOptions,
   () => {
-    model.value.guest_os_version = versionsOptions.value[0].value
+    guestOsVersion.value = versionsOptions.value[0]
   }
   // { immediate: true }
 )

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

@@ -19,13 +19,13 @@
     <template #stackBlockContent>
       <div v-show="!blockIsOpen" class="vm-name-wrap">
         <span class="vsphere-icon-vm"></span>
-        <span data-id="header-vm-name">{{ model.name || '--' }}</span>
+        <span data-id="header-vm-name">{{ vmName || '--' }}</span>
       </div>
     </template>
     <template #stackChildren>
       <ui-stack-block
-        :has-children="false"
-        test-id="general-options-vm-name-stack-block"
+          :has-children="false"
+          test-id="general-options-vm-name-stack-block"
       >
         <template #stackBlockKey>
           {{ props.nameLabel }}
@@ -33,30 +33,30 @@
         <template #stackBlockContent>
           <div class="vm-name-wrap">
             <span class="vsphere-icon-vm"></span>
-            <span data-id="new-vm-name">{{ model.name || '--' }}</span>
+            <span data-id="new-vm-name">{{ vmName || '--' }}</span>
           </div>
-          <!--            <span v-if="!props.isEdit">{{ model.name }}</span>-->
+          <!--            <span v-if="!props.isEdit">{{ vmName }}</span>-->
           <!--            <input-->
           <!--              v-else-->
           <!--              id="general-option-vm-name"-->
-          <!--              v-models="model.name"-->
+          <!--              v-models="vmName"-->
           <!--              type="text"-->
           <!--            />-->
         </template>
       </ui-stack-block>
 
       <ui-stack-block
-        :has-children="false"
-        test-id="general-options-machine-type-stack-block"
+          :has-children="false"
+          test-id="general-options-machine-type-stack-block"
       >
         <template #stackBlockKey>
           <span class="mt-2">{{ localization.common.machineType }}</span>
         </template>
         <template #stackBlockContent>
           <ui-select
-            v-if="model.machine_type"
+            v-if="guestMachineType"
             id="guest-machine-type-select"
-            v-model="model.machine_type"
+            v-model="guestMachineType"
             :items="props.machineTypeOptions"
             :disabled="props.isDisabled"
             width="auto"
@@ -68,17 +68,17 @@
       </ui-stack-block>
 
       <ui-stack-block
-        :has-children="false"
-        test-id="general-options-guest-os-family-stack-block"
+          :has-children="false"
+          test-id="general-options-guest-os-family-stack-block"
       >
         <template #stackBlockKey>
           <span class="mt-2">{{ localization.common.guestOsFamily }}</span>
         </template>
         <template #stackBlockContent>
           <ui-select
-            v-if="model.guest_os_family"
+            v-if="guestOsFamily"
             id="guest-os-family-select"
-            v-model="model.guest_os_family"
+            v-model="guestOsFamily"
             :items="props.osOptions"
             :disabled="props.isDisabled"
             width="auto"
@@ -91,17 +91,17 @@
       </ui-stack-block>
 
       <ui-stack-block
-        :has-children="false"
-        test-id="general-options-guest-os-version-stack-block"
+          :has-children="false"
+          test-id="general-options-guest-os-version-stack-block"
       >
         <template #stackBlockKey>
           <span class="mt-2">{{ localization.common.guestOsVersion }}</span>
         </template>
         <template #stackBlockContent>
           <ui-select
-            v-if="model.guest_os_version"
+            v-if="guestOsVersion"
             id="guest-os-version-select"
-            v-model="model.guest_os_version"
+            v-model="guestOsVersion"
             :items="props.versionsOptions"
             :disabled="props.isDisabled"
             width="auto"
@@ -118,11 +118,21 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateVmData>({ required: true })
 
 const blockIsOpen = defineModel<boolean>('blockIsOpen', { required: true })
+const vmName = defineModel<string>('vmName', { required: true })
+const guestMachineType = defineModel<UI_I_OptionItem | null>(
+  'guestMachineType',
+  {
+    required: true,
+  }
+)
+const guestOsFamily = defineModel<UI_I_OptionItem | null>('guestOsFamily', {
+  required: true,
+})
+const guestOsVersion = defineModel<UI_I_OptionItem | null>('guestOsVersion', {
+  required: true,
+})
 
 const props = defineProps<{
   isDisabled: boolean

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

@@ -15,44 +15,42 @@
         </div>
       </template>
       <template #stackBlockContent>
-        <div v-show="!blockIsOpen" data-id="header-vm-name">
-          {{ props.nameLabel }}: {{ model.name }}
-        </div>
+        <div v-show="!blockIsOpen" data-id="header-vm-name">{{ props.nameLabel }}: {{ vmName }}</div>
       </template>
       <template #stackChildren>
         <atoms-stack-block
-          :has-children="false"
-          test-id="general-options-vm-name-stack-block"
+            :has-children="false"
+            test-id="general-options-vm-name-stack-block"
         >
           <template #stackBlockKey>
             {{ props.nameLabel }}
           </template>
           <template #stackBlockContent>
-            <span data-id="vm-name">{{ model.name }}</span>
-            <!--            <span v-if="!props.isEdit">{{ model.name }}</span>-->
+            <span data-id="vm-name">{{ vmName }}</span>
+            <!--            <span v-if="!props.isEdit">{{ vmName }}</span>-->
             <!--            <input-->
             <!--              v-else-->
             <!--              id="general-option-vm-name"-->
-            <!--              v-models="model.name"-->
+            <!--              v-models="vmName"-->
             <!--              type="text"-->
             <!--            />-->
           </template>
         </atoms-stack-block>
 
         <atoms-stack-block
-          :has-children="false"
-          test-id="general-options-machine-type-stack-block"
+            :has-children="false"
+            test-id="general-options-machine-type-stack-block"
         >
           <template #stackBlockKey>
             {{ localization.common.machineType }}
           </template>
           <template #stackBlockContent>
             <select
-              v-if="model.machine_type"
+              v-if="guestMachineType"
               id="guest-machine-type-select"
-              v-model="model.machine_type"
+              v-model="guestMachineType"
               :disabled="props.isDisabled"
-              :data-value="model.machine_type"
+              :data-value="guestMachineType?.value"
               data-id="guest-machine-type-select"
             >
               <option
@@ -68,19 +66,19 @@
         </atoms-stack-block>
 
         <atoms-stack-block
-          :has-children="false"
-          test-id="general-options-guest-os-family-stack-block"
+            :has-children="false"
+            test-id="general-options-guest-os-family-stack-block"
         >
           <template #stackBlockKey>
             {{ localization.common.guestOsFamily }}
           </template>
           <template #stackBlockContent>
             <select
-              v-if="model.guest_os_family"
+              v-if="guestOsFamily"
               id="guest-os-family-select"
-              v-model="model.guest_os_family"
+              v-model="guestOsFamily"
               :disabled="props.isDisabled"
-              :data-value="model.guest_os_family"
+              :data-value="guestOsFamily?.value"
               data-id="guest-os-family-select"
               @change="emits('change-os')"
             >
@@ -97,19 +95,19 @@
         </atoms-stack-block>
 
         <atoms-stack-block
-          :has-children="false"
-          test-id="general-options-guest-os-version-stack-block"
+            :has-children="false"
+            test-id="general-options-guest-os-version-stack-block"
         >
           <template #stackBlockKey>
             {{ localization.common.guestOsVersion }}
           </template>
           <template #stackBlockContent>
             <select
-              v-if="model.guest_os_version"
+              v-if="guestOsVersion"
               id="guest-os-version-select"
-              v-model="model.guest_os_version"
+              v-model="guestOsVersion"
               :disabled="props.isDisabled"
-              :data-value="model.guest_os_version"
+              :data-value="guestOsVersion?.value"
               data-id="guest-os-version-select"
             >
               <option
@@ -131,11 +129,21 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_CreateVmData } from '~/components/common/vm/actions/common/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateVmData>({ required: true })
 
 const blockIsOpen = defineModel<boolean>('blockIsOpen', { required: true })
+const vmName = defineModel<string>('vmName', { required: true })
+const guestMachineType = defineModel<UI_I_OptionItem | null>(
+  'guestMachineType',
+  {
+    required: true,
+  }
+)
+const guestOsFamily = defineModel<UI_I_OptionItem | null>('guestOsFamily', {
+  required: true,
+})
+const guestOsVersion = defineModel<UI_I_OptionItem | null>('guestOsVersion', {
+  required: true,
+})
 
 const props = withDefaults(
   defineProps<{

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

@@ -25,105 +25,111 @@
       <!--        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="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="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="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="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="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="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"-->
-      <!--        :disabled="props.isDisabled"-->
-      <!--      />-->
+<!--      TODO 700-->
+<!--      <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-folder-sharing-->
+<!--        v-if="remoteConsoleType === 'spice'"-->
+<!--        v-model:folder-sharing="folderSharing"-->
+<!--        :disabled="props.isDisabled"-->
+<!--      />-->
     </template>
   </ui-stack-block>
 </template>
 
 <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 возможно вернем, НЕ УДАЛЯТЬ