bfg-common 1.6.95 → 1.6.97

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: '180px',
+    width: '160px',
     show: true,
     filter: false,
   },
@@ -105,7 +105,7 @@ export const getHeaderDataFunc = (
     text: localization.inventorySummary.state,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '160px',
     show: true,
     filter: false,
   },
@@ -115,7 +115,7 @@ export const getHeaderDataFunc = (
     text: localization.common.capacity,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -125,7 +125,7 @@ export const getHeaderDataFunc = (
     text: localization.common.provisioned,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -135,7 +135,7 @@ export const getHeaderDataFunc = (
     text: localization.common.free,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -145,7 +145,7 @@ export const getHeaderDataFunc = (
     text: localization.common.used,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -155,7 +155,7 @@ export const getHeaderDataFunc = (
     text: localization.common.type,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '104px',
     show: true,
     filter: false,
   },
@@ -165,7 +165,7 @@ export const getHeaderDataFunc = (
     text: localization.common.thinProvisioning,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '160px',
     show: true,
     filter: false,
   },
@@ -175,7 +175,7 @@ export const getHeaderDataFunc = (
     text: localization.common.access,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '104px',
     show: true,
     filter: false,
   },
@@ -195,7 +195,7 @@ export const getHeaderDataFunc = (
     text: localization.common.driverType,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -205,7 +205,7 @@ export const getHeaderDataFunc = (
     text: localization.common.device,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -259,11 +259,7 @@ export const getBodyDataFunc = (
       testId: `${storage.name}-${index}-thin-provisioning`,
     }
 
-    const hardwareAccelerationKey =
-      E_StorageHardwareAcceleration[
-        storage.hardware_acceleration as keyof typeof E_StorageHardwareAcceleration
-      ]
-
+    const hardwareAccelerationKey = storage.hardware_acceleration
     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="config" width="16" height="16" />
+          <ui-icon name="settings" width="16" height="16" />
           {{ localization.inventoryTabs.configure }}
         </ui-button>
       </template>
@@ -159,18 +159,19 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
 </style>
 <style lang="scss" scoped>
 .disk-table {
-  margin: 16px 0;
+  margin: 16px 0 24px;
   :deep(.title-container) {
     h5 {
       margin-bottom: 0;
     }
     .title-container-top-info {
       border-left: 1px solid var(--horizontal-line);
-      padding-left: 10px;
-      margin-left: 10px;
+      padding-left: 12px;
+      margin-left: 12px;
     }
     h6.title-container-top-selected-rows {
-      line-height: inherit;
+      font-size: 12px;
+      line-height: 20px;
     }
   }
   &__icon {
@@ -180,9 +181,13 @@ 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);
     }

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

@@ -43,7 +43,7 @@ export const getHeaderDataFunc = (
     text: localization.common.diskGroup,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '140px',
     show: true,
     filter: false,
   },
@@ -83,7 +83,7 @@ export const getHeaderDataFunc = (
     text: localization.common.sharing,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -93,7 +93,7 @@ export const getHeaderDataFunc = (
     text: localization.common.target,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -103,7 +103,7 @@ export const getHeaderDataFunc = (
     text: localization.common.cache,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -113,7 +113,7 @@ export const getHeaderDataFunc = (
     text: localization.common.ioControl,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -123,7 +123,7 @@ export const getHeaderDataFunc = (
     text: localization.common.discard,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -133,7 +133,7 @@ export const getHeaderDataFunc = (
     text: localization.common.diskMode,
     isSortable: false,
     sort: 'asc',
-    width: '180px',
+    width: '120px',
     show: true,
     filter: false,
   },
@@ -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,
@@ -198,7 +203,7 @@ export const getBodyDataFunc = (
         },
         {
           col: 'col1',
-          text: disk.disk_group,
+          text: disk.disk_group || '--',
         },
         {
           col: 'col2',
@@ -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/components/common/wizards/vm/migrate/steps/selectStorage/selectedPerDisk/New.vue

@@ -10,7 +10,7 @@
     />
 
     <div>
-      <span class="icon-vm vsphere-icon-vm"></span>
+      <span class="icon-vm small-margin vsphere-icon-vm"></span>
     </div>
 
     <span v-if="props.data.length === 1" class="selected-per-disk__text">{{
@@ -31,15 +31,13 @@
         dropdown-right
         dropdown-bottom
       >
-        <div
-          v-for="(item, key) in props.data"
-          :key="key"
-          class="flex items-center"
-        >
-          <span class="icon-vm vsphere-icon-vm"></span>
-          <span class="selected-per-disk__text">
-            {{ item }}
-          </span>
+        <div class="flex flex-col row-gap-2 mt-5">
+          <div v-for="(item, key) in props.data" :key="key" class="flex">
+            <span class="icon-vm vsphere-icon-vm"></span>
+            <span class="selected-per-disk__text">
+              {{ item }}
+            </span>
+          </div>
         </div>
       </common-tooltip-help>
     </div>
@@ -75,12 +73,19 @@ const onGoBack = (): void => {
       color: var(--btn-primary-fill-bg-color);
       margin-right: 8px;
       cursor: pointer;
+      &:hover {
+        color: var(--btn-primary-fill-hover-bg-color);
+      }
     }
     &-vm {
       display: block;
+      min-width: 20px;
       width: 20px;
       height: 20px;
       margin-right: 8px;
+      &.small-margin {
+        margin-right: 4px;
+      }
     }
   }
 
@@ -89,6 +94,8 @@ const onGoBack = (): void => {
     color: var(--title-form-first-color);
     font-weight: 400;
     font-size: 13px;
+    line-height: 18px;
+    align-self: center;
   }
   &__all-objects {
     @include flex($align: center);

package/components/common/wizards/vm/migrate/steps/type/TypeNew.vue

@@ -37,6 +37,7 @@ const props = defineProps<{
 .datastore-type {
   container-type: inline-size;
   margin-top: 16px;
+  padding-bottom: 16px;
 
   &__radio {
     &-container {

package/components/common/wizards/vm/migrate/vmOrigin/New.vue

@@ -1,12 +1,17 @@
 <template>
-  <div class="tooltip-info">
-    <span class="tooltip-info__title">{{ localization.common.vmOrigin }}</span>
+  <div :class="['tooltip-info', { isOpen: isShowTooltipLocal }]">
+    <span
+      class="tooltip-info__title"
+      @click.stop="isShowTooltipLocal = !isShowTooltipLocal"
+    >
+      {{ localization.common.vmOrigin }}
+    </span>
     <ui-icon
       id="vm-origin-info-trigger"
-      :class="['tooltip-info__icon pointer', { active: isShowTooltipLocal }]"
+      class="tooltip-info__icon pointer"
       name="info"
-      width="20"
-      height="20"
+      width="16"
+      height="16"
       @click.stop="isShowTooltipLocal = !isShowTooltipLocal"
     />
     <ui-popup-window
@@ -40,7 +45,7 @@
                 :key="item2.name"
                 class="flex items-center mt-2"
               >
-                <span :class="item2.iconName"></span>
+                <span :class="['icon-row', item2.iconName]"></span>
                 <span class="item-name">{{ item2.name }}</span>
               </div>
             </div>
@@ -67,22 +72,29 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 @import 'assets/scss/common/mixins.scss';
 .tooltip-info {
   @include flex($align: center);
+  column-gap: 8px;
+  &:hover {
+    .tooltip-info__title,
+    .tooltip-info__icon {
+      color: var(--close-icon);
+      cursor: pointer;
+    }
+  }
+  &.isOpen {
+    .tooltip-info__title,
+    .tooltip-info__icon {
+      color: var(--btn-primary-fill-bg-color);
+    }
+  }
   &__title {
     font-family: 'Inter', sans-serif;
-    color: var(--title-form-first-color);
+    color: #9da6ad; // for dark and light mode
     font-weight: 500;
     font-size: 12px;
     white-space: nowrap;
-    margin-right: 4px;
   }
   &__icon {
     color: var(--form-icon-color);
-    &:hover {
-      color: var(--close-icon);
-    }
-    &.active {
-      color: var(--btn-primary-fill-bg-color);
-    }
   }
 
   .common-widget-info {
@@ -99,14 +111,22 @@ const localization = computed<UI_I_Localization>(() => useLocal())
     &__content {
       .item-row {
         margin-top: 12px;
+        &:first-child {
+          margin-top: 20px;
+        }
       }
       .title-row {
         font-family: 'Inter', sans-serif;
-        color: var(--title-form-second-color);
+        color: #9da6ad; // for dark and light mode
         font-weight: 500;
         font-size: 13px;
+        line-height: 18px;
         margin-bottom: 8px;
       }
+      .icon-row {
+        width: 20px;
+        height: 20px;
+      }
 
       .item-name {
         font-family: 'Inter', sans-serif;

package/composables/useLocalStorage.ts

@@ -37,7 +37,7 @@ export const useLocalStorage = (
   return value
 }
 
-const getLocalStoragePrefix = () => {
+export const getLocalStoragePrefix = () => {
   const { $store } = useNuxtApp()
 
   // @ts-ignore

package/lib/models/interfaces.ts

@@ -66,6 +66,9 @@ export interface UI_I_Localization {
   advancedSystemSettings: UI_I_ArbitraryObject<string>
   tagsAndAttributes: UI_I_ArbitraryObject<string>
   packages: UI_I_ArbitraryObject<string>
+  dhcpServer: UI_I_ArbitraryObject<string>
+  logs: UI_I_ArbitraryObject<string>
+  timeConfiguration: UI_I_ArbitraryObject<string>
 }
 export interface UI_I_SendTaskParams {
   method: string

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

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

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

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

package/lib/utils/validation.ts

@@ -32,12 +32,13 @@ export const validateObjectName = async (
     }
   }
 
-  const status = error.value?.statusCode ?? 500
+  // TODO если в ответе валидации будет другие свойсва попросить чтобы сделали code и message
+  const status = error.value?.code ?? 500
   return {
     statusCode: status,
     error:
       customMessages?.[status] ?? // сообщение снаружи
-      error.value.data?.error_message ??
+      error.value.data?.message ??
       error.value.data, // сообщение backend
     isValid: false,
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.6.95",
+  "version": "1.6.97",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -17,8 +17,8 @@
     "@nuxt/schema": "3.11.2",
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
-    "bfg-nuxt-3-graph": "1.0.27",
-    "bfg-uikit": "1.0.549",
+    "bfg-nuxt-3-graph": "1.0.28",
+    "bfg-uikit": "1.1.34",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",

package/plugins/directives.ts

@@ -1,5 +1,5 @@
 import type { DirectiveBinding } from '@vue/runtime-core'
-import type {UI_I_Localization} from "~/lib/models/interfaces";
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 export default defineNuxtPlugin((nuxtApp) => {
   nuxtApp.vueApp.directive('development', {
@@ -22,8 +22,7 @@ function applyDevelopmentState(el: HTMLElement, isDevelopment: boolean) {
 
   el.setAttribute('title', localization.value.common.inDevelopment)
   el.setAttribute('disabled', 'true')
-  el.style.opacity = '0.6'
-  el.style.cursor = 'not-allowed'
+  el.classList.add('in-development')
 
   // Оборачиваем, чтобы не навешивать несколько обработчиков
   const preventClick = (e: MouseEvent) => {
@@ -40,8 +39,7 @@ function applyDevelopmentState(el: HTMLElement, isDevelopment: boolean) {
 
 function cleanupDevelopment(el: HTMLElement) {
   el.removeAttribute('title')
-  el.style.opacity = ''
-  el.style.cursor = ''
+  el.classList.remove('in-development')
 
   const handler = (el as any)._developmentClickHandler
   if (handler) {