bfg-common 1.6.22 → 1.6.24

package/components/common/wizards/network/add/AddNew.vue

@@ -44,21 +44,22 @@
         >
           <template #subTitle>
             <div ref="selectTargetDeviceBlock">
-              <div class="alert-block flex flex-col">
+              <div class="subtitle-block flex flex-col">
                 <template
                   v-for="(message, field, key) in selectedStep.fields"
                   :key="key"
                 >
                   <ui-alert
-                    v-if="!!message.alert"
                     :messages="[message.alert]"
                     test-id="select-target-device-alert"
+                    :class="{
+                      'mb-4':
+                        props.alertMessages[selectedStep.id].length - 1 === key,
+                    }"
                     size="md"
                     @hide="emits('hide-alert', selectedStep.id, field)"
                   />
                 </template>
-              </div>
-              <div class="subtitle-block flex flex-col">
                 <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
                 <ui-line margin="12px 0 0" />
               </div>
@@ -88,21 +89,22 @@
         >
           <template #subTitle>
             <div ref="createStandardSwitchBlock">
-              <div class="alert-block flex flex-col">
+              <div class="subtitle-block flex flex-col">
                 <template
                   v-for="(message, field, key) in selectedStep.fields"
                   :key="key"
                 >
                   <ui-alert
-                    v-if="!!message.alert"
                     :messages="[message.alert]"
                     test-id="create-standard-switch-alert"
+                    :class="{
+                      'mb-4':
+                        props.alertMessages[selectedStep.id].length - 1 === key,
+                    }"
                     size="md"
                     @hide="emits('hide-alert', selectedStep.id, field)"
                   />
                 </template>
-              </div>
-              <div class="subtitle-block flex flex-col">
                 <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
                 <ui-line margin="12px 0 0" />
               </div>
@@ -144,21 +146,22 @@
         >
           <template #subTitle>
             <div ref="portPropertiesBlock">
-              <div class="alert-block flex flex-col">
+              <div class="subtitle-block flex flex-col">
                 <template
                   v-for="(message, field, key) in selectedStep.fields"
                   :key="key"
                 >
                   <ui-alert
-                    v-if="!!message.alert"
                     :messages="[message.alert]"
                     test-id="port-properties-alert"
+                    :class="{
+                      'mb-4':
+                        props.alertMessages[selectedStep.id].length - 1 === key,
+                    }"
                     size="md"
                     @hide="emits('hide-alert', selectedStep.id, field)"
                   />
                 </template>
-              </div>
-              <div class="subtitle-block flex flex-col">
                 <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
                 <ui-line margin="12px 0 0" />
               </div>
@@ -187,21 +190,22 @@
         >
           <template #subTitle>
             <div ref="ipFourSettingsBlock">
-              <div class="alert-block flex flex-col">
+              <div class="subtitle-block flex flex-col">
                 <template
                   v-for="(message, field, key) in selectedStep.fields"
                   :key="key"
                 >
                   <ui-alert
-                    v-if="!!message.alert"
                     :messages="[message.alert]"
                     test-id="ip-four-settings-alert"
+                    :class="{
+                      'mb-4':
+                        props.alertMessages[selectedStep.id].length - 1 === key,
+                    }"
                     size="md"
                     @hide="emits('hide-alert', selectedStep.id, field)"
                   />
                 </template>
-              </div>
-              <div class="subtitle-block flex flex-col">
                 <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
                 <ui-line margin="12px 0 0" />
               </div>
@@ -229,21 +233,22 @@
         >
           <template #subTitle>
             <div ref="connectionSettingsBlock">
-              <div class="alert-block flex flex-col">
+              <div class="subtitle-block flex flex-col">
                 <template
                   v-for="(message, field, key) in selectedStep.fields"
                   :key="key"
                 >
                   <ui-alert
-                    v-if="!!message.alert"
                     :messages="[message.alert]"
                     test-id="connection-settings-alert"
+                    :class="{
+                      'mb-4':
+                        props.alertMessages[selectedStep.id].length - 1 === key,
+                    }"
                     size="md"
                     @hide="emits('hide-alert', selectedStep.id, field)"
                   />
                 </template>
-              </div>
-              <div class="subtitle-block flex flex-col">
                 <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
                 <ui-line margin="12px 0 0" />
               </div>
@@ -458,7 +463,6 @@ const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
   }
   :deep(.ui-wizard-content-with-subtitle) {
     padding-right: 0;
-    scrollbar-gutter: unset;
   }
 }
 
