bfg-common 1.5.64 → 1.5.66

package/components/common/vm/actions/clone/toTemplate/ToTemplate.vue

@@ -11,8 +11,8 @@
       @submit="onFinish"
     >
       <template #modalBody="{ selectedStep }">
-        <atoms-loader v-show="!vmSettings" id="loader" />
-        <div v-if="vmSettings" class="vm-context">
+        <atoms-loader v-show="!vmSettingsLocal" id="loader" />
+        <div v-if="vmSettingsLocal" class="vm-context">
           <common-pages-scheduled-tasks-modals-common-new-task-form
             v-show="selectedStep.id === dynamicSteps.scheduledTasks"
             v-model="newTaskForm"
@@ -31,35 +31,35 @@
             v-show="selectedStep.id === dynamicSteps.selectStorage"
             :storage-submit="storageSubmit"
             :datastore="props.datastore"
-            :storage="vmSettings.storage"
+            :storage="vmSettingsLocal.storage"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             @submit="onChangeStorage"
           />
           <common-vm-actions-common-customize-hardware
             v-show="selectedStep.id === dynamicSteps.customizeHardware"
             v-model:vm-name="vmName"
-            v-model:guest-machine-type="vmSettings.guestMachineType"
-            v-model:guest-os-family="vmSettings.guestOsFamily"
-            v-model:guest-os-version="vmSettings.guestOsVersion"
-            :storage="vmSettings.storage"
+            v-model:guest-machine-type="vmSettingsLocal.guestMachineType"
+            v-model:guest-os-family="vmSettingsLocal.guestOsFamily"
+            v-model:guest-os-version="vmSettingsLocal.guestOsVersion"
+            :storage="vmSettingsLocal.storage"
             :hard-disks-for-boot-options="virtualHardwareHardDisksLocal"
             :cd-dvd-drives-for-boot-options="virtualHardwareCdDvdDrivesLocal"
             :networks-for-boot-options="virtualHardwareNetworksLocal"
-            :cd-dvd-drives="vmSettings.cdDvdDrives"
-            :hard-disks="vmSettings.hardDisks"
-            :networks="vmSettings.networks"
+            :cd-dvd-drives="vmSettingsLocal.cdDvdDrives"
+            :hard-disks="vmSettingsLocal.hardDisks"
+            :networks="vmSettingsLocal.networks"
             :customize-hardware-submit="customizeHardwareSubmit"
-            :max-cpus="vmSettings.maxCpus"
-            :max-memory="vmSettings.maxMemory"
-            :cpu-models="vmSettings.cpuModels"
-            :cpu="vmSettings.cpu"
-            :memory="vmSettings.memory"
-            :video-card="vmSettings.videoCard"
-            :usb-controller="vmSettings.usbController"
-            :pci-devices="vmSettings.pciDevices"
+            :max-cpus="vmSettingsLocal.maxCpus"
+            :max-memory="vmSettingsLocal.maxMemory"
+            :cpu-models="vmSettingsLocal.cpuModels"
+            :cpu="vmSettingsLocal.cpu"
+            :memory="vmSettingsLocal.memory"
+            :video-card="vmSettingsLocal.videoCard"
+            :usb-controller="vmSettingsLocal.usbController"
+            :pci-devices="vmSettingsLocal.pciDevices"
             :selected-nav-item="selectedNavItem"
-            :hard-disks-for-edit="vmSettings.hardDisks"
-            :options="vmSettings.options"
+            :hard-disks-for-edit="vmSettingsLocal.hardDisks"
+            :options="vmSettingsLocal.options"
             :nodes="props.nodes"
             :files="props.files"
             :networks-table="props.networksTable"
