bfg-common 1.5.325 → 1.5.327

package/components/common/vm/actions/add/lib/config/steps.ts

@@ -10,12 +10,13 @@ export const dynamicSteps = {
   selectComputeResource: 4,
   selectStorage: 5,
   selectOptions: 6,
-  compatibility: 7,
-  selectGuestOSMachineType: 8,
-  selectGuestOS: 9,
-  customizeHardware: 10,
-  customizeHardwareTemplate: 11,
-  readyComplete: 12,
+  selectOptionsForDeployment: 7,
+  compatibility: 8,
+  selectGuestOSMachineType: 9,
+  selectGuestOS: 10,
+  customizeHardware: 11,
+  customizeHardwareTemplate: 12,
+  readyComplete: 13,
 }
 
 export const stepsFunc = (
@@ -121,6 +122,17 @@ export const stepsFunc = (
       testId: 'vm-wizard-select-clone-options',
       fields: {},
     },
+    {
+      id: dynamicSteps.selectOptionsForDeployment,
+      stepName: '',
+      title: localization.common.selectOptionsTargetVm,
+      subTitle:
+      localization.common.chooseGuestOSInstalledVmAndMachineTypeUsedCreateVm,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-wizard-select-clone-options',
+      fields: {},
+    },
     {
       id: dynamicSteps.compatibility,
       stepName: '',
@@ -226,7 +238,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.selectTemplate,
     dynamicSteps.selectName,
     dynamicSteps.selectStorage,
-    dynamicSteps.selectOptions,
+    dynamicSteps.selectOptionsForDeployment,
     dynamicSteps.readyComplete,
   ],
   // Deploy from template with Customize the operating system (Procurator)
@@ -235,7 +247,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.selectTemplate,
     dynamicSteps.selectName,
     dynamicSteps.selectStorage,
-    dynamicSteps.selectOptions,
+    dynamicSteps.selectOptionsForDeployment,
     dynamicSteps.selectGuestOSMachineType,
     dynamicSteps.readyComplete,
   ],
@@ -245,7 +257,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.selectTemplate,
     dynamicSteps.selectName,
     dynamicSteps.selectStorage,
-    dynamicSteps.selectOptions,
+    dynamicSteps.selectOptionsForDeployment,
     dynamicSteps.customizeHardwareTemplate,
     dynamicSteps.readyComplete,
   ],
@@ -255,7 +267,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.selectTemplate,
     dynamicSteps.selectName,
     dynamicSteps.selectStorage,
-    dynamicSteps.selectOptions,
+    dynamicSteps.selectOptionsForDeployment,
     dynamicSteps.selectGuestOSMachineType,
     dynamicSteps.customizeHardwareTemplate,
     dynamicSteps.readyComplete,

package/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/config/dropdownItems.ts