@@ -473,7 +477,7 @@ const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {
 :deep(.ui-alert-item) {
   margin-bottom: 12px;
 
-  &:last-of-type {
+  &.mb-4 {
     margin-bottom: 16px;
   }
 }

package/components/common/wizards/network/add/lib/config/initialData.ts

@@ -37,7 +37,7 @@ export const portPropertiesInitial = (
   localization: UI_I_Localization
 ): UI_I_PortProperties => ({
   networkLabel: '',
-  vlanId: `${localization.common.none2} (0)`,
+  vlanId: `${localization.common.none} (0)`,
   mtu: {
     option: '0',
     size: 1500,
@@ -62,15 +62,15 @@ export const connectionSettingsInitial = (
   localization: UI_I_Localization
 ): UI_I_ConnectionSettings => ({
   networkLabel: 'VM Network',
-  vlanId: `${localization.common.none2} (0)`,
+  vlanId: `${localization.common.none} (0)`,
 })
 
 export const vlanIdSelectDataFunc = (
   localization: UI_I_Localization
 ): UI_I_VlanIdData[] => [
   {
-    text: `${localization.common.none2} (0)`,
-    value: `${localization.common.none2} (0)`,
+    text: `${localization.common.none} (0)`,
+    value: `${localization.common.none} (0)`,
   },
   {
     text: `${localization.common.all} (4095)`,

package/components/common/wizards/network/add/lib/utils/utils.ts

@@ -5,5 +5,5 @@ export const getVlanId = (
   localization: UI_I_Localization
 ): string =>
   (vlanId === `${localization.common.all} (4095)` && '4095') ||
-  (vlanId === `${localization.common.none2} (0)` && '0') ||
+  (vlanId === `${localization.common.none} (0)` && '0') ||
   vlanId

package/components/common/wizards/network/add/steps/ipFourSettings/IpFourSettingsNew.vue

@@ -281,8 +281,14 @@ const fields = computed({
   }
 }
 :deep(.ui-checkbox-label) {
-  &.md {
-    height: unset;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+
+  .ui-checkbox-label-text {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
   }
 }
 .tooltip-text {

package/components/common/wizards/network/add/steps/portProperties/PortPropertiesNew.vue

@@ -299,8 +299,14 @@ const portPropertiesEnabledServices = computed<
   padding: 0 8px 0 12px;
 }
 :deep(.ui-checkbox-label) {
-  &.md {
-    height: unset;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+
+  .ui-checkbox-label-text {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
   }
 }
 </style>

package/components/common/wizards/network/add/steps/selectTargetDevice/SelectTargetDeviceNew.vue

@@ -103,7 +103,7 @@
               <template #row="{ item }">
                 <div v-if="item.iconName" class="browse-btn">
                   <ui-button
-                    test-id="browse-network"
+                    test-id="button-1"
                     type="primary"
                     variant="text"
                     size="lg"
@@ -154,7 +154,7 @@
               <template #row="{ item }">
                 <div v-if="item.iconName" class="browse-btn">
                   <ui-button
-                    test-id="browse-standard-switch"
+                    test-id="button-1"
                     type="primary"
                     variant="text"
                     size="lg"
@@ -203,7 +203,7 @@
               <template #row="{ item }">
                 <div v-if="item.iconName" class="browse-btn">
                   <ui-button
-                    test-id="browse-switch"
+                    test-id="button-1"
                     type="primary"
                     variant="text"
                     size="lg"
@@ -357,17 +357,10 @@ watch(
     :deep(.ui-btn) {
       justify-content: flex-start;
       height: 32px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      width: 100%;
 
       span {
         text-align: left;
         color: var(--select-text);
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
       }
 
       &:hover {

package/components/common/wizards/network/add/steps/selectTargetDevice/modals/new/SelectNetwork.vue

@@ -46,7 +46,7 @@ import type {
   UI_I_DataTable,
   UI_I_DataTableHeader,
   UI_I_DataTableBody,
-  UI_I_TableTexts,
+  UI_I_TableTexts
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
@@ -147,10 +147,6 @@ const onSelectNetwork = (): void => {
 <style scoped lang="scss">
 :deep(.table-container) {
   padding: 8px 32px !important;
-
-  .column-manager-button span {
-    font-weight: 500;
-  }
 }
 
 .row-container {

package/components/common/wizards/network/add/validations/common.ts

@@ -21,7 +21,7 @@ export const checkVlanId = (
   vlanId: string,
   localization: UI_I_Localization
 ): boolean =>
-  vlanId !== `${localization.common.none2} (0)` &&
+  vlanId !== `${localization.common.none} (0)` &&
   vlanId !== `${localization.common.all} (4095)` &&
   (isIntegerNumberInRange(vlanId, 0, 4095) || vlanId.trim() === '')
 

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"
@@ -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,16 +140,13 @@ 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>
 

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

@@ -222,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}`,
         },
 

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>
 

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

@@ -69,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

@@ -118,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/disk/table/new/lib/config/diskTable.ts

@@ -158,6 +158,7 @@ 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]
@@ -183,12 +184,6 @@ 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,
@@ -226,10 +221,10 @@ export const getBodyDataFunc = (
           data: diskSharingData,
         },
 
-        { col: 'col6', text: disk.extra.target || '--' },
+        { col: 'col6', text: disk.extra.target },
         {
           col: 'col7',
-          text: diskCacheValue,
+          text: disk.extra.cache,
         },
         { col: 'col8', text: disk.extra.io_control },
         {

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

@@ -79,12 +79,6 @@ 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',
@@ -130,7 +124,7 @@ export const bodyItems = (
       },
       {
         key: 'col7',
-        text: diskCacheValue,
+        text: disk.extra[vmMigrateDiskTableItemKeys[7]],
         id: key,
         testId: `disk-table-${key}`,
       },

package/lib/models/store/tasks/enums.ts

@@ -3,9 +3,6 @@ export enum UI_E_RecentTaskStatus {
   'running',
   'completed',
   'failed',
-  'canceled',
-  'retrying',
-  'warning',
 }
 
 export enum UI_E_IconNameByRecentTaskStatus {

package/lib/models/store/tasks/types.ts

@@ -1,9 +1,8 @@
 export type UI_T_TasksStateLoading = 'tasks' | 'recentTasks'
 export type UI_T_TaskStatus =
-  | 0 // queued
-  | 1 // running
-  | 2 // completed
-  | 3 // failed
-  | 4 // canceled
-  | 5 // retrying
-  | 6 // warning
+    0 | // queued
+    1 | // running
+    2 | // completed
+    3 | // failed
+    4 | // canceled
+    5 // retrying

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.6.22",
+  "version": "1.6.24",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -18,7 +18,7 @@
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
     "bfg-nuxt-3-graph": "1.0.27",
-    "bfg-uikit": "1.1.25",
+    "bfg-uikit": "1.1.9",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",

package/store/tasks/actions.ts

@@ -18,7 +18,6 @@ import type {
 } from '~/lib/models/store/tasks/interfaces'
 import type { UI_I_TasksState } from '~/store/tasks/lib/models/interfaces'
 import type { UI_I_RefreshStack } from '~/store/main/lib/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
 import { tasksConstructor } from '~/store/tasks/mappers/tasks'
 import { recentTasks } from '~/store/tasks/mappers/recentTasks'
 
@@ -29,13 +28,9 @@ export default {
       state: UI_I_TasksState
       dispatch: <T>(arg0: string, arg1: T, arg2: UI_I_CommitOptions) => void
     },
-    payload: {
-      data: UI_I_DataTableQuery
-      project: UI_T_Project
-    }
+    payload: UI_I_DataTableQuery
   ): Promise<API_UI_I_Error | void> {
-    const { data, project } = payload
-    const { page, pageSize, sortBy, filter } = data
+    const { page, pageSize, sortBy, filter } = payload
 
     const query: UI_I_TableQuery = {
       page_size: pageSize,
@@ -43,21 +38,7 @@ export default {
     }
 
     if (sortBy) query.sortBy = sortBy
-    if (filter) {
-      if (project === 'procurator') {
-        query.filter = filter
-      } else {
-        const filters = filter.split(',')
-        filters.forEach((item) => {
-          const [field, value] = item.split('.')
-
-          if (field && value) {
-            // @ts-ignore
-            query[field] = value
-          }
-        })
-      }
-    }
+    if (filter) query.filter = filter
 
     const queryJson: string = JSON.stringify({ type: 'tasks', ...query })
     const lastQuery: string = context.state.taskQuery || ''
@@ -82,9 +63,7 @@ export default {
           value: true,
         })
       },
-      onResponse({
-        response,
-      }: API_UI_I_Response<API_UI_I_Task<string> | null>) {
+      onResponse({ response }: API_UI_I_Response<API_UI_I_Task<string> | null>) {
         const tasks = tasksConstructor(response._data)
 
         context.commit('M_SET_TASKS_LIST', tasks)
@@ -161,7 +140,10 @@ export default {
     payload: string
   ): Promise<void> {
     // Скрываем кнопку cancel
-    context.commit('M_HIDE_CANCEL_RECENT_TASK_BY_ID', payload)
+    context.commit(
+      'M_HIDE_CANCEL_RECENT_TASK_BY_ID',
+      payload
+    )
     const { error } = await useMyFetch<
       API_UI_I_RecentTask<string>,
       API_UI_I_Error

package/store/tasks/mappers/recentTasks.ts

@@ -82,7 +82,6 @@ export const recentTasks = (
             statusIcon = 'error-outline'
             break
           case 5:
-          case 6:
             statusIcon = 'warning-outline'
             break
         }

package/components/common/configure/physicalAdapters/modals/edit/lib/validations/validations.ts

@@ -1,19 +0,0 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const vfNumberValidationFunc = (
-  vfNumber: number,
-  localization: UI_I_Localization,
-  isAlert = false
-): string => {
-  if (vfNumber !== 0 && !vfNumber) {
-    return isAlert
-      ? localization.inventoryConfigure.vfRequiredMessage
-      : localization.common.fieldRequired
-  } else if (vfNumber < 1 || vfNumber > 63) {
-    return isAlert
-      ? localization.inventoryConfigure.vfNotNegativeMessage
-      : localization.inventoryConfigure.vfNotNegativeMessage
-  }
-
-  return ''
-}