bfg-common 1.6.18 → 1.6.20

package/assets/localization/local_be.json

@@ -3790,7 +3790,8 @@
     "rangeDuplicate": "Працэсар {0} пазначаны больш за адзін раз",
     "invalidFormat": "Няправільны фармат: \"{0}\". Выкарыстоўвайце лікі (напрыклад, \"0\") або дыяпазоны (напрыклад, \"0-3\")",
     "encriptionPolicy": "Палітыка шыфравання",
-    "maxParallel": "Максімальная паралель"
+    "maxParallel": "Максімальная паралель",
+    "lastCloneSubtitle": "Праглядзіце дэталі перад клонаваннем віртуальнай машыны."
   },
   "feedback": {
     "additionalDetailsHelp": "Даведка па дадатковых звестках",

package/assets/localization/local_en.json

@@ -3794,7 +3794,8 @@
     "rangeDuplicate": "Processor {0} is specified more than once",
     "invalidFormat": "Invalid format: \"{0}\". Use numbers (e.g., \"0\") or ranges (e.g., \"0-3\")",
     "encriptionPolicy": "Encription Policy",
-    "maxParallel": "Max parallel"
+    "maxParallel": "Max parallel",
+    "lastCloneSubtitle": "Review the details before the virtual machine is cloned."
   },
   "feedback": {
     "additionalDetailsHelp": "Additional Details Help",

package/assets/localization/local_hy.json

@@ -3794,7 +3794,8 @@
     "rangeDuplicate": "Պրոցեսոր {0}-ը նշված է մեկից ավելի անգամ",
     "invalidFormat": "Անվավեր ձևաչափ: \"{0}\". Օգտագործեք թվեր (օրինակ՝ \"0\") կամ տիրույթներ (օրինակ՝ \"0-3\")",
     "encriptionPolicy": "Կոդավորման քաղաքականություն",
-    "maxParallel": "Առավելագույն զուգահեռ"
+    "maxParallel": "Առավելագույն զուգահեռ",
+    "lastCloneSubtitle": "Վերանայեք մանրամասները նախքան վիրտուալ մեքենայի կլոնավորումը:"
   },
   "feedback": {
     "additionalDetailsHelp": "Լրացուցիչ մանրամասներ Օգնություն",

package/assets/localization/local_kk.json

@@ -3793,7 +3793,8 @@
     "rangeDuplicate": "{0} процессоры бірнеше рет көрсетілген",
     "invalidFormat": "Қате пішім: \"{0}\". Сандарды (мысалы, \"0\") немесе ауқымдарды (мысалы, \"0-3\") пайдаланыңыз",
     "encriptionPolicy": "Шифрлау саясаты",
-    "maxParallel": "Максималды параллель"
+    "maxParallel": "Максималды параллель",
+    "lastCloneSubtitle": "Виртуалды машинаны клондау алдында мәліметтерді қарап шығыңыз."
   },
   "feedback": {
     "additionalDetailsHelp": "Қосымша мәліметтер анықтамасы",

package/assets/localization/local_ru.json

@@ -3793,7 +3793,8 @@
     "rangeDuplicate": "Процессор {0} указан более одного раза",
     "invalidFormat": "Неверный формат: \"{0}\". Используйте числа (например, \"0\") или диапазоны (например, \"0-3\")",
     "encriptionPolicy": "Политика шифрования",
-    "maxParallel": "Максимальная параллель"
+    "maxParallel": "Максимальная параллель",
+    "lastCloneSubtitle": "Просмотрите сведения перед клонированием виртуальной машины."
   },
   "feedback": {
     "additionalDetailsHelp": "Дополнительная информация Помощь",

package/assets/localization/local_zh.json

@@ -3791,7 +3791,8 @@
     "rangeDuplicate": "处理器 {0} 被多次指定",
     "invalidFormat": "无效格式: \"{0}\"。请使用数字（例如 \"0\"）或范围（例如 \"0-3\"）",
     "encriptionPolicy": "加密策略",
-    "maxParallel": "最大并行"
+    "maxParallel": "最大并行",
+    "lastCloneSubtitle": "克隆虚拟机之前请查看详细信息。"
   },
   "feedback": {
     "additionalDetailsHelp": "其他详细信息帮助",

package/components/common/monitor/advanced/table/tableNew/lib/config/options.ts

@@ -19,7 +19,7 @@ export const bodyOptions = (
       {
         col: 'col0',
         colName: 'key',
-        text: localization.common.key,
+        text: localization.inventoryMonitor.chartColor,
         width: '96px',
         isSortable: false,
         sort: 'asc',
@@ -29,7 +29,7 @@ export const bodyOptions = (
       {
         col: 'col1',
         colName: 'object',
-        text: localization.common.object,
+        text: localization.inventoryMonitor.metricName,
         width: '150px',
         isSortable: true,
         sort: 'asc',
@@ -39,27 +39,27 @@ export const bodyOptions = (
       {
         col: 'col2',
         colName: 'measurement',
-        text: localization.common.measurement,
+        text: localization.inventoryMonitor.metricDescription,
         width: '192px',
         isSortable: true,
         sort: 'asc',
         show: true,
         filter: true,
       },
-      {
-        col: 'col3',
-        colName: 'rollup',
-        text: localization.common.rollup,
-        width: '150px',
-        isSortable: true,
-        sort: 'asc',
-        show: true,
-        filter: true,
-      },
+      // {
+      //   col: 'col3',
+      //   colName: 'rollup',
+      //   text: localization.common.rollup,
+      //   width: '150px',
+      //   isSortable: true,
+      //   sort: 'asc',
+      //   show: true,
+      //   filter: true,
+      // },
       {
         col: 'col4',
         colName: 'units',
-        text: localization.common.units,
+        text: localization.inventoryMonitor.unitOfMeasurement,
         width: '150px',
         isSortable: true,
         sort: 'asc',
@@ -96,16 +96,16 @@ export const bodyOptions = (
         show: true,
         filter: true,
       },
-      {
-        col: 'col8',
-        colName: 'average',
-        text: localization.common.average,
-        width: '150px',
-        isSortable: true,
-        sort: 'asc',
-        show: true,
-        filter: true,
-      },
+      // {
+      //   col: 'col8',
+      //   colName: 'average',
+      //   text: localization.common.average,
+      //   width: '150px',
+      //   isSortable: true,
+      //   sort: 'asc',
+      //   show: true,
+      //   filter: true,
+      // },
       {
         col: 'col9',
         colName: 'default-actions',

package/components/common/monitor/advanced/table/tableOld/lib/config/performanceDatatable.ts

@@ -28,15 +28,35 @@ const getItems = (
 ): [string, boolean, string, string][] => {
   const widthCol = '113px'
   return [
-    [localization.common.key, true, widthCol, performanceTableKey[0]],
-    [localization.common.object, true, widthCol, performanceTableKey[1]],
-    [localization.common.measurement, true, widthCol, performanceTableKey[2]],
-    [localization.common.rollup, true, widthCol, performanceTableKey[3]],
-    [localization.common.units, true, widthCol, performanceTableKey[4]],
+    [
+      localization.inventoryMonitor.chartColor,
+      true,
+      widthCol,
+      performanceTableKey[0],
+    ],
+    [
+      localization.inventoryMonitor.metricName,
+      true,
+      widthCol,
+      performanceTableKey[1],
+    ],
+    [
+      localization.inventoryMonitor.metricDescription,
+      true,
+      widthCol,
+      performanceTableKey[2],
+    ],
+    // [localization.common.rollup, true, widthCol, performanceTableKey[3]],
+    [
+      localization.inventoryMonitor.unitOfMeasurement,
+      true,
+      widthCol,
+      performanceTableKey[4],
+    ],
     [localization.common.latest, true, widthCol, performanceTableKey[5]],
     [localization.common.maximum, true, widthCol, performanceTableKey[6]],
     [localization.common.minimum, true, widthCol, performanceTableKey[7]],
-    [localization.common.average, true, widthCol, performanceTableKey[8]],
+    // [localization.common.average, true, widthCol, performanceTableKey[8]],
   ]
 }
 

package/components/common/pages/scheduledTasks/table/lib/models/enums.ts

@@ -2,3 +2,12 @@ export enum UI_E_SchedulerRunStatus {
   RUNNING = 'this task has been started',
   SUCCESS = 'success',
 }
+
+export enum E_SchedulerFrequencyModeLocale {
+  Once = 'once',
+  Startup = 'afterVCenterStartup',
+  Hourly = 'hourly',
+  Daily = 'daily',
+  Weekly = 'weekly',
+  Monthly = 'monthly',
+}

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

@@ -47,6 +47,7 @@
       :max-memory="maxMemory"
       :cpu-models="cpuModels"
       :nums="props.nums"
+      :selected-clone-options-keys="selectedCloneOptionsKeys"
       @get-folders-or-files="emits('get-folders-or-files', $event)"
       @change-name="onChangeName"
       @change-storage="onChangeStorage"
@@ -559,7 +560,9 @@ const onChangeStorage = (storage: UI_I_DatastoreTableItem | null): void => {
   // vmForm.value.storage = storage
   model.value.storage = storage
 }
+const selectedCloneOptionsKeys = ref<string[]>([])
 const onChangeSelectOptions = (options: string[]): void => {
+  selectedCloneOptionsKeys.value = options
   // vmForm.value.options = options
   if (
     options.includes('customize-os') &&

package/components/common/vm/actions/clone/new/New.vue

@@ -44,7 +44,7 @@
         "
         :sub-title-height="height1"
       >
-        <template #subTitle>
+        <template #subTitle v-if="model">
           <div ref="subTitleBlock1">
             <div class="subtitle-block flex flex-col">
               <div
@@ -57,6 +57,7 @@
         </template>
         <template #content>
           <common-wizards-common-steps-name
+            v-if="model"
             v-model:name="model.name"
             v-model:location="location"
             :show="
@@ -79,6 +80,7 @@
             @submit="emits('change-name', $event)"
             @has-errors="isNameAlertWrapperEmpty = $event"
           />
+          <common-vm-actions-clone-new-skeleton-name v-else />
         </template>
       </ui-wizard-block>
 
@@ -127,6 +129,7 @@
           <common-vm-actions-common-select-options
             :is-new-vm-from-template="props.isNewVmFromTemplate"
             :project="props.project"
+            :selected-clone-options-keys="props.selectedCloneOptionsKeys"
             @change="emits('change-select-options', $event)"
             @change-count="emits('change-clone-count', $event)"
             @change-max-parallel="emits('change-clone-max-parallel', $event)"
@@ -168,34 +171,40 @@
         v-if="selectedStep.id === props.dynamicSteps.customizeHardware"
       >
         <template #content>
-          <common-vm-actions-common-customize-hardware
-            v-model="model"
-            :storage="model.storage"
-            :customize-hardware-submit="props.customizeHardwareSubmit"
-            :max-memory="props.maxMemory"
-            :cpu-models="props.cpuModels"
-            :selected-nav-item="props.selectedNavItem"
-            :nodes="props.nodes"
-            :files="props.files"
-            :networks-table="props.networksTable"
-            :error-validation-fields="props.errorValidationFields"
-            :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
-            :usb-devices="props.usbDevices"
-            :passthrough-devices="props.passthroughDevices"
-            :mediated-devices="props.mediatedDevices"
-            :get-datastore-table-func="props.getDatastoreTableFunc"
-            :datastore="props.datastore"
-            :is-datastore-loading="props.isDatastoreLoading"
-            :project="props.project"
-            :nums="props.nums"
-            is-clone
-            @get-storage="emits('get-storage', $event)"
-            @get-folders-or-files="emits('get-folders-or-files', $event)"
-            @get-active-device-child="emits('get-active-device-child', $event)"
-            @show-datastore-child="emits('show-datastore-child', $event)"
-            @get-networks-table="emits('get-networks-table', $event)"
-            @get-pci-devices="emits('get-pci-devices')"
-          />
+          <div
+            class="clone-vm-select-customize-hardware-container overflow-auto h-full flex flex-col pr-8"
+          >
+            <common-vm-actions-common-customize-hardware
+              v-model="model"
+              :storage="model.storage"
+              :customize-hardware-submit="props.customizeHardwareSubmit"
+              :max-memory="props.maxMemory"
+              :cpu-models="props.cpuModels"
+              :selected-nav-item="props.selectedNavItem"
+              :nodes="props.nodes"
+              :files="props.files"
+              :networks-table="props.networksTable"
+              :error-validation-fields="props.errorValidationFields"
+              :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
+              :usb-devices="props.usbDevices"
+              :passthrough-devices="props.passthroughDevices"
+              :mediated-devices="props.mediatedDevices"
+              :get-datastore-table-func="props.getDatastoreTableFunc"
+              :datastore="props.datastore"
+              :is-datastore-loading="props.isDatastoreLoading"
+              :project="props.project"
+              :nums="props.nums"
+              is-clone
+              @get-storage="emits('get-storage', $event)"
+              @get-folders-or-files="emits('get-folders-or-files', $event)"
+              @get-active-device-child="
+                emits('get-active-device-child', $event)
+              "
+              @show-datastore-child="emits('show-datastore-child', $event)"
+              @get-networks-table="emits('get-networks-table', $event)"
+              @get-pci-devices="emits('get-pci-devices')"
+            />
+          </div>
         </template>
       </ui-wizard-block>
 
@@ -245,9 +254,7 @@
         <template #subTitle>
           <div ref="subTitleBlockReadyComplete">
             <div class="subtitle-block">
-              <ui-wizard-subtitle
-                :sub-title="localization.vmWizard.lastCreateSubtitle"
-              />
+              <ui-wizard-subtitle :sub-title="currentFinishStepSubtitle" />
             </div>
           </div>
         </template>
@@ -353,12 +360,14 @@ const props = withDefaults(
     compatibilityText?: [UI_T_CompatibilityStatus, string] // для сферы
     compatibilityInfo?: string
     nums?: any
+    selectedCloneOptionsKeys?: string[]
   }>(),
   {
     isLoadingComputeTree: false,
     computeResourceAlert: () => [],
     compatibilityText: () => ['none', ''],
     nums: null,
+    selectedCloneOptionsKeys: () => [],
   }
 )
 
@@ -434,6 +443,12 @@ const selectNameStepSubtitle = computed<string>(() =>
     : localization.value.common.specifyUniqueNameForVm
 )
 
+const currentFinishStepSubtitle = computed<string>(() =>
+  props.isNewVmFromTemplate
+    ? localization.value.vmWizard.lastCreateSubtitle
+    : localization.value.vmWizard.lastCloneSubtitle
+)
+
 const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> =>
   emits('change-steps', value)
 
@@ -478,4 +493,16 @@ const onClone = (): void => emits('finish')
     }
   }
 }
+.clone-vm-select-customize-hardware-container {
+  :deep(.tabs-wrapper) {
+    overflow: auto;
+
+    .tab-item {
+      padding-top: 0 !important;
+    }
+  }
+  :deep(.ui-main-select-toggle) {
+    width: 100% !important;
+  }
+}
 </style>

package/components/common/vm/actions/clone/new/SkeletonName.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="skeleton-clone-vm-name-step">
+    <ui-skeleton-item width="70%" height="16" />
+    <div class="bottom-container grid items-center gap-4 mt-4">
+      <ui-skeleton-item width="100%" height="20" />
+      <ui-skeleton-item width="100%" height="36" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+.skeleton-clone-vm-name-step {
+  .bottom-container {
+    grid-template-columns: 30% 60%;
+    border-top: 1px solid #e9ebed;
+    padding-top: 16px;
+    margin-top: 12px;
+  }
+}
+</style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/New.vue

@@ -242,6 +242,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 .cpu-info-block {
   :deep(.help-text) {
     margin-bottom: 12px;
+    color: var(--stack-block-text-color);
   }
   :deep(.cpu-more-info) {
     font-size: 13px;

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

@@ -17,12 +17,13 @@
       @click.stop.prevent="onToggleCustomizeOs"
     >
       <ui-checkbox
-        v-model="isCustomizeOs"
+        v-model="modelValue"
         :label-text="localization.vmWizard.customizeOS"
         :title="localization.vmWizard.customizeOS"
         :disabled="props.isNewVmFromTemplate"
         test-id="customize-os"
         size="md"
+        value="customize-os"
       />
       <p
         :class="[
@@ -43,12 +44,13 @@
       @click.stop.prevent="onToggleCustomizeHardware"
     >
       <ui-checkbox
-        v-model="isCustomizeHardware"
+        v-model="modelValue"
         :label-text="localization.common.customizeHardware"
         :title="localization.common.customizeHardware"
         :disabled="props.isNewVmFromTemplate"
         test-id="customize-hardware"
         size="md"
+        value="customize-hardware"
       />
       <p
         :class="[
@@ -64,10 +66,11 @@
       @click.stop.prevent="onTogglePowerOn"
     >
       <ui-checkbox
-        v-model="isPowerOn"
+        v-model="modelValue"
         :label-text="localization.vmWizard.autoPowerOn"
         test-id="power-on"
         size="md"
+        value="power-on"
       />
       <p class="checkbox-block-description mt-2 ml-7">
         {{ localization.vmWizard.powerVMAfterCreation }}
@@ -136,16 +139,19 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const mainContainer = ref<HTMLElement | null>(null)
 const { width: mainContainerWidth } = useElementSize(mainContainer)
 
-const isCustomizeOs = ref<boolean>(false)
-const isCustomizeHardware = ref<boolean>(false)
-const isPowerOn = ref<boolean>(false)
-const isLinkedClone = ref<boolean>(false)
+const isCustomizeOs = computed<boolean>(() =>
+  modelValue.value.includes('customize-os')
+)
+const isCustomizeHardware = computed<boolean>(() =>
+  modelValue.value.includes('customize-hardware')
+)
+const isPowerOn = computed<boolean>(() => modelValue.value.includes('power-on'))
+// const isLinkedClone = ref<boolean>(false)
 
 const onToggleCustomizeOs = (): void => {
   if (props.isNewVmFromTemplate) return
 
-  isCustomizeOs.value = !isCustomizeOs.value
-  if (isCustomizeOs.value) {
+  if (!isCustomizeOs.value) {
     !modelValue.value.includes('customize-os') &&
       modelValue.value.push('customize-os')
   } else {
@@ -158,8 +164,7 @@ const onToggleCustomizeOs = (): void => {
 const onToggleCustomizeHardware = (): void => {
   if (props.isNewVmFromTemplate) return
 
-  isCustomizeHardware.value = !isCustomizeHardware.value
-  if (isCustomizeHardware.value) {
+  if (!isCustomizeHardware.value) {
     !modelValue.value.includes('customize-hardware') &&
       modelValue.value.push('customize-hardware')
   } else {
@@ -172,8 +177,7 @@ const onToggleCustomizeHardware = (): void => {
 const onTogglePowerOn = (): void => {
   // if (props.isNewVmFromTemplate) return
 
-  isPowerOn.value = !isPowerOn.value
-  if (isPowerOn.value) {
+  if (!isPowerOn.value) {
     !modelValue.value.includes('power-on') && modelValue.value.push('power-on')
   } else {
     modelValue.value = modelValue.value.filter((item) => item !== 'power-on')

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

@@ -16,10 +16,12 @@ const props = withDefaults(
   defineProps<{
     project?: UI_T_Project
     isNewVmFromTemplate?: boolean // TODO change
+    selectedCloneOptionsKeys?: string[]
   }>(),
   {
     project: undefined,
     isNewVmFromTemplate: undefined,
+    selectedCloneOptionsKeys: () => [],
   }
 )
 
@@ -39,9 +41,22 @@ const currentComponent = computed(() =>
 )
 
 const selectedOptions = ref<string[]>([])
-watch(selectedOptions, (newValue) => {
-  emits('change', newValue)
-})
+watch(
+  selectedOptions,
+  (newValue) => {
+    emits('change', newValue)
+  },
+  { deep: true }
+)
+watch(
+  () => props.selectedCloneOptionsKeys,
+  (newValue) => {
+    if (newValue.length) {
+      selectedOptions.value = newValue
+    }
+  },
+  { immediate: true, deep: true }
+)
 const maxParallel = ref<number>(1) // For Deploy
 watch(maxParallel, (newValue) => {
   if (newValue < 1) {

package/components/common/vm/actions/confirm/Confirm.vue

@@ -4,6 +4,7 @@
     :sub-title="props.subTitle"
     :description="props.description"
     :modal-texts="props.modalTexts"
+    :loading="props.isLoading"
     @hide-modal="emits('hide')"
     @confirm="emits('confirm')"
   >
@@ -22,9 +23,11 @@ const props = withDefaults(
     subTitle: string
     description: string
     modalTexts?: UI_I_ModalTexts
+    isLoading?: boolean
   }>(),
   {
     modalTexts: undefined,
+    isLoading: false
   }
 )
 

package/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/new/lib/config/diskTable.ts

@@ -158,7 +158,6 @@ export const getBodyDataFunc = (
   bodyData: UI_I_StorageConfigurePerDiskItem[],
   localization: UI_I_Localization
 ): UI_I_DataTableBody[] => {
-
   return bodyData.map((disk, index: number) => {
     const diskFormat =
       index === 0 ? 'N/A' : UI_E_SelectStorageDiskFormat[disk.disk_format]
@@ -184,6 +183,12 @@ export const getBodyDataFunc = (
         : 'False'
       : localization.common[diskSharingKey]
 
+    const diskCache = disk.extra.cache
+    const diskCacheValue =
+      !diskCache || ['none', 'n/a'].includes(diskCache.toLowerCase())
+        ? '--'
+        : disk.extra.cache
+
     return {
       row: index,
       collapse: false,
@@ -221,10 +226,10 @@ export const getBodyDataFunc = (
           data: diskSharingData,
         },
 
-        { col: 'col6', text: disk.extra.target },
+        { col: 'col6', text: disk.extra.target || '--' },
         {
           col: 'col7',
-          text: disk.extra.cache,
+          text: diskCacheValue,
         },
         { col: 'col8', text: disk.extra.io_control },
         {

package/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/old/lib/config/diskTable.ts

@@ -79,6 +79,12 @@ export const bodyItems = (
         ? disk[vmMigrateDiskTableItemKeys[2]]
         : `${disk.extra.disk_source} (${disk.extra.disk_size} ${localization.common.mb} )`
 
+    const diskCache = disk.extra[vmMigrateDiskTableItemKeys[7]]
+    const diskCacheValue =
+      !diskCache || ['none', 'n/a'].includes(diskCache.toLowerCase())
+        ? '--'
+        : disk.extra[vmMigrateDiskTableItemKeys[7]]
+
     bodyItems.push([
       {
         key: 'col0',
@@ -124,7 +130,7 @@ export const bodyItems = (
       },
       {
         key: 'col7',
-        text: disk.extra[vmMigrateDiskTableItemKeys[7]],
+        text: diskCacheValue,
         id: key,
         testId: `disk-table-${key}`,
       },

package/package.json

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