@@ -120,7 +120,7 @@ import type {
 } from '~/lib/models/store/vm/interfaces'
 import type {
   I_DynamicSteps,
-  UI_I_VmForm,
+  // UI_I_VmForm,
 } from '~/components/common/vm/actions/clone/toTemplate/lib/models/interfaces'
 import type {
   UI_I_ValidationReturn,
@@ -396,23 +396,15 @@ const checkCustomizeHardware = async (
 }
 
 const storageIdCash = ref<string | null>(null)
-const vmForm = ref<UI_I_VmForm>({
-  name: '',
-  storage: null,
-  options: [],
-})
 const onChangeName = (name: string): void => {
-  vmForm.value.name = name
+  vmSettingsLocal.value && (vmSettingsLocal.value.name = name)
 }
 const onChangeStorage = (storage: UI_I_DatastoreTableItem | null): void => {
   if (!storage) return
 
-  vmForm.value.storage = storage
+  vmSettingsLocal.value && (vmSettingsLocal.value.storage = storage)
   storageIdCash.value = storage.id
 }
-const onChangeSelectOptions = (options: string[]): void => {
-  vmForm.value.options = options
-}
 const customizeHardware = ref<UI_I_SendDataCustomizeHardware | null>(null)
 const onChangeCustomizeHardware = (
   data: UI_I_SendDataCustomizeHardware
@@ -452,7 +444,7 @@ const isPowerOnByDefault = ref<boolean>(true)
 watch(
   () => props.vmNameInWizard,
   (newValue) => {
-    vmForm.value.name = newValue
+    vmSettingsLocal.value && (vmSettingsLocal.value.name = newValue)
   }
 )
 
@@ -463,7 +455,7 @@ const validateSendData = async (
   let stepHasError = false
 
   const data = await props.validateSendDataFunc(
-    vmForm.value,
+    vmSettingsLocal.value,
     virtualHardwareCpu.value,
     virtualHardwareMemory.value,
     customizeHardware.value,
@@ -489,7 +481,7 @@ const onFinish = (): void => {
   wizard.setLoader(false)
   props
     .finishFunc(
-      vmForm.value,
+      vmSettingsLocal.value,
       virtualHardwareCpu.value,
       virtualHardwareMemory.value,
       customizeHardware.value,
@@ -515,9 +507,9 @@ const storageSubmit = ref<null | Function>(null)
 const selectOptionsSubmit = ref<number>(0)
 const customizeHardwareSubmit = ref<null | Function>(null)
 
-const vmSettings = computed<UI_I_VmSettings | null>(() => props.vmSettings)
-const vmName = ref<string>(vmSettings.value?.name || '')
-watch(vmSettings, (newValue) => {
+const vmSettingsLocal = computed<UI_I_VmSettings | null>(() => props.vmSettings)
+const vmName = ref<string>(vmSettingsLocal.value?.name || '')
+watch(vmSettingsLocal, (newValue) => {
   vmName.value = newValue?.name || ''
 })
 

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/shares/Shares.vue

@@ -63,7 +63,7 @@ const apiErrorLocal = computed<string>(() => {
   )
 })
 
-const maxShares = 10_000
+const maxShares = 262_144
 const sharesOptions = computed<UI_I_OptionItem[]>(() => {
   return sharesOptionsFunc(localization.value, maxShares)
 })
@@ -73,7 +73,7 @@ const sharesTypeOptions = ref<UI_I_OptionItem[]>(
 )
 
 const isDisabledShares = computed<boolean>(
-  () => sharesTypeLocal.value !== '1' || props.disabled
+  () => sharesTypeLocal.value !== '2' || props.disabled
 )
 const sharesLocal = computed<string>({
   get() {
@@ -93,14 +93,14 @@ const sharesTypeLocal = computed<string>({
 })
 const onChangeSharesType = (event: UI_I_HTMLSelectElement): void => {
   const value = event.target.value
-  if (value === '1') return
+  if (value === '2') return
   sharesLocal.value = event.target.value
 }
 
 const sharesErrorLocalText = computed<string>(() => {
-  if (+sharesLocal.value < 1 || +sharesLocal.value > maxShares) {
+  if (+sharesLocal.value < 2 || +sharesLocal.value > maxShares) {
     return localization.value.common.sharesMustBe
-      .replace('{0}', '1')
+      .replace('{0}', '2')
       .replace('{1}', maxShares + '')
   }
 

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

@@ -7,8 +7,8 @@ export const sharesOptionsFunc = (
 ): UI_I_OptionItem[] => {
   return [
     {
-      text: `${localization.common.minimum} 1`,
-      value: 1,
+      text: `${localization.common.minimum} 2`,
+      value: 2,
     },
     {
       text: `${localization.common.maximum} ${maxShares}`,
@@ -23,6 +23,6 @@ export const sharesTypeOptionsFunc = (
     { text: localization.common.low, value: '1000' },
     { text: localization.common.normal, value: '2000' },
     { text: localization.common.high, value: '4000' },
-    { text: localization.common.custom, value: '1' },
+    { text: localization.common.custom, value: '2' },
   ]
 }

package/components/common/vm/actions/common/select/compatibility/Compatibility.vue

@@ -1,62 +1,21 @@
 <template>
-  <div class="select-compatibility">
-    <p class="select-compatibility-block">
-      {{ description }}
-    </p>
-    <div class="select-compatibility-block version-select-wrap">
-      <label for="version-select"
-        >{{ localization.common.compatibleWith }}:</label
-      >
-
-      <atoms-tooltip-error
-        :has-error="!!apiError"
-        selector="#vm-wizard-version-select"
-        @remove="onRemoveValidationError"
-      >
-        <template #elem>
-          <select
-            id="vm-wizard-version-select"
-            v-model="selectedVersion"
-            data-id="vm-wizard-version-select"
-          >
-            <option v-for="(item, key) in versions" :key="key" :value="item">
-              {{ item.text }}
-            </option>
-          </select>
-        </template>
-        <template #content>{{ apiError }}</template>
-      </atoms-tooltip-error>
-      <!--      <div id="version-select-help-icon" class="flex-align-center relative">-->
-      <!--        <atoms-the-icon-->
-      <!--          fill="#0072a3"-->
-      <!--          width="24px"-->
-      <!--          height="24px"-->
-      <!--          name="info-circle"-->
-      <!--          @click="isShowHelp = !isShowHelp"-->
-      <!--        />-->
-      <!--        <atoms-tooltip-signpost-->
-      <!--          v-if="isShowHelp"-->
-      <!--          elem-id="version-select-help-icon"-->
-      <!--          @hide="isShowHelp = false"-->
-      <!--        >-->
-      <!--          <h3 class="help-title">{{ localization.common.help }}</h3>-->
-
-      <!--          <p>-->
-      <!--            {{-->
-      <!--              localization.common.eachVirtualMachineCompatibilitySettingIncludesHardwareAvailableVirtualMachine-->
-      <!--            }}-->
-      <!--          </p>-->
-
-      <!--          <a id="more-information-link" class="pointer">{{-->
-      <!--            localization.common.moreInformation-->
-      <!--          }}</a>-->
-      <!--        </atoms-tooltip-signpost>-->
-      <!--      </div>-->
-    </div>
-    <p class="select-compatibility-block">
-      {{ versionDescription }}
-    </p>
-  </div>
+  <common-vm-actions-common-select-compatibility-new
+    v-if="isNewView"
+    v-model:selected-version="selectedVersion"
+    :versions="versions"
+    :description="description"
+    :api-error="apiError"
+    @remove-validation-error="onRemoveValidationError"
+  />
+  <common-vm-actions-common-select-compatibility-old
+    v-else
+    v-model:selected-version="selectedVersion"
+    :versions="versions"
+    :description="description"
+    :version-description="versionDescription"
+    :api-error="apiError"
+    @remove-validation-error="onRemoveValidationError"
+  />
 </template>
 
 <script setup lang="ts">
@@ -66,13 +25,16 @@ import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 const props = defineProps<{
   options: UI_I_OptionItem[]
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
+  errorValidationFields: UI_I_ErrorValidationField[]
 }>()
 const emits = defineEmits<{
   (event: 'change', value: UI_I_OptionItem): void
   (event: 'remove-error-by-title', value: string): void
 }>()
 
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const versions = ref<UI_I_OptionItem[]>(props.options)
@@ -135,28 +97,4 @@ const onRemoveValidationError = (): void => {
 </script>
 
 <style scoped lang="scss">
-.select-compatibility-block {
-  margin-top: 12px;
-  font-size: 13px;
-
-  &.version-select-wrap {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-
-    //#version-select-help-icon {
-    //  .help-title {
-    //    font-size: 22px;
-    //  }
-    //
-    //  p {
-    //    width: 200px;
-    //  }
-    //
-    //  a {
-    //    color: #0072a3;
-    //  }
-    //}
-  }
-}
 </style>

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

@@ -0,0 +1,165 @@
+<template>
+  <div class="select-compatibility pt-4">
+    <Teleport to="#compatibility-alert-wrapper">
+      <ui-alert
+        v-show="props.apiError.length"
+        status="alert-danger"
+        :messages="[props.apiError]"
+        test-id="storage-alert"
+        :items="[props.apiError]"
+        @remove="emits('remove-validation-error')"
+      />
+    </Teleport>
+    <h3 class="select-compatibility-description pb-4">
+      {{ props.description }}
+    </h3>
+    <div class="version-select-wrap flex">
+      <div
+        v-for="item in versionsLocal"
+        :key="item.value"
+        :class="[
+          'version-select',
+          {
+            selected: item.value === selectedVersionLocal,
+            disabled: item.disabled,
+          },
+        ]"
+        @click="selectedVersionLocal = item.value"
+      >
+        <ui-radio
+          v-model="selectedVersionLocal"
+          :label="item.text"
+          :value="item.value"
+          :test-id="item.testId"
+          :disabled="item.disabled"
+          size="md"
+        />
+
+        <p class="description">
+          {{ item.description }}
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const selectedVersion = defineModel<UI_I_OptionItem | null>('selectedVersion', {
+  required: true,
+})
+
+const props = defineProps<{
+  versions: UI_I_OptionItem[]
+  description: string
+  apiError: string
+}>()
+const emits = defineEmits<{
+  (event: 'remove-validation-error'): void
+}>()
+
+const selectedVersionLocal = computed<string>({
+  get() {
+    return selectedVersion.value?.value
+  },
+  set(newValue) {
+    selectedVersion.value =
+      props.versions.find((version) => version.value === newValue) || null
+  },
+})
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const getDescription = (version: any) => {
+  const versionValue = version.value.split('-')[1]
+  const text = version.text
+
+  if (version === props.versions.at(-1)) {
+    return localization.value.common.virtualMachineUsesHardwareVersionAvailable
+      .replace('{0}', versionValue)
+      .replace('{1}', text)
+  }
+
+  return localization.value.common.virtualMachineUsesHardwareVersionUnavailable
+    .replace('{0}', versionValue)
+    .replace('{1}', text)
+}
+const versionsLocal = computed(() => {
+  return props.versions.map((version) => {
+    return {
+      ...version,
+      description: getDescription(version),
+    }
+  })
+})
+</script>
+
+<style>
+:root {
+  --select-compatibility-bg-color: #ffffff;
+  --select-compatibility-border-color: #e9ebed;
+  --select-compatibility-border-hover-color: #d3d6da;
+  --select-compatibility-selected-bg-color: #f0f8fd;
+  --select-compatibility-selected-border-color: #008fd6;
+  --select-compatibility-description-color: #4d5d69;
+}
+:root.dark-theme {
+  --select-compatibility-bg-color: transparent;
+  --select-compatibility-border-color: #e9ebed1f;
+  --select-compatibility-border-hover-color: #e9ebed3d;
+  --select-compatibility-selected-bg-color: #2ba2de14;
+  --select-compatibility-selected-border-color: #2ba2de;
+  --select-compatibility-description-color: #e9eaec;
+}
+</style>
+<style scoped lang="scss">
+.select-compatibility {
+  container-type: inline-size;
+
+  .select-compatibility-description {
+    font-size: 13px;
+    color: var(--select-compatibility-description-color);
+  }
+
+  .version-select-wrap {
+    gap: 12px;
+
+    .version-select {
+      background-color: var(--select-compatibility-bg-color);
+      border: 1px solid var(--select-compatibility-border-color);
+      padding: 12px;
+      border-radius: 8px;
+
+      &:not(.selected):not(.disabled) {
+        cursor: pointer;
+        &:hover {
+          border-color: var(--select-compatibility-border-hover-color);
+        }
+      }
+
+      &.selected {
+        background-color: var(--select-compatibility-selected-bg-color);
+        border: 1.5px solid var(--select-compatibility-selected-border-color);
+      }
+
+      .description {
+        font-size: 13px;
+        color: #9da6ad;
+        margin: 8px 0 0 28px;
+      }
+
+      :deep(.radio-label) {
+        align-items: flex-start;
+      }
+    }
+  }
+
+  @container (max-width: 600px) {
+    .version-select-wrap {
+      flex-direction: column;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,107 @@
+<template>
+  <div class="select-compatibility">
+    <p class="select-compatibility-block">
+      {{ props.description }}
+    </p>
+    <div class="select-compatibility-block version-select-wrap">
+      <label for="version-select"
+      >{{ localization.common.compatibleWith }}:</label
+      >
+
+      <atoms-tooltip-error
+          :has-error="!!props.apiError"
+          selector="#vm-wizard-version-select"
+          @remove="emits('remove-validation-error')"
+      >
+        <template #elem>
+          <select
+              id="vm-wizard-version-select"
+              v-model="selectedVersion"
+              data-id="vm-wizard-version-select"
+          >
+            <option v-for="(item, key) in props.versions" :key="key" :value="item">
+              {{ item.text }}
+            </option>
+          </select>
+        </template>
+        <template #content>{{ props.apiError }}</template>
+      </atoms-tooltip-error>
+      <!--      <div id="version-select-help-icon" class="flex-align-center relative">-->
+      <!--        <atoms-the-icon-->
+      <!--          fill="#0072a3"-->
+      <!--          width="24px"-->
+      <!--          height="24px"-->
+      <!--          name="info-circle"-->
+      <!--          @click="isShowHelp = !isShowHelp"-->
+      <!--        />-->
+      <!--        <atoms-tooltip-signpost-->
+      <!--          v-if="isShowHelp"-->
+      <!--          elem-id="version-select-help-icon"-->
+      <!--          @hide="isShowHelp = false"-->
+      <!--        >-->
+      <!--          <h3 class="help-title">{{ localization.common.help }}</h3>-->
+
+      <!--          <p>-->
+      <!--            {{-->
+      <!--              localization.common.eachVirtualMachineCompatibilitySettingIncludesHardwareAvailableVirtualMachine-->
+      <!--            }}-->
+      <!--          </p>-->
+
+      <!--          <a id="more-information-link" class="pointer">{{-->
+      <!--            localization.common.moreInformation-->
+      <!--          }}</a>-->
+      <!--        </atoms-tooltip-signpost>-->
+      <!--      </div>-->
+    </div>
+    <p class="select-compatibility-block">
+      {{ props.versionDescription }}
+    </p>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const selectedVersion = defineModel<UI_I_OptionItem | null>('selectedVersion', {required: true})
+
+const props = defineProps<{
+  versions: UI_I_OptionItem[]
+  description: string
+  versionDescription: string
+  apiError: string
+}>()
+const emits = defineEmits<{
+  (event: 'remove-validation-error'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+</script>
+
+<style scoped lang="scss">
+.select-compatibility-block {
+  margin-top: 12px;
+  font-size: 13px;
+
+  &.version-select-wrap {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+
+    //#version-select-help-icon {
+    //  .help-title {
+    //    font-size: 22px;
+    //  }
+    //
+    //  p {
+    //    width: 200px;
+    //  }
+    //
+    //  a {
+    //    color: #0072a3;
+    //  }
+    //}
+  }
+}
+</style>