bfg-common 1.5.573 → 1.5.574

package/components/common/vm/actions/clone/Clone.vue

@@ -566,7 +566,8 @@ const vmForm = ref<UI_I_VmForm>({
 })
 
 const isLoadingComputeTree = ref<boolean>(false)
-const onChangeName = (_name: string, node: UI_I_TreeNode | null): void => {
+const onChangeName = (data: [string, UI_I_TreeNode | null]): void => {
+  const [_name, node] = data
   // vmForm.value.name = name
   if (isSphere.value) {
     vmForm.value.locationPath = node.id
@@ -693,6 +694,10 @@ const machineTypes = ref<UI_I_OptionItem[]>(capabilities.value.machineTypes)
 
 // Для сферы
 const computeResourcePath = ref<string>('')
+const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
+  emits('select-compute-resource-tree', node)
+  computeResourcePath.value = String(node.id)
+}
 watch(
   () => vmForm.value.computeResource,
   (newValue, oldValue) => {
@@ -700,12 +705,8 @@ watch(
       onSelectComputeResourceTree(newValue)
     }
   },
-  { deep: true }
+  { deep: true, immediate: true }
 )
-const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
-  emits('select-compute-resource-tree', node)
-  computeResourcePath.value = String(node.id)
-}
 
 // watch(vmSettings, (newValue) => {
 //   vmName.value = newValue?.name || ''

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardware.vue

@@ -36,6 +36,7 @@
     :vm-cpu-help-text-second="vmCpuHelpTextSecond"
     :compute-resource="props.computeResource"
     :compatibility-info="props.compatibilityInfo"
+    :network-value-prop="networkValueProp"
     @add-device="onAddDevice"
     @get-storage="emits('get-storage', $event)"
     @remove-network="onRemoveNetwork"
@@ -94,6 +95,7 @@
     :mediated-devices="mediatedDevices"
     :vm-cpu-help-text-second="vmCpuHelpTextSecond"
     :compute-resource="props.computeResource"
+    :network-value-prop="networkValueProp"
     @add-device="onAddDevice"
     @get-storage="emits('get-storage', $event)"
     @remove-network="onRemoveNetwork"
@@ -372,6 +374,7 @@ const onRollBackHardDisk = (index: number): void => {
   })
 }
 