@@ -1,153 +1,155 @@
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_DropdownTreeItem } from '~/components/atoms/dropdown/tree/lib/models/interfaces'
-import type { UI_I_PciDevice } from '~/lib/models/store/vm/interfaces'
-
-export const dropdownItemsFunc = (
-  localization: UI_I_Localization,
-  state: string | number | undefined,
-  passthroughDevices?: UI_I_PciDevice[],
-  mediatedDevices?: any[]
-): UI_I_DropdownTreeItem[] => {
-  const { $text } = useNuxtApp()
-
-  return [
-    {
-      text: localization.common.disksDrivesStorage,
-      children: [
-        {
-          text: $text.toCapitalizeEveryWord(localization.common.hardDisk),
-          value: 1,
-          testId: 'disks-drives-storage',
-        },
-        {
-          text: $text.toCapitalizeEveryWord(
-            localization.common.existingHardDisk
-          ),
-          value: 2,
-          testId: 'existing-hard-disk',
-        },
-        // { text: 'RDM Disk', value: 2 },
-        // { text: 'Host USB Device', value: 3 },
-        // { text: 'NVDIMM', value: 4 },
-        {
-          text: localization.common.cdDvdDrive,
-          value: 5,
-          testId: 'cd-dvd-drive',
-        },
-      ],
-    },
-    // {
-    //   text: 'Controllers',
-    //   children: [
-    //     { text: 'NVMe Controller', value: 6 },
-    //     { text: 'SATA Controller', value: 7 },
-    //     { text: 'SCSI Controller', value: 8 },
-    //     { text: 'USB Controller', value: 9 },
-    //   ],
-    // },
-    {
-      text:  localization.common.otherDevices,
-      children: [
-        {
-          text: localization.common.pciDevice,
-          value: 10,
-          disabled:
-            state === 2 ||
-            (!passthroughDevices?.length && !mediatedDevices?.length),
-          testId: 'pci-device',
-        },
-        // { text: 'Watchdog Timer', value: 11 },
-        // { text: 'Precision Clock', value: 12 },
-        // { text: 'Serial Port', value: 13 },
-      ],
-    },
-    {
-      text: localization.common.network,
-      children: [
-        {
-          text: $text.toCapitalizeEveryWord(localization.common.networkAdapter),
-          value: 14,
-          testId: 'network-adapter',
-        },
-      ],
-    },
-  ]
-}
-
-export const dropdownItemsNewFunc = (
-  localization: UI_I_Localization,
-  state: string | number | undefined,
-  passthroughDevices?: UI_I_PciDevice[],
-  mediatedDevices?: any
-): UI_I_Dropdown[] => {
-  const { $text } = useNuxtApp()
-
-  return [
-    {
-      text: localization.common.disksDrivesStorage,
-      value: -1,
-      divider: true,
-      items: [
-        {
-          text: $text.toCapitalizeEveryWord(localization.common.hardDisk),
-          value: 1,
-          testId: 'disks-drives-storage',
-        },
-        {
-          text: $text.toCapitalizeEveryWord(
-            localization.common.existingHardDisk
-          ),
-          value: 2,
-          testId: 'existing-hard-disk',
-        },
-        // { text: 'RDM Disk', value: 2 },
-        // { text: 'Host USB Device', value: 3 },
-        // { text: 'NVDIMM', value: 4 },
-        {
-          text: localization.common.cdDvdDrive,
-          value: 5,
-          testId: 'cd-dvd-drive',
-        },
-      ],
-    },
-    // {
-    //   text: 'Controllers',
-    //   children: [
-    //     { text: 'NVMe Controller', value: 6 },
-    //     { text: 'SATA Controller', value: 7 },
-    //     { text: 'SCSI Controller', value: 8 },
-    //     { text: 'USB Controller', value: 9 },
-    //   ],
-    // },
-    {
-      text: localization.common.otherDevices,
-      value: -1,
-      divider: true,
-      items: [
-        {
-          text: localization.common.pciDevice,
-          value: 10,
-          disabled:
-            state === 2 ||
-            (!passthroughDevices?.length && !mediatedDevices?.length),
-          testId: 'pci-device',
-        },
-        // { text: 'Watchdog Timer', value: 11 },
-        // { text: 'Precision Clock', value: 12 },
-        // { text: 'Serial Port', value: 13 },
-      ],
-    },
-    {
-      text: localization.common.network,
-      value: -1,
-      items: [
-        {
-          text: $text.toCapitalizeEveryWord(localization.common.networkAdapter),
-          value: 14,
-          testId: 'network-adapter',
-        },
-      ],
-    },
-  ]
-}
+import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_DropdownTreeItem } from '~/components/atoms/dropdown/tree/lib/models/interfaces'
+import type { UI_I_PciDevice } from '~/lib/models/store/vm/interfaces'
+
+export const dropdownItemsFunc = (
+  localization: UI_I_Localization,
+  state: string | number | undefined,
+  passthroughDevices?: UI_I_PciDevice[],
+  mediatedDevices?: any[]
+): UI_I_DropdownTreeItem[] => {
+  const { $text } = useNuxtApp()
+
+  return [
+    {
+      text: localization.common.disksDrivesStorage,
+      children: [
+        {
+          text: $text.toCapitalizeEveryWord(localization.common.hardDisk),
+          value: 1,
+          testId: 'disks-drives-storage',
+        },
+        {
+          text: $text.toCapitalizeEveryWord(
+            localization.common.existingHardDisk
+          ),
+          value: 2,
+          testId: 'existing-hard-disk',
+        },
+        // { text: 'RDM Disk', value: 2 },
+        // { text: 'Host USB Device', value: 3 },
+        // { text: 'NVDIMM', value: 4 },
+        {
+          text: localization.common.cdDvdDrive,
+          value: 5,
+          testId: 'cd-dvd-drive',
+        },
+      ],
+    },
+    // {
+    //   text: 'Controllers',
+    //   children: [
+    //     { text: 'NVMe Controller', value: 6 },
+    //     { text: 'SATA Controller', value: 7 },
+    //     { text: 'SCSI Controller', value: 8 },
+    //     { text: 'USB Controller', value: 9 },
+    //   ],
+    // },
+    // TODO 700
+    // {
+    //   text:  localization.common.otherDevices,
+    //   children: [
+    //     {
+    //       text: localization.common.pciDevice,
+    //       value: 10,
+    //       disabled:
+    //         state === 2 ||
+    //         (!passthroughDevices?.length && !mediatedDevices?.length),
+    //       testId: 'pci-device',
+    //     },
+    //     // { text: 'Watchdog Timer', value: 11 },
+    //     // { text: 'Precision Clock', value: 12 },
+    //     // { text: 'Serial Port', value: 13 },
+    //   ],
+    // },
+    {
+      text: localization.common.network,
+      children: [
+        {
+          text: $text.toCapitalizeEveryWord(localization.common.networkAdapter),
+          value: 14,
+          testId: 'network-adapter',
+        },
+      ],
+    },
+  ]
+}
+
+export const dropdownItemsNewFunc = (
+  localization: UI_I_Localization,
+  state: string | number | undefined,
+  passthroughDevices?: UI_I_PciDevice[],
+  mediatedDevices?: any
+): UI_I_Dropdown[] => {
+  const { $text } = useNuxtApp()
+
+  return [
+    {
+      text: localization.common.disksDrivesStorage,
+      value: -1,
+      divider: true,
+      items: [
+        {
+          text: $text.toCapitalizeEveryWord(localization.common.hardDisk),
+          value: 1,
+          testId: 'disks-drives-storage',
+        },
+        {
+          text: $text.toCapitalizeEveryWord(
+            localization.common.existingHardDisk
+          ),
+          value: 2,
+          testId: 'existing-hard-disk',
+        },
+        // { text: 'RDM Disk', value: 2 },
+        // { text: 'Host USB Device', value: 3 },
+        // { text: 'NVDIMM', value: 4 },
+        {
+          text: localization.common.cdDvdDrive,
+          value: 5,
+          testId: 'cd-dvd-drive',
+        },
+      ],
+    },
+    // {
+    //   text: 'Controllers',
+    //   children: [
+    //     { text: 'NVMe Controller', value: 6 },
+    //     { text: 'SATA Controller', value: 7 },
+    //     { text: 'SCSI Controller', value: 8 },
+    //     { text: 'USB Controller', value: 9 },
+    //   ],
+    // },
+    // TODO 700
+    // {
+    //   text: localization.common.otherDevices,
+    //   value: -1,
+    //   divider: true,
+    //   items: [
+    //     {
+    //       text: localization.common.pciDevice,
+    //       value: 10,
+    //       disabled:
+    //         state === 2 ||
+    //         (!passthroughDevices?.length && !mediatedDevices?.length),
+    //       testId: 'pci-device',
+    //     },
+    //     // { text: 'Watchdog Timer', value: 11 },
+    //     // { text: 'Precision Clock', value: 12 },
+    //     // { text: 'Serial Port', value: 13 },
+    //   ],
+    // },
+    {
+      text: localization.common.network,
+      value: -1,
+      items: [
+        {
+          text: $text.toCapitalizeEveryWord(localization.common.networkAdapter),
+          value: 14,
+          testId: 'network-adapter',
+        },
+      ],
+    },
+  ]
+}

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

