bfg-common 1.6.0 → 1.6.2

package/assets/localization/local_be.json

@@ -3491,7 +3491,8 @@
     "snapshotHasNoDescriptionYet": "Гэты здымак яшчэ не мае апісання.",
     "takeSnapshot": "Зрабіце здымак",
     "newSnapshot": "Новы здымак",
-    "editSnapshot": "Рэдагаваць здымак"
+    "editSnapshot": "Рэдагаваць здымак",
+    "revertLatestSnapshot": "Вярнуцца да апошняга здымка"
   },
   "importVms": {
     "selectSourceTooltipDesc": "Правы карыстальніка esxi павінны адпавядаць ролях Administrator, крэдыт прымаюцца ад esxi і vSphere",

package/assets/localization/local_en.json

@@ -3495,7 +3495,8 @@
     "snapshotHasNoDescriptionYet": "This snapshot has no description yet.",
     "takeSnapshot": "Take Snapshot",
     "newSnapshot": "New Snapshot",
-    "editSnapshot": "Edit snapshot"
+    "editSnapshot": "Edit snapshot",
+    "revertLatestSnapshot": "Revert to Latest Snapshot"
   },
   "importVms": {
     "selectSourceTooltipDesc": "No Trusted infrastructure Administrator, credits are accepted from esxi and vSphere",

package/assets/localization/local_hy.json

@@ -3495,7 +3495,8 @@
     "snapshotHasNoDescriptionYet": "Այս պահպանումը դեռևս չունի նկարագրություն։",
     "takeSnapshot": "Ակնթարթ նկար",
     "newSnapshot": "Նոր սքրինշոթ",
-    "editSnapshot": "Խմբագրել սքրինշոթը"
+    "editSnapshot": "Խմբագրել սքրինշոթը",
+    "revertLatestSnapshot": "Վերադառնալ վերջին նկարին"
   },
   "importVms": {
     "selectSourceTooltipDesc": "Esxi օգտագործողի իրավունքները պետք է համապատասխանեն Administrator-ի դերերին, կրեդիտներն ընդունվում են esxi-ից և vSphere-ից",

package/assets/localization/local_kk.json

@@ -3494,7 +3494,8 @@
     "snapshotHasNoDescriptionYet": "Бұл суретке әлі сипаттама қосылмаған.",
     "takeSnapshot": "сурет",
     "newSnapshot": "Жаңа снимок",
-    "editSnapshot": "Снимокты өңдеу"
+    "editSnapshot": "Снимокты өңдеу",
+    "revertLatestSnapshot": "Варнузза және түтіннің тұманы"
   },
   "importVms": {
     "selectSourceTooltipDesc": "Esxi пайдаланушы құқықтары әкімші рөлдеріне сәйкес келуі керек, несиелер esxi және vSphere - ден алынады",

package/assets/localization/local_ru.json

@@ -3494,7 +3494,8 @@
     "snapshotHasNoDescriptionYet": "У этого снимка пока нет описания.",
     "takeSnapshot": "Сделать снимок",
     "newSnapshot": "Новый снимок",
-    "editSnapshot": "Редактировать снимок"
+    "editSnapshot": "Редактировать снимок",
+    "revertLatestSnapshot": "Вернуться к последнему снимку"
   },
   "importVms": {
     "selectSourceTooltipDesc": "Права пользователя vmware дожны соответствовать ролям Administrator, креды принимаются от esxi и vSphere",

package/assets/localization/local_zh.json

@@ -3492,7 +3492,8 @@
     "snapshotHasNoDescriptionYet": "此快照尚无描述。",
     "takeSnapshot": "快照",
     "newSnapshot": "新快照",
-    "editSnapshot": "编辑快照"
+    "editSnapshot": "编辑快照",
+    "revertLatestSnapshot": "回到上一张照片"
   },
   "importVms": {
     "selectSourceTooltipDesc": "Esxi用户权限必须对应于管理员角色. esxi和vSphere接受积分",

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

@@ -8,6 +8,7 @@
     ]"
   >
     <div
+      v-if="!props.isNewVmFromTemplate"
       :class="[
         'checkbox-container',
         { checked: isCustomizeOs },
@@ -59,35 +60,24 @@
       </p>
     </div>
     <div
-      :class="[
-        'checkbox-container',
-        { checked: isPowerOn },
-        { disabled: props.isNewVmFromTemplate },
-      ]"
+      :class="['checkbox-container', { checked: isPowerOn }]"
       @click.stop.prevent="onTogglePowerOn"
     >
-      <!--      :disabled="props.isNewVmFromTemplate"-->
       <ui-checkbox
         v-model="isPowerOn"
         :label-text="localization.vmWizard.autoPowerOn"
-        :title="localization.vmWizard.autoPowerOn"
-        :disabled="props.isNewVmFromTemplate"
         test-id="power-on"
         size="md"
       />
-      <!--      { disabled: props.isNewVmFromTemplate },-->
-      <p
-        :class="[
-          'checkbox-block-description mt-2 ml-7',
-          { disabled: props.isNewVmFromTemplate },
-        ]"
-      >
+      <p class="checkbox-block-description mt-2 ml-7">
         {{ localization.vmWizard.powerVMAfterCreation }}
       </p>
     </div>