+const networkValueProp = props.project === 'sphere' ? 'network' : 'net_bridge'
 const networksType = ref<UI_T_NetworkType[]>(['new'])
 const networksIndex = ref<number[]>([0])
 if (!model.value.network_devices?.length) {

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareNew.vue

@@ -162,7 +162,7 @@
         >
           <common-vm-actions-common-customize-hardware-virtual-hardware-new-network
             v-model:network="item.network"
-            v-model:net-bridge="item.net_bridge"
+            v-model:network-value="item[props.networkValueProp]"
             v-model:mac="item.mac"
             v-model:model="item.model"
             :index="props.networksIndex[key]"
@@ -172,6 +172,7 @@
             :is-edit="props.isEdit"
             :state="props.state"
             :project="props.project"
+            :network-value-prop="props.networkValueProp"
             @remove="emits('remove-network', props.networksIndex[key])"
             @invalid="
               emits('set-invalid-network', [$event, props.networksIndex[key]])
@@ -391,6 +392,7 @@ const props = withDefaults(
     cdDvdDrivesIndex: number[]
     errorValidationFields: UI_I_ErrorValidationField<string>[]
     getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+    networkValueProp: 'network' | 'net_bridge'
     cpu?: API_UI_I_VmEditCpu
     state?: string | number
     // hardDisks?: UI_I_SendDataNewHardDisk[] | null

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareOld.vue

@@ -142,7 +142,7 @@
         >
           <common-vm-actions-common-customize-hardware-virtual-hardware-new-network
             v-model:network="item.network"
-            v-model:net-bridge="item.net_bridge"
+            v-model:network-value="item[props.networkValueProp]"
             v-model:mac="item.mac"
             v-model:model="item.model"
             :index="props.networksIndex[key]"
@@ -152,6 +152,7 @@
             :is-edit="props.isEdit"
             :state="props.state"
             :project="props.project"
+            :network-value-prop="props.networkValueProp"
             @remove="emits('remove-network', props.networksIndex[key])"
             @invalid="
               emits('set-invalid-network', [$event, props.networksIndex[key]])
@@ -366,6 +367,7 @@ const props = withDefaults(
     cdDvdDrivesIndex: number[]
     errorValidationFields: UI_I_ErrorValidationField[]
     getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+    networkValueProp: 'network' | 'net_bridge'
     cpu?: API_UI_I_VmEditCpu
     state?: string | number
     videoCard?: UI_I_SendDataVideoCard

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

@@ -5,7 +5,7 @@ export const cdDvdDriveOptionsFunc = (
   localization: UI_I_Localization
 ): UI_I_OptionItem[] => {
   return [
-    { text: localization.common.clientDevice, value: 'clientDevice' },
+    { text: '---', value: 'clientDevice' },
     { text: localization.common.datastoreIsoFile, value: 'datastoreIsoFile' },
   ]
 }

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/NewNetwork.vue

@@ -1,7 +1,7 @@
 <template>
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-network-new
     v-if="isNewView"
-    v-model:selected-location="netBridge"
+    v-model:selected-location="networkValue"
     v-model:adapter-type="model"
     v-model:mac-address="mac"
     v-model:mac-address-type="macAddressType"
@@ -26,7 +26,7 @@
   />
   <common-vm-actions-common-customize-hardware-virtual-hardware-new-network-old
     v-else
-    v-model:selected-location="netBridge"
+    v-model:selected-location="networkValue"
     v-model:adapter-type="model"
     v-model:mac-address="mac"
     v-model:mac-address-type="macAddressType"
@@ -68,17 +68,6 @@ const network = defineModel<UI_I_CreateVmData['network_devices'][0]['network']>(
   'network',
   { required: true }
 )
-const netBridge = defineModel<
-  UI_I_CreateVmData['network_devices'][0]['net_bridge']
->('netBridge', { required: true })
-watch(netBridge, (newValue) => {
-  const selectedOption = locationOptions.value.find(
-    (option) => option.value === newValue
-  )
-  if (selectedOption) {
-    network.value = selectedOption.text
-  }
-})
 
 const mac = defineModel<UI_I_CreateVmData['network_devices'][0]['mac']>('mac', {
   required: true,
@@ -98,6 +87,7 @@ const props = withDefaults(
     networksTable: UI_I_NetworkTableItem[]
     errorValidationFields: UI_I_ErrorValidationField[]
     isEdit: boolean
+    networkValueProp: 'network' | 'net_bridge'
     state?: string | number
   }>(),
   {
@@ -111,11 +101,21 @@ const emits = defineEmits<{
   (event: 'get-networks-table', value: UI_I_TablePayload): void
 }>()
 
+const networkValue = defineModel<
+    UI_I_CreateVmData['network_devices'][0][props.networkValueProp]
+>('networkValue', { required: true })
+watch(networkValue, (newValue) => {
+  const selectedOption = locationOptions.value.find(
+      (option) => option.value === newValue
+  )
+  if (selectedOption) {
+    network.value = selectedOption.text
+  }
+})
+
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const valueProp = props.project === 'sphere' ? 'network' : 'net_bridge'
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const isRunning = computed<boolean>(() => {
@@ -144,9 +144,9 @@ const label = computed<string>(() => {
 const selectedLocationOld = ref<string>('')
 const locationOptions = ref<UI_I_OptionItem[]>([])
 
-if (netBridge.value) {
+if (networkValue.value) {
   locationOptions.value = [
-    { text: network.value, value: netBridge.value },
+    { text: network.value, value: networkValue.value },
     { text: `${localization.value.common.browse}...`, value: '' },
   ]
 }
@@ -188,23 +188,23 @@ watch(
           value: 'noAvailableNetworks',
         },
       ]
-      netBridge.value = 'noAvailableNetworks'
+      networkValue.value = 'noAvailableNetworks'
       newNetworkInvalid.value = true
       return
     }
     newNetworkInvalid.value = false
 
     const isExistValue = newValue.some(
-      (networkLocal) => networkLocal[valueProp] === netBridge.value
+      (networkLocal) => networkLocal[props.networkValueProp] === networkValue.value
     )
 
     if (props.type === 'edit' || isExistValue) return
 
-    selectedLocationOld.value = newValue[0][valueProp] || ''
-    netBridge.value = newValue[0][valueProp] || ''
+    selectedLocationOld.value = newValue[0][props.networkValueProp] || ''
+    networkValue.value = newValue[0][props.networkValueProp] || ''
 
     locationOptions.value = [
-      { text: newValue[0].name, value: newValue[0][valueProp] },
+      { text: newValue[0].name, value: newValue[0][props.networkValueProp] },
       { text: `${localization.value.common.browse}...`, value: '' },
     ]
   },
@@ -214,7 +214,7 @@ watch(
 const locationModalIsShow = ref<boolean>(false)
 const onHideLocationModal = (): void => {
   locationModalIsShow.value = false
-  netBridge.value = selectedLocationOld.value
+  networkValue.value = selectedLocationOld.value
 }
 const changeLocation = (event: UI_I_HTMLSelectElement): void => {
   const value = event.target.value
@@ -224,16 +224,16 @@ const changeLocation = (event: UI_I_HTMLSelectElement): void => {
   }
 
   selectedLocationOld.value = value
-  netBridge.value = value
+  networkValue.value = value
 }
 const onSelectLocation = (networkLocal: UI_I_NetworkTableItem): void => {
   locationModalIsShow.value = false
 
-  selectedLocationOld.value = networkLocal[valueProp]
-  netBridge.value = networkLocal[valueProp]
+  selectedLocationOld.value = networkLocal[props.networkValueProp]
+  networkValue.value = networkLocal[props.networkValueProp]
 
   const hasNetwork = locationOptions.value.some(
-    (option) => option.value === networkLocal[valueProp]
+    (option) => option.value === networkLocal[props.networkValueProp]
   )
   if (hasNetwork) {
     return
@@ -241,7 +241,7 @@ const onSelectLocation = (networkLocal: UI_I_NetworkTableItem): void => {
 
   locationOptions.value = [
     ...locationOptions.value.slice(0, -1),
-    { text: networkLocal.name, value: networkLocal[valueProp] },
+    { text: networkLocal.name, value: networkLocal[props.networkValueProp] },
     locationOptions.value[locationOptions.value.length - 1],
   ]
 }

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

@@ -17,6 +17,8 @@
     />
     <common-vm-actions-common-customize-hardware-vmoptions-tools
       v-model="model.options.guest_tools"
+      :is-edit="props.isEdit"
+      :state="props.state"
     />
     <common-vm-actions-common-customize-hardware-vmoptions-boot-options
       v-model="model"

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

@@ -19,6 +19,8 @@
         />
         <common-vm-actions-common-customize-hardware-vmoptions-tools
           v-model="model.options.guest_tools"
+          :is-edit="props.isEdit"
+          :state="props.state"
         />
         <common-vm-actions-common-customize-hardware-vmoptions-boot-options
           v-model="model"

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

@@ -1,26 +1,42 @@
-<template>
-  <common-vm-actions-common-customize-hardware-vmoptions-tools-new
-    v-if="isNewView"
-    v-model:tools="model.enabled"
-  />
-  <common-vm-actions-common-customize-hardware-vmoptions-tools-old
-    v-else
-    v-model:tools="model.enabled"
-  />
-</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 { $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>
+<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>

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

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

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

@@ -1,6 +1,5 @@
 <template>
-  <!--  TODO 700-->
-  <div v-show="false" class="hardware-tools">
+  <div class="hardware-tools">
     <atoms-stack-block test-id="tools-stack-block" has-children>
       <template #stackBlockKey>
         <div
@@ -12,31 +11,52 @@
         </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.toolsEnable }}
+            {{ localization.common.balloon }}
           </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>
+            <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>
           </template>
         </atoms-stack-block>
       </template>
@@ -47,14 +67,20 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-const tools = defineModel<boolean>('tools', { required: true })
+// const tools = defineModel<boolean>('tools', { required: true })
+const balloon = defineModel<boolean>('balloon', { required: true })
+
+const props = defineProps<{
+  disabled: boolean
+}>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 </script>
 
 <style scoped lang="scss">
 #tools-1,
-#tools-2 {
+#tools-2,
+#balloon {
   margin: 0 4px 4px 0;
 }
 </style>

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

@@ -179,6 +179,7 @@ export interface UI_I_CreateVmData {
     guest_tools: {
       enabled: boolean
       synchronized_time: boolean
+      balloon: boolean
     }
     boot_options: {
       firmware: string

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

@@ -44,6 +44,20 @@
         @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>
 
@@ -60,6 +74,9 @@ 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
@@ -68,6 +85,8 @@ 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,6 +91,35 @@
         <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>
 
@@ -107,6 +136,9 @@ 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
@@ -115,6 +147,8 @@ 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