@@ -19,10 +19,11 @@
       @invalid="remoteConsoleOptionsInvalid = $event"
       @remove-error-by-title="emits('remove-error-by-title', $event)"
     />
-    <common-vm-actions-common-customize-hardware-vmoptions-tools
-      :tools="props.options?.guest_tools?.enabled"
-      @send-data="emits('send-data-tools', $event)"
-    />
+<!--    TODO 700-->
+<!--    <common-vm-actions-common-customize-hardware-vmoptions-tools-->
+<!--      :tools="props.options?.guest_tools?.enabled"-->
+<!--      @send-data="emits('send-data-tools', $event)"-->
+<!--    />-->
     <common-vm-actions-common-customize-hardware-vmoptions-boot-options
       :error-validation-fields="props.errorValidationFields"
       :hard-disks="props.hardDisks"
@@ -101,7 +102,8 @@ const emits = defineEmits<{
     event: 'send-data-remote-console-options',
     value: UI_I_SendDataRemoteConsoleOptions
   ): void
-  (event: 'send-data-tools', value: UI_I_SendDataTools): void
+  // TODO 700
+  // (event: 'send-data-tools', value: UI_I_SendDataTools): void
   (event: 'send-data-boot-options', value: UI_I_SendDataBootOptions): void
   (event: 'remove-error-by-title', value: string): void
 }>()

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