-    <div v-if="props.isNewVmFromTemplate" class="checkbox-container">
+    <div
+      v-if="props.isNewVmFromTemplate && props.project === 'sphere'"
+      class="checkbox-container"
+    >
       <ui-input
-        v-if="props.project === 'sphere'"
         v-model="maxParallel"
         :placeholder="localization.vmWizard.maxParallel"
         test-id="max-parallel"
@@ -180,7 +170,7 @@ const onToggleCustomizeHardware = (): void => {
 }
 
 const onTogglePowerOn = (): void => {
-  if (props.isNewVmFromTemplate) return
+  // if (props.isNewVmFromTemplate) return
 
   isPowerOn.value = !isPowerOn.value
   if (isPowerOn.value) {
@@ -223,7 +213,8 @@ watch(
 
 <style scoped lang="scss">
 .select-options {
-  grid-template-columns: 1fr 1fr;
+  //grid-template-columns: 1fr 1fr;
+  grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
   grid-template-rows: max-content;
   overflow-y: auto;
   padding-bottom: 16px;

package/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/New.vue

@@ -2,7 +2,7 @@
   <div class="device-table-container">
     <ui-data-table
       :data="data"
-      :options="options"
+      :options="tableConfig.options"
       :loading="props.isLoading"
       :total-pages="props.totalPages"
       :total-items="props.totalItems"
@@ -79,13 +79,10 @@ import type {
   UI_I_TableTexts,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_I_DataTableSkeleton } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-import type { UI_T_SelectComputeResourceTabType } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
+import type { UI_T_SelectComputeResourceTabType } from '~/components/common/wizards/vm/migrate/steps/selectStorage/lib/models/types'
 import type { UI_T_ComputeResourceTableItem } from '~/components/common/wizards/vm/migrate/steps/computeResource/lib/models/types'
-import {
-  options,
-  getHeaderDataFunc,
-  getBodyDataFunc,
-} from '~/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/config/hostTable'
+import * as hostTable from '~/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/config/hostTable'
+import * as clusterTable from '~/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/config/clusterTable'
 
 const selectedDataLocal = defineModel<number | null>({ required: true })
 const props = defineProps<{
@@ -120,15 +117,33 @@ const tableSkeleton = ref<UI_I_DataTableSkeleton>({
   withoutPagination: true,
 })
 
+const tableTitleMap = {
+  host: localization.value.common.hosts,
+  cluster: localization.value.common.clusters,
+} as const
+const tableConfigMap = {
+  host: hostTable,
+  cluster: clusterTable,
+} as const
+
+const tableConfig = computed(
+  () => tableConfigMap[props.type as keyof typeof tableConfigMap]
+)
+
 const data = computed<UI_I_DataTable>(() => ({
-  id: 'compute-resource-host-table',
-  title: `${localization.value.common.hosts} (${props.totalItems})`,
+  id: `compute-resource-${props.type}-table`,
+  title: tableDataTitle.value,
   header: deviceHeadItems.value,
   body: deviceBodyItems.value,
 }))
-
+const tableDataTitle = computed<string>(
+  () =>
+    `${tableTitleMap[props.type as keyof typeof tableConfigMap]} (${
+      props.totalItems
+    })`
+)
 const deviceHeadItems = computed<UI_I_DataTableHeader[]>(() =>
-  getHeaderDataFunc(localization.value)
+  tableConfig.value.getHeaderDataFunc(localization.value)
 )
 
 const deviceBodyItems = ref<UI_I_DataTableBody[]>([])
@@ -140,13 +155,16 @@ watch(
       return
     }
 
-    deviceBodyItems.value = getBodyDataFunc(newValue, localization.value)
+    deviceBodyItems.value = tableConfig.value.getBodyDataFunc(
+      newValue,
+      localization.value
+    )
   },
   { deep: true, immediate: true }
 )
 
 const onSelectRow = (value: UI_I_DataTableBody[]): void => {
-  selectedDataLocal.value = value?.[0].row
+  selectedDataLocal.value = value?.[0].row as number
 }
 </script>
 

package/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/config/clusterTable.ts

@@ -0,0 +1,340 @@
+import type {
+  UI_I_DataTableBody,
+  UI_I_DataTableOptions,
+  UI_I_DataTableHeader,
+} from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ClusterTableItem } from '~/components/common/wizards/vm/migrate/steps/computeResource/tableView/lib/models/interfaces'
+// import {
+//   UI_E_DeviceStatus,
+//   UI_E_DeviceStatusChipColor,
+//   UI_E_DeviceStatusIcon,
+// } from '~/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/models/enums'
+
+// // Маппинг для статусов
+// const STATUS_MAPPING = {
+//   [UI_E_DeviceStatus.Unknown]: {
+//     icon: UI_E_DeviceStatusIcon.HelpIcon,
+//     chipColor: UI_E_DeviceStatusChipColor.Primary,
+//   },
+//   [UI_E_DeviceStatus.Supported]: {
+//     icon: UI_E_DeviceStatusIcon.StatusCheck,
+//     chipColor: UI_E_DeviceStatusChipColor.Green,
+//   },
+//   [UI_E_DeviceStatus.NotSupported]: {
+//     icon: UI_E_DeviceStatusIcon.Close,
+//     chipColor: UI_E_DeviceStatusChipColor.Red,
+//   },
+// }
+
+export const getHeaderDataFunc = (
+  localization: UI_I_Localization
+): UI_I_DataTableHeader[] => [
+  {
+    col: 'col0',
+    colName: 'name',
+    text: localization.common.name,
+    isSortable: true,
+    sort: 'asc',
+    width: '180px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col1',
+    colName: 'available_cpu',
+    text: localization.common.availableCpu,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col2',
+    colName: 'available_memory',
+    text: localization.common.availableMemory,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col3',
+    colName: 'available_storage',
+    text: localization.common.availableStorage,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col4',
+    colName: 'drs',
+    text: localization.common.vSphere_DRS,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col5',
+    colName: 'ha',
+    text: localization.common.vSphere_HA,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col6',
+    colName: 'total_cpu',
+    text: localization.common.totalCpu,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col7',
+    colName: 'total_memory',
+    text: localization.common.totalMemory,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col8',
+    colName: 'total_storage',
+    text: localization.common.totalStorage,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col9',
+    colName: 'vms',
+    text: localization.common.vms,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col10',
+    colName: 'hosts',
+    text: localization.common.hosts,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col11',
+    colName: 'cpus',
+    text: localization.common.cpus,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col12',
+    colName: 'datastores',
+    text: localization.common.datastores,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col13',
+    colName: 'vsan',
+    text: localization.common.vSAN,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col14',
+    colName: 'vc',
+    text: localization.common.vc,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col15',
+    colName: 'evc_cpu_mode',
+    text: localization.common.evcCpuMode,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+  {
+    col: 'col16',
+    colName: 'evc_graphics_mode',
+    text: localization.common.evcGraphicsMode,
+    isSortable: true,
+    sort: 'asc',
+    width: '96px',
+    show: true,
+    filter: false,
+  },
+]
+export const options: UI_I_DataTableOptions = {
+  perPageOptions: [{ text: '10', value: 100, default: true }],
+  isSelectable: true,
+  selectType: 'radio',
+  showPagination: false,
+  showPageInfo: false,
+  isSortable: true,
+  server: true,
+  isResizable: true,
+  showSelectedRows: false,
+  showColumnManager: true,
+  inModal: true,
+  inBlock: false,
+  // isFocusable: false,
+  // showPaginationOnTop: false,
+  // showSearch: false,
+  // withActions: false,
+  // showExport: false,
+  // withCollapse: false,
+}
+
+export const getBodyDataFunc = (
+  bodyData: UI_I_ClusterTableItem[],
+  _localization: UI_I_Localization
+): UI_I_DataTableBody[] => {
+  const { $binary }: any = useNuxtApp()
+
+  return bodyData.map((cluster, index: number) => {
+    //   const statusKey = host.state
+    //   ? UI_E_DeviceStatus.Unknown
+    //   : UI_E_DeviceStatus.Supported
+    // const statusData = {
+    //   ...STATUS_MAPPING[statusKey],
+    //   testId: `${host.name}-${index}-status`,
+    // }
+
+    return {
+      row: index,
+      collapse: false,
+      isHiddenCollapse: false,
+      collapseToggle: false,
+
+      data: [
+        {
+          key: 'icon',
+          col: 'col0',
+          text: cluster.name,
+          data: {
+            iconClassName: 'vsphere-icon-cluster',
+          },
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+
+        {
+          col: 'col1',
+          text: $binary.roundHz(cluster.available_cpu),
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col2',
+          text: $binary.round(cluster.available_memory),
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col3',
+          text: $binary.round(cluster.available_storage),
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col4',
+          text: cluster.drs,
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col5',
+          text: cluster.ha,
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col6',
+          text: $binary.roundHz(cluster.total_cpu),
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col7',
+          text: $binary.round(cluster.total_memory),
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col8',
+          text: $binary.round(cluster.total_storage),
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col9',
+          text: cluster.vms,
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col10',
+          text: cluster.hosts,
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col11',
+          text: cluster.cpus,
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col12',
+          text: cluster.datastores,
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col13',
+          text: cluster.vsan,
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col14',
+          text: cluster.vc,
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col15',
+          text: cluster.evc_cpu_mode,
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+        {
+          col: 'col16',
+          text: cluster.evc_graphics_mode,
+          testId: `migrate-cluster-table-item-${index}`,
+        },
+      ],
+    }
+  })
+}

package/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/config/hostTable.ts

@@ -222,7 +222,9 @@ export const getBodyDataFunc = (
           key: 'icon',
           col: 'col0',
           text: host.name,
-          data: `vsphere-icon-${hostIconByState[host.state]}`,
+          data: {
+            iconClassName: `vsphere-icon-${hostIconByState[host.state]}`,
+          },
           testId: `migrate-host-table-item-${index}`,
         },
 

package/package.json

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