bfg-common 1.6.65 → 1.6.67

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

@@ -10,7 +10,7 @@
     />
 
     <div>
-      <span class="icon-vm small-margin vsphere-icon-vm"></span>
+      <span class="icon-vm vsphere-icon-vm"></span>
     </div>
 
     <span v-if="props.data.length === 1" class="selected-per-disk__text">{{
@@ -31,13 +31,15 @@
         dropdown-right
         dropdown-bottom
       >
-        <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
+          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>
       </common-tooltip-help>
     </div>
@@ -73,19 +75,12 @@ 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;
-      }
     }
   }
 
@@ -94,8 +89,6 @@ 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,7 +37,6 @@ 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,17 +1,12 @@
 <template>
-  <div :class="['tooltip-info', { isOpen: isShowTooltipLocal }]">
-    <span
-      class="tooltip-info__title"
-      @click.stop="isShowTooltipLocal = !isShowTooltipLocal"
-    >
-      {{ localization.common.vmOrigin }}
-    </span>
+  <div class="tooltip-info">
+    <span class="tooltip-info__title">{{ localization.common.vmOrigin }}</span>
     <ui-icon
       id="vm-origin-info-trigger"
-      class="tooltip-info__icon pointer"
+      :class="['tooltip-info__icon pointer', { active: isShowTooltipLocal }]"
       name="info"
-      width="16"
-      height="16"
+      width="20"
+      height="20"
       @click.stop="isShowTooltipLocal = !isShowTooltipLocal"
     />
     <ui-popup-window
@@ -45,7 +40,7 @@
                 :key="item2.name"
                 class="flex items-center mt-2"
               >
-                <span :class="['icon-row', item2.iconName]"></span>
+                <span :class="item2.iconName"></span>
                 <span class="item-name">{{ item2.name }}</span>
               </div>
             </div>
@@ -72,29 +67,22 @@ 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: #9da6ad; // for dark and light mode
+    color: var(--title-form-first-color);
     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 {
@@ -111,22 +99,14 @@ 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: #9da6ad; // for dark and light mode
+        color: var(--title-form-second-color);
         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/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.65",
+  "version": "1.6.67",
   "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.28",
-    "bfg-uikit": "1.1.31",
+    "bfg-uikit": "1.1.9",
     "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,7 +22,8 @@ function applyDevelopmentState(el: HTMLElement, isDevelopment: boolean) {
 
   el.setAttribute('title', localization.value.common.inDevelopment)
   el.setAttribute('disabled', 'true')
-  el.classList.add('in-development')
+  el.style.opacity = '0.6'
+  el.style.cursor = 'not-allowed'
 
   // Оборачиваем, чтобы не навешивать несколько обработчиков
   const preventClick = (e: MouseEvent) => {
@@ -39,7 +40,8 @@ function applyDevelopmentState(el: HTMLElement, isDevelopment: boolean) {
 
 function cleanupDevelopment(el: HTMLElement) {
   el.removeAttribute('title')
-  el.classList.remove('in-development')
+  el.style.opacity = ''
+  el.style.cursor = ''
 
   const handler = (el as any)._developmentClickHandler
   if (handler) {

package/public/spice-console/application/agent.js

@@ -70,7 +70,6 @@ wdi.Agent = $.spcExtend(wdi.EventObject.prototype, {
 
 	setResolution: function(width, height) {
 		//TODO move this to a setting
-    // SC-2122
 		if(width < 800) {
 			width = 800;
 		}
@@ -81,23 +80,23 @@ wdi.Agent = $.spcExtend(wdi.EventObject.prototype, {
 
 		//adapt resolution, TODO: this needs to be refractored
 		var packetData = {
-      type: wdi.AgentMessageTypes.VD_AGENT_MONITORS_CONFIG,
-      opaque: 0,
-      data: new wdi.VDAgentMonitorsConfig({
-        num_of_monitors: 1,
-        flags: 0,
-        data: new wdi.VDAgentMonConfig({
-          width: width,
-          height: height,
-          // Custom code
-          // depth: 64,
-          depth: 32,
-          // Custom code end
-          x: 0,
-          y: 0,
-        }),
-      }),
-    }
+            type: wdi.AgentMessageTypes.VD_AGENT_MONITORS_CONFIG,
+            opaque: 0,
+            data: new wdi.VDAgentMonitorsConfig({
+                num_of_monitors: 1,
+                flags: 0,
+                data: new wdi.VDAgentMonConfig({
+                    width: width,
+                    height: height,
+                    // Custom code
+                    // depth: 64,
+                    depth: 32, // SC-2122
+                    // Custom code end
+                    x: 0,
+                    y: 0
+                })
+            })
+        };
 		this.sendAgentPacket(packetData);
 	},
 

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 ''
-}

package/components/common/diagramMain/header/Header.vue

@@ -1,49 +0,0 @@
-<template>
-  <component
-    :is="currentComponent"
-    :project="props.project"
-    :is-show-diagram="props.isShowDiagram"
-    :diagram-name="props.diagramName"
-    :test-id="props.testId"
-    @toggle-diagram="emits('toggle-diagram')"
-    @show-modal="onShowModal"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_ModalsInitialData } from '~/components/common/diagramMain/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-
-const props = withDefaults(
-  defineProps<{
-    isShowDiagram: boolean
-    diagramName: string
-    testId: string
-    project?: UI_T_Project
-  }>(),
-  {
-    project: undefined,
-  }
-)
-
-const emits = defineEmits<{
-  (event: 'toggle-diagram'): void
-  (event: 'show-modal', modalName: string, data?: { switch_name: string }): void
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./HeaderNew.vue'))
-    : defineAsyncComponent(() => import('./HeaderOld.vue'))
-)
-
-const onShowModal = (modalName: string, data?: { switch_name: string }) => {
-  emits('show-modal', modalName, data)
-}
-</script>
-
-<style scoped lang="scss"></style>