@@ -21,10 +21,11 @@
           @invalid="remoteConsoleOptionsInvalid = $event"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
         />
-        <common-vm-actions-common-customize-hardware-vmoptions-tools
-          :tools="props.options?.guest_tools?.enabled"
-          @send-data="emits('send-data-tools', $event)"
-        />
+<!--        TODO 700-->
+<!--        <common-vm-actions-common-customize-hardware-vmoptions-tools-->
+<!--          :tools="props.options?.guest_tools?.enabled"-->
+<!--          @send-data="emits('send-data-tools', $event)"-->
+<!--        />-->
         <common-vm-actions-common-customize-hardware-vmoptions-boot-options
           :error-validation-fields="props.errorValidationFields"
           :hard-disks="props.hardDisks"
@@ -97,7 +98,8 @@ const emits = defineEmits<{
     event: 'send-data-remote-console-options',
     value: UI_I_SendDataRemoteConsoleOptions
   ): void
-  (event: 'send-data-tools', value: UI_I_SendDataTools): void
+  // TODO 700
+  // (event: 'send-data-tools', value: UI_I_SendDataTools): void
   (event: 'send-data-boot-options', value: UI_I_SendDataBootOptions): void
   (event: 'remove-error-by-title', value: string): void
 }>()

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

@@ -102,11 +102,12 @@
         v-model:usb-redirection="usbRedirection"
         :disabled="props.isDisabled"
       />
-      <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-folder-sharing
-        v-if="remoteConsoleType === 'spice'"
-        v-model:folder-sharing="folderSharing"
-        :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>
@@ -127,7 +128,8 @@ const fileTransfer = defineModel<boolean>('fileTransfer', { required: true })
 const usbRedirection = defineModel<number>('usbRedirection', {
   required: true,
 })
-const folderSharing = defineModel<boolean>('folderSharing', { required: true })
+// TODO 700
+// const folderSharing = defineModel<boolean>('folderSharing', { required: true })
 
 const props = defineProps<{
   // TODO возможно вернем, НЕ УДАЛЯТЬ

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

@@ -98,11 +98,12 @@
           v-model:usb-redirection="usbRedirection"
           :disabled="props.isDisabled"
         />
-        <common-vm-actions-common-customize-hardware-vmoptions-remote-console-options-folder-sharing
-          v-if="remoteConsoleType === 'spice'"
-          v-model:folder-sharing="folderSharing"
-          :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>
     </atoms-stack-block>
   </div>
@@ -124,7 +125,8 @@ const fileTransfer = defineModel<boolean>('fileTransfer', { required: true })
 const usbRedirection = defineModel<number>('usbRedirection', {
   required: true,
 })
-const folderSharing = defineModel<boolean>('folderSharing', { required: true })
+// TODO 700
+// const folderSharing = defineModel<boolean>('folderSharing', { required: true })
 
 const props = defineProps<{
   // TODO возможно вернем, НЕ УДАЛЯТЬ

package/components/common/vm/actions/common/select/options/Options.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="select-options">
+  <div :class="['select-options', {disabled: props.isCreateTemplate}]">
     <div class="checkbox">
       <input
         id="customize-os"
@@ -63,6 +63,11 @@ watch(selectedOptions, (newValue) => {
 .select-options {
   padding: 12px 0 0;
 
+  &.disabled {
+    input, label {
+      cursor: not-allowed;
+    }
+  }
   .checkbox {
     margin: 6px 0;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.325",
+  "version": "1.5.327",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",