bfg-common 1.6.66 → 1.6.67

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="tableConfig.options"
+      :options="options"
       :loading="props.isLoading"
       :total-pages="props.totalPages"
       :total-items="props.totalItems"
@@ -52,8 +52,8 @@
         >
           <ui-icon
             :name="item.data.icon"
-            width="12px"
-            height="12px"
+            width="14px"
+            height="14px"
             class="chip-icon"
           ></ui-icon>
           {{ item.text }}
@@ -79,10 +79,13 @@ 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/steps/selectStorage/lib/models/types'
+import type { UI_T_SelectComputeResourceTabType } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
 import type { UI_T_ComputeResourceTableItem } from '~/components/common/wizards/vm/migrate/steps/computeResource/lib/models/types'
-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'
+import {
+  options,
+  getHeaderDataFunc,
+  getBodyDataFunc,
+} from '~/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/config/hostTable'
 
 const selectedDataLocal = defineModel<number | null>({ required: true })
 const props = defineProps<{
@@ -117,33 +120,15 @@ 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-${props.type}-table`,
-  title: tableDataTitle.value,
+  id: 'compute-resource-host-table',
+  title: `${localization.value.common.hosts} (${props.totalItems})`,
   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[]>(() =>
-  tableConfig.value.getHeaderDataFunc(localization.value)
+  getHeaderDataFunc(localization.value)
 )
 
 const deviceBodyItems = ref<UI_I_DataTableBody[]>([])
@@ -155,22 +140,19 @@ watch(
       return
     }
 
-    deviceBodyItems.value = tableConfig.value.getBodyDataFunc(
-      newValue,
-      localization.value
-    )
+    deviceBodyItems.value = getBodyDataFunc(newValue, localization.value)
   },
   { deep: true, immediate: true }
 )
 
 const onSelectRow = (value: UI_I_DataTableBody[]): void => {
-  selectedDataLocal.value = value?.[0].row as number
+  selectedDataLocal.value = value?.[0].row
 }
 </script>
 
 <style lang="scss" scoped>
 .device-table-container {
-  margin: 16px 0 24px;
+  margin: 20px 0 24px;
   :deep(.column-manager-button.sm span) {
     font-weight: 500;
   }
@@ -187,15 +169,15 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
   }
   .progress {
     &-line {
-      height: 10px;
+      height: 12px;
       width: 100%;
-      background: var(--progress-bar-bg);
+      background: #e9ebed8f;
       border-radius: 6px;
 
       &-fill {
-        height: 10px;
-        min-width: 10px;
-        background: var(--progress-bar);
+        height: 12px;
+        min-width: 12px;
+        background: #008fd6;
         border-radius: 6px;
       }
     }
@@ -203,7 +185,6 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
     &-text {
       width: 53px;
       min-width: 53px;
-      font-size: 12px;
       margin-left: 8px;
       text-align: right;
 

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

@@ -9,7 +9,6 @@ import {
   UI_E_DeviceStatus,
   UI_E_DeviceStatusChipColor,
   UI_E_DeviceStatusIcon,
-  UI_E_HostAlarmStatus,
 } from '~/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/models/enums'
 import {
   hostIconByState,
@@ -32,18 +31,6 @@ const STATUS_MAPPING = {
   },
 }
 
-// Маппинг для статусов
-const HOST_ALARMS_MAPPING = {
-  [UI_E_HostAlarmStatus.Yes]: {
-    icon: UI_E_DeviceStatusIcon.StatusCheck,
-    chipColor: UI_E_DeviceStatusChipColor.Green,
-  },
-  [UI_E_HostAlarmStatus.No]: {
-    icon: UI_E_DeviceStatusIcon.Close,
-    chipColor: UI_E_DeviceStatusChipColor.Red,
-  },
-}
-
 export const getHeaderDataFunc = (
   localization: UI_I_Localization
 ): UI_I_DataTableHeader[] => [
@@ -63,7 +50,7 @@ export const getHeaderDataFunc = (
     text: localization.inventorySummary.state,
     isSortable: true,
     sort: 'asc',
-    width: '144px',
+    width: '96px',
     show: true,
     filter: false,
   },
@@ -73,7 +60,7 @@ export const getHeaderDataFunc = (
     text: localization.common.cluster,
     isSortable: true,
     sort: 'asc',
-    width: '120px',
+    width: '96px',
     show: true,
     filter: false,
   },
@@ -83,7 +70,7 @@ export const getHeaderDataFunc = (
     text: localization.common.faultDomain,
     isSortable: true,
     sort: 'asc',
-    width: '120px',
+    width: '96px',
     show: true,
     filter: false,
   },
@@ -93,7 +80,7 @@ export const getHeaderDataFunc = (
     text: `${localization.common.consumedCpu} %`,
     isSortable: true,
     sort: 'asc',
-    width: '230px',
+    width: '96px',
     show: true,
     filter: false,
   },
@@ -103,7 +90,7 @@ export const getHeaderDataFunc = (
     text: `${localization.common.consumedMemory} %`,
     isSortable: true,
     sort: 'asc',
-    width: '230px',
+    width: '96px',
     show: true,
     filter: false,
   },
@@ -123,7 +110,7 @@ export const getHeaderDataFunc = (
     text: localization.inventorySummary.uptime,
     isSortable: true,
     sort: 'asc',
-    width: '270px',
+    width: '96px',
     show: true,
     filter: false,
   },
@@ -133,7 +120,7 @@ export const getHeaderDataFunc = (
     text: localization.common.certificateValidTo,
     isSortable: true,
     sort: 'asc',
-    width: '160px',
+    width: '96px',
     show: true,
     filter: false,
   },
@@ -143,7 +130,7 @@ export const getHeaderDataFunc = (
     text: `${localization.common.memorySize} (${localization.common.mb})`,
     isSortable: true,
     sort: 'asc',
-    width: '160px',
+    width: '96px',
     show: true,
     filter: false,
   },
@@ -173,7 +160,7 @@ export const getHeaderDataFunc = (
     text: localization.common.version,
     isSortable: true,
     sort: 'asc',
-    width: '270px',
+    width: '96px',
     show: true,
     filter: false,
   },
@@ -183,7 +170,7 @@ export const getHeaderDataFunc = (
     text: localization.common.alarmActions,
     isSortable: true,
     sort: 'asc',
-    width: '120px',
+    width: '96px',
     show: true,
     filter: false,
   },
@@ -224,21 +211,6 @@ export const getBodyDataFunc = (
       testId: `${host.name}-${index}-status`,
     }
 
-    const alarmsStatusKey = host.alarm_action
-      ? UI_E_HostAlarmStatus.Yes
-      : UI_E_HostAlarmStatus.No
-    const alarmActionData = {
-      ...HOST_ALARMS_MAPPING[alarmsStatusKey],
-      testId: `${host.name}-${index}-alarms-status`,
-    }
-
-    const isLangEn = useLocalStorage('lang') === 'en_US'
-    const alarmActionValue = isLangEn
-      ? host.alarm_action
-        ? 'True'
-        : 'False'
-      : localization.common[alarmsStatusKey]
-
     return {
       row: index,
       collapse: false,
@@ -250,9 +222,7 @@ export const getBodyDataFunc = (
           key: 'icon',
           col: 'col0',
           text: host.name,
-          data: {
-            iconClassName: `vsphere-icon-${hostIconByState[host.state]}`,
-          },
+          data: `vsphere-icon-${hostIconByState[host.state]}`,
           testId: `migrate-host-table-item-${index}`,
         },
 
@@ -299,7 +269,7 @@ export const getBodyDataFunc = (
         },
         {
           col: 'col8',
-          text: host.cert_valid_to || '--',
+          text: host.cert_valid_to,
           testId: `migrate-host-table-item-${index}`,
         },
 
@@ -328,8 +298,8 @@ export const getBodyDataFunc = (
         {
           key: 'status',
           col: 'col13',
-          text: alarmActionValue,
-          data: alarmActionData,
+          text: host.alarm_action,
+          data: statusData,
           testId: `migrate-host-table-item-${index}`,
         },
       ],

package/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/models/enums.ts

@@ -3,10 +3,6 @@ export enum UI_E_DeviceStatus {
   Supported = 'supported',
   NotSupported = 'not-supported',
 }
-export enum UI_E_HostAlarmStatus {
-  Yes = 'yes',
-  No = 'no',
-}
 
 export enum UI_E_DeviceStatusChipColor {
   Green = 'green',

package/components/common/wizards/vm/migrate/steps/priority/New.vue

@@ -38,7 +38,7 @@ const props = defineProps<{
 .migration-strategy {
   container-type: inline-size;
   margin-top: 16px;
-  padding-bottom: 16px;
+
   &__radio {
     &-container {
       display: grid;
@@ -62,7 +62,7 @@ const props = defineProps<{
       transition: box-shadow 0.1s ease-in-out;
     }
 
-    &:not(:checked, :disabled) {
+    &:not(:checked) {
       & ~ .radio-label:hover {
         //border-color: var(--select-border);
         box-shadow: inset 0 0 0 1px var(--select-border);
@@ -76,11 +76,6 @@ const props = defineProps<{
         box-shadow: inset 0 0 0 1.5px var(--radio-btn-active-label-border-color);
       }
     }
-    &:disabled {
-      & ~ .radio-label .migration-strategy__radio-description {
-        color: var(--checkbox-radio-label-color-disabled);
-      }
-    }
   }
 }
 

package/components/common/wizards/vm/migrate/steps/selectStorage/New.vue

@@ -27,14 +27,13 @@
       :is-hide-select-disk-format="props.isHideSelectDiskFormat"
     >
       <template v-if="isShowSelectedPerDisks" #buttonConfirm>
-        <ui-button
-          test-id="apply-selected-per-disks-button"
-          type="primary"
-          size="sm"
+        <button
+          class="btn btn-sm btn-primary"
+          data-id="apply-selected-per-disks-button"
           @click="onApplyChanges"
         >
           {{ localization.common.confirm }}
-        </ui-button>
+        </button>
       </template>
     </common-wizards-vm-migrate-steps-select-storage-configure-batch>
 
@@ -48,8 +47,9 @@
     />
 
     <common-wizards-common-compatibility
-      :status="compatibilityText[0]"
-      :text="compatibilityText[1]"
+      :loading="!model.storage"
+      :text="localization.common.compatibilityChecksSucceeded"
+      status="success"
     />
   </div>
 </template>
@@ -62,7 +62,6 @@ import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/model
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/lib/models/interfaces'
 import type { UI_I_MigrateFormLocal } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
-import type { UI_T_CompatibilityStatus } from '~/components/common/wizards/common/compatibility/lib/models/types'
 
 const model = defineModel<UI_I_MigrateFormLocal>({ required: true })
 const selectedPerDiskKeys = defineModel<number[]>('selectedDiskKeys', {
@@ -112,19 +111,6 @@ const onChangePerDiskStorage = (
 const onApplyChanges = (): void => {
   emits('confirm-changes')
 }
-
-const compatibilityText = computed<[UI_T_CompatibilityStatus, string]>(() => {
-  let res: [UI_T_CompatibilityStatus, string] = [
-    'none',
-    localization.value.common.noComputeResourceSelected,
-  ]
-
-  if (model.value.storage) {
-    res = ['success', localization.value.common.compatibilityChecksSucceeded]
-  }
-
-  return res
-})
 </script>
 
 <style lang="scss" scoped>
@@ -132,6 +118,5 @@ const compatibilityText = computed<[UI_T_CompatibilityStatus, string]>(() => {
 .select-storage {
   @include flex($dir: column);
   margin-top: 16px;
-  padding-bottom: 16px;
 }
 </style>

package/components/common/wizards/vm/migrate/steps/selectStorage/configure/batch/New.vue

@@ -61,9 +61,7 @@ const selectOptionsLocal = computed<UI_I_Dropdown[]>(() =>
     grid-template-columns: 240px 1fr;
     align-items: center;
     column-gap: 16px;
-    border-bottom: 1px solid var(--horizontal-line);
     margin-top: 16px;
-    padding-bottom: 16px;
     & > span {
       font-family: 'Inter', sans-serif;
       color: var(--title-form-first-color);
@@ -71,9 +69,5 @@ const selectOptionsLocal = computed<UI_I_Dropdown[]>(() =>
       font-size: 13px;
     }
   }
-  &__button {
-    display: flex;
-    justify-content: flex-end;
-  }
 }
 </style>

package/components/common/wizards/vm/migrate/steps/selectStorage/configure/batch/table/new/New.vue

@@ -86,7 +86,6 @@ const texts = computed<UI_I_TableTexts>(() => ({
 
 const skeletonData = ref<UI_I_DataTableSkeleton>({
   columnsCount: 4,
-  withoutPagination: true,
   headColumns: [],
   bodyColumns: [],
 })
@@ -119,11 +118,9 @@ watch(
 const onSorting = (value: string): void => {
   emits('sort', value)
 }
-
-/* TODO: если передать в emit selectedStorageKeyLocal.value, то не работает */
 const onSelectRow = (value: UI_I_DataTableBody[]): void => {
   selectedStorageKeyLocal.value = value?.[0].row as number
-  emits('select-storage', value?.[0].row as number)
+  emits('select-storage', selectedStorageKeyLocal.value)
 }
 </script>
 

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

@@ -95,7 +95,7 @@ export const getHeaderDataFunc = (
     text: localization.common.name,
     isSortable: false,
     sort: 'asc',
-    width: '160px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -105,7 +105,7 @@ export const getHeaderDataFunc = (
     text: localization.inventorySummary.state,
     isSortable: false,
     sort: 'asc',
-    width: '160px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -115,7 +115,7 @@ export const getHeaderDataFunc = (
     text: localization.common.capacity,
     isSortable: false,
     sort: 'asc',
-    width: '120px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -125,7 +125,7 @@ export const getHeaderDataFunc = (
     text: localization.common.provisioned,
     isSortable: false,
     sort: 'asc',
-    width: '120px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -135,7 +135,7 @@ export const getHeaderDataFunc = (
     text: localization.common.free,
     isSortable: false,
     sort: 'asc',
-    width: '120px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -145,7 +145,7 @@ export const getHeaderDataFunc = (
     text: localization.common.used,
     isSortable: false,
     sort: 'asc',
-    width: '120px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -155,7 +155,7 @@ export const getHeaderDataFunc = (
     text: localization.common.type,
     isSortable: false,
     sort: 'asc',
-    width: '104px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -165,7 +165,7 @@ export const getHeaderDataFunc = (
     text: localization.common.thinProvisioning,
     isSortable: false,
     sort: 'asc',
-    width: '160px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -175,7 +175,7 @@ export const getHeaderDataFunc = (
     text: localization.common.access,
     isSortable: false,
     sort: 'asc',
-    width: '104px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -195,7 +195,7 @@ export const getHeaderDataFunc = (
     text: localization.common.driverType,
     isSortable: false,
     sort: 'asc',
-    width: '120px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -205,7 +205,7 @@ export const getHeaderDataFunc = (
     text: localization.common.device,
     isSortable: false,
     sort: 'asc',
-    width: '120px',
+    width: '180px',
     show: true,
     filter: false,
   },
@@ -259,7 +259,11 @@ export const getBodyDataFunc = (
       testId: `${storage.name}-${index}-thin-provisioning`,
     }
 
-    const hardwareAccelerationKey = storage.hardware_acceleration
+    const hardwareAccelerationKey =
+      E_StorageHardwareAcceleration[
+        storage.hardware_acceleration as keyof typeof E_StorageHardwareAcceleration
+      ]
+
     const hardwareAccelerationData = {
       ...HARDWARE_ACCELERATION_MAPPING[
         hardwareAccelerationKey as keyof typeof HARDWARE_ACCELERATION_MAPPING

package/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/new/New.vue

@@ -23,7 +23,7 @@
           class="disk-table__configure-button"
           @click="emits('configure')"
         >
-          <ui-icon name="settings" width="16" height="16" />
+          <ui-icon name="config" width="16" height="16" />
           {{ localization.inventoryTabs.configure }}
         </ui-button>
       </template>
@@ -159,19 +159,18 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
 </style>
 <style lang="scss" scoped>
 .disk-table {
-  margin: 16px 0 24px;
+  margin: 16px 0;
   :deep(.title-container) {
     h5 {
       margin-bottom: 0;
     }
     .title-container-top-info {
       border-left: 1px solid var(--horizontal-line);
-      padding-left: 12px;
-      margin-left: 12px;
+      padding-left: 10px;
+      margin-left: 10px;
     }
     h6.title-container-top-selected-rows {
-      font-size: 12px;
-      line-height: 20px;
+      line-height: inherit;
     }
   }
   &__icon {
@@ -181,13 +180,9 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
     font-size: 12px;
   }
   &__configure-button {
-    column-gap: 4px;
     background: var(--select-bg);
     border: 1px solid var(--line-color);
     color: var(--title-form-first-color);
-    &.ui-btn.ui-btn-sm {
-      height: 28px;
-    }
     &:hover {
       background: var(--custom-button-default-hover-bg-color);
     }