bfg-common 1.5.750 → 1.5.752

package/components/common/vm/snapshots/new/New.vue

@@ -1,30 +1,27 @@
 <template>
-  <common-vm-snapshots-new-skeleton v-if="props.snapshotsLoading" />
   <div
-    v-else
     :class="[
       'snapshots-page grid h-inherit p-4 overflow-hidden ',
       { 'selected gap-3': props.detailData },
     ]"
   >
     <div class="left-content overflow-auto grid p-4">
-      <div class="flex justify-between gap-4 flex-wrap">
+      <div class="flex justify-between">
         <h3 class="title-block font-[500] text-[16px]">
           {{ localization.inventoryTabs.snapshots }} ({{ snapshotsCount }})
         </h3>
         <ui-button
           test-id="take-snapshot-btn"
           size="md"
-          class="take-snapshot-button"
           @click="emits('show-modal', 'take')"
         >
           <ui-icon
             name="icon-snapshotTake"
             width="20"
             height="20"
-            class="mr-2 icon"
+            class="mr-2"
           />
-          {{ localization.snapshots.takeSnapshot }}
+          {{ localization.common.takeSnapshot }}
         </ui-button>
       </div>
       <div
@@ -32,17 +29,16 @@
         class="snapshots-tree-content overflow-y-auto my-4 px-2 pb-2"
       >
         <ui-tree
+          :is-loading="props.snapshotsLoading"
           :nodes="props.snapshotsTree"
           @select-node="emits('select-node', $event)"
           @toggle-node="emits('show-nodes', $event.id)"
           @show-context-menu="showContextMenu"
         >
           <template #content="{ node }">
-            <div class="flex-align-center gap-2">
+            <div class="flex-align-center">
               <span :class="['node-icon', node.iconClassName]"></span>
-              <span class="node-name text-ellipsis text-3">{{
-                node.name
-              }}</span>
+              <span class="node-name text-ellipsis">{{ node.name }}</span>
             </div>
           </template>
         </ui-tree>
@@ -57,7 +53,7 @@
         <p class="title-block font-[400] text-[16px] mt-2">
           {{ localization.snapshots.noSnapshotsAvailable }}
         </p>
-        <p class="description-block mt-[6px] text-[13px] text-center">
+        <p class="description-block mt-[6px] text-[13px]">
           {{ localization.snapshots.noSnapshotsAvailableDesc }}
         </p>
       </div>
@@ -82,7 +78,7 @@
       v-if="props.detailData"
       class="snapshot-details overflow-hidden flex-direction-column p-4"
     >
-      <div class="flex justify-between mb-6 gap-4 pr-4 flex-wrap">
+      <div class="flex justify-between mb-6">
         <h3 class="title-block font-[500] text-[16px]">
           {{ localization.snapshots.snapshotDetails }}
         </h3>
@@ -172,13 +168,7 @@
           </ui-tooltip>
         </div>
       </div>
-      <div
-        ref="detailsScrollBlock"
-        :class="[
-          'grid row-gap-3 pr-4 overflow-y-auto details-scroll-block',
-          { 'has-scroll': hasScroll },
-        ]"
-      >
+      <div class="grid row-gap-3 overflow-y-auto">
         <ui-info-block
           v-for="(item, index) in currentDetailsData"
           :key="index"
@@ -189,12 +179,9 @@
               <ui-icon
                 v-if="item.labelIcon"
                 :name="item.labelIcon"
-                :class="[
-                  'info-label-icon mr-[10px]',
-                  `icon-name-${item.labelIcon}`,
-                ]"
                 width="20"
                 height="20"
+                class="info-label-icon mr-[10px]"
               />
               <span class="info-label">{{ item.label }}</span>
             </div>
@@ -227,7 +214,6 @@
 </template>
 
 <script setup lang="ts">
-import { useElementSize } from '@vueuse/core'
 import type { UI_I_InfoBlock } from '~/node_modules/bfg-uikit/components/ui/infoBlock/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_SnapshotActionType } from '~/components/common/vm/snapshots/lib/models/types'
@@ -267,20 +253,6 @@ const { showContextMenu, contextMenuShow, contextMenu } = utils.getContextMenu()
 const onSelectContextMenuItem = (actionType: UI_T_SnapshotActionType): void => {
   emits('show-modal', actionType)
 }
-
-const detailsScrollBlock = ref<HTMLElement | null>(null)
-const { height } = useElementSize(detailsScrollBlock)
-const hasScroll = ref<boolean>(false)
-const checkScroll = (): void => {
-  const element = detailsScrollBlock.value
-  if (element) {
-    hasScroll.value = element.scrollHeight > element.clientHeight
-  }
-}
-
-watch(height, () => {
-  checkScroll()
-})
 </script>
 
 <style>
@@ -288,9 +260,7 @@ watch(height, () => {
   --snapshots-page-inner-block-bg: #ffffff;
   --snapshots-page-title-color: #4d5d69;
   --snapshots-page-tree-border-color: #e9ebed;
-  --snapshots-page-tree-block-bg-color: #ffffff;
   --snapshots-page-details-action-color: #4d5d69;
-  --snapshots-page-details-action-line-color: #e9ebeda3;
   --snapshots-page-details-action-hover-color: #213444;
   --snapshots-page-info-block-label-color: #4d5d69;
   --snapshots-page-info-block-value-color: #182531;
@@ -299,9 +269,7 @@ watch(height, () => {
   --snapshots-page-inner-block-bg: #334453;
   --snapshots-page-title-color: #e9eaec;
   --snapshots-page-tree-border-color: #e9ebed1f;
-  --snapshots-page-tree-block-bg-color: #1b2a371f;
   --snapshots-page-details-action-color: #e9eaec;
-  --snapshots-page-details-action-line-color: #e9ebed1f;
   --snapshots-page-details-action-hover-color: #ffffff;
   --snapshots-page-info-block-label-color: #e9eaec;
   --snapshots-page-info-block-value-color: #e9eaec;
@@ -317,13 +285,6 @@ watch(height, () => {
   .title-block {
     color: var(--snapshots-page-title-color);
   }
-  .take-snapshot-button {
-    white-space: nowrap;
-
-    .icon {
-      min-width: 20px;
-    }
-  }
 
   .left-content {
     background-color: var(--snapshots-page-inner-block-bg);
@@ -334,14 +295,13 @@ watch(height, () => {
     .snapshots-tree-content {
       border: 1px solid var(--snapshots-page-tree-border-color);
       border-radius: 8px;
-      background-color: var(--snapshots-page-tree-block-bg-color);
 
       :deep(.tree-container) {
         width: max-content;
         min-width: 100%;
 
         .tree-content {
-          //padding-right: 8px;
+          padding-right: 8px;
 
           .node-wrapper {
             border-radius: 4px;
@@ -360,10 +320,6 @@ watch(height, () => {
       }
     }
     .delete-all {
-      &.disabled {
-        color: #bdc3c7;
-      }
-
       &:not(.disabled) {
         color: #ea3223;
       }
@@ -373,18 +329,12 @@ watch(height, () => {
     background-color: var(--snapshots-page-inner-block-bg);
     box-shadow: 0 1px 4px 0 #00000014;
     border-radius: 8px;
-    padding-right: 0;
 
     .details-actions-block {
       .border-line {
         width: 1px;
         height: 20px;
-        background-color: var(--snapshots-page-details-action-line-color);
-      }
-      .revert-snapshot-btn {
-        :deep(path) {
-          stroke-width: 1.6;
-        }
+        background-color: #e9ebeda3;
       }
       .revert-snapshot-btn,
       .edit-snapshot-btn {
@@ -398,40 +348,18 @@ watch(height, () => {
         color: #ea3223;
       }
     }
-    .details-scroll-block {
-      padding-right: 0;
-
-      &:not(.has-scroll) {
-        padding-right: 16px;
-      }
-    }
     .info-block-label-content {
       .info-label-icon {
         color: #9da6ad;
         min-width: 20px;
-
-        &.icon-name-icon-snapshotTake {
-          :deep(path) {
-            stroke-width: 1.3;
-          }
-        }
-        &.icon-name-settings {
-          :deep(path) {
-            stroke-width: 1.7;
-          }
-        }
       }
       .info-label {
-        margin-top: 1px;
-        line-height: 18px;
+        margin-top: 2.5px;
         color: var(--snapshots-page-info-block-label-color);
       }
     }
     .empty-description {
       color: #9da6ad;
-      margin-top: 1px;
-      line-height: 18px;
-      text-align: right;
     }
     :deep(.ui-main-info-block-item-right) {
       white-space: unset !important;
@@ -444,23 +372,12 @@ watch(height, () => {
       color: var(--snapshots-page-info-block-value-color);
       font-size: 13px;
       font-weight: 400;
-      line-height: 18px;
-      margin-top: 1px;
     }
     :deep(.ui-main-info-block-item-right-open) {
       display: none;
     }
   }
 }
-:root.dark-theme {
-  .left-content {
-    .delete-all {
-      &.disabled {
-        opacity: 0.44;
-      }
-    }
-  }
-}
 
 @media (max-width: 1200px) {
   .snapshots-page {

package/components/common/vm/snapshots/new/contextMenuView/ContextMenuView.vue

@@ -54,7 +54,6 @@ const showContextMenu = (data: UI_I_ContextData): void => {
   contextMenu.value.type = node.type
   contextMenu.value.titleText = node.name
   contextMenu.value.titleIconClassName = node.iconClassName
-  contextMenu.value.items = contextMenuItemsFunc(localization.value)
 }
 
 watch(
@@ -76,26 +75,20 @@ const onSelectContextMenuItem = (item: UI_I_ContextMenuItem): void => {
 
 <style scoped lang="scss">
 .snapshot-context-menu-view {
-  :deep(.context-wrap) {
-    min-width: 112px;
+  :deep(.menu-item) {
+    .context-icon {
+      display: none;
+    }
 
-    .menu-item {
-      .context-icon {
-        display: none;
-      }
+    .item-ui-icon {
+      margin-right: 8px;
+    }
 
-      .item-ui-icon {
-        margin-right: 8px;
-        width: 16px;
-        height: 16px;
-      }
+    &:last-child {
+      color: #ea3223;
 
-      &:last-child {
+      .context-link:hover {
         color: #ea3223;
-
-        .context-link:hover {
-          color: #ea3223;
-        }
       }
     }
   }

package/components/common/vm/snapshots/new/lib/utils/details.ts

@@ -31,7 +31,7 @@ export const constructDetails = (
           label: localization.common.size,
           value: detailData.size || '--',
           items: [],
-          labelIcon: 'size',
+          labelIcon: 'disk',
         },
         {
           label: localization.snapshots.snapshotVMMemory,

package/components/common/wizards/common/steps/computeResource/New.vue

@@ -52,8 +52,16 @@ const onSelectNode = (node: UI_I_TreeNode): void => emits('select-node', node)
 <style scoped lang="scss">
 @import 'assets/scss/common/mixins.scss';
 .compute-resource {
+  display: grid;
+  grid-template-rows: 1fr auto;
+  min-height: 100%;
+  padding-top: 16px;
+  padding-bottom: 16px;
+  grid-row-gap: 24px;
+
   &__container-tree {
-    height: 240px;
+    max-height: 240px;
+    height: 100%;
     background: var(--input-bg);
     border: 1px solid var(--line-color);
     border-radius: 8px;

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

@@ -146,7 +146,7 @@ import {
   connectionSettingsInitial,
   portPropertiesInitial,
   ipFourSettingsInitial,
-  targetDeviceInitialFunc,
+  targetDeviceInitial,
   addNetworkingZeroOrFirstSchemeDataFunc,
   addNetworkingSecondOrThirdSchemeDataFunc,
   addNetworkingFourthOrFifthSchemeDataFunc,
@@ -245,19 +245,8 @@ const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
 const readyCompleteFields = ref<UI_I_ReadyCompleteFields[]>([])
 
-const globalPermissions = computed<any>(
-  () => $store.getters['globalPermissions/getPermissions']
-)
-
 // Step's content data (connectionType)
-const connectionType = ref<string>(
-  !globalPermissions.value['Networks.CreateSysx'] &&
-    !globalPermissions.value['Networks.CreatePortGroup']
-    ? '2'
-    : !globalPermissions.value['Networks.CreateSysx']
-    ? '1'
-    : '0'
-)
+const connectionType = ref<string>('0')
 
 const connectionTypeLocal = computed<string>({
   get() {
@@ -289,11 +278,7 @@ const onChangeAdapterStatus = (adapterStatusNew: UI_I_AdapterStatus): void => {
 }
 
 // Step's content data and changers (targetDevice)
-const targetDevice = ref<UI_I_TargetDevice>(
-  useDeepCopy(
-    targetDeviceInitialFunc(globalPermissions.value['Networks.UpdateSwitch'])
-  )
-)
+const targetDevice = ref<UI_I_TargetDevice>(useDeepCopy(targetDeviceInitial))
 const mtuFromSwitch = ref<number>(1500)
 
 const onChangeTargetDevice = (newTargetDevice: UI_I_TargetDevice): void => {
@@ -384,10 +369,7 @@ watch(
         ? (targetDevice.value.selected = '1')
         : (targetDevice.value.selected = '0')
       newCT === '1' && (targetDevice.value.selected = '1')
-      newCT === '2' &&
-        (globalPermissions.value['Networks.UpdateSwitch']
-          ? (targetDevice.value.selected = '2')
-          : (targetDevice.value.selected = '3'))
+      newCT === '2' && (targetDevice.value.selected = '2')
     }
     if (newCT === '0') {
       ;(newTD.selected === '0' || newTD.selected === '1') &&
@@ -514,9 +496,7 @@ watch(
 const reset = (): void => {
   wizard.reset()
   connectionTypeLocal.value = '0'
-  targetDevice.value = useDeepCopy(
-    targetDeviceInitialFunc(globalPermissions.value['Networks.UpdateSwitch'])
-  )
+  targetDevice.value = useDeepCopy(targetDeviceInitial)
   connectionSettings.value = useDeepCopy(connectionSettingsInitial)
   portProperties.value = useDeepCopy(portPropertiesInitial)
   ipFourSettings.value = useDeepCopy(ipFourSettingsInitial)

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

@@ -18,7 +18,7 @@ export const {
 export const {
   servicesInitial,
   vlanIdSelectData,
-  targetDeviceInitialFunc,
+  targetDeviceInitial,
   portPropertiesInitial,
   ipFourSettingsInitial,
   connectionSettingsInitial,

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

@@ -22,15 +22,13 @@ export const servicesInitial: UI_I_Services = {
   nVMeOverRDMA: false,
 }
 
-export const targetDeviceInitialFunc = (
-  updateSwitchPermission: boolean
-): UI_I_TargetDevice => ({
-  selected: updateSwitchPermission ? '1' : '3',
+export const targetDeviceInitial: UI_I_TargetDevice = {
+  selected: '1',
   network: '',
   switch: '',
   standardSwitch: '',
   mtu: 1500,
-})
+}
 
 export const portPropertiesInitial: UI_I_PortProperties = {
   networkLabel: '',

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

@@ -27,6 +27,5 @@ export const selectConnectionTypeFunc = (
     value: '2',
     testId: 'physical-adapter-radio',
     id: 'physical-adapter',
-    permission: 'Networks.UpdateSwitch Networks.CreateSwitch',
   },
 ]

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

@@ -34,7 +34,6 @@
 
         <div
           v-show="props.connectionType === '2'"
-          v-permission="'Networks.UpdateSwitch'"
           :class="['radio-block', { selected: fieldsLocal.selected === '2' }]"
           @click="fieldsLocal.selected = '2'"
         >
@@ -47,8 +46,8 @@
           />
         </div>
 
+        <!-- v-permission="'Networks.CreateSwitch'" -->
         <div
-          v-permission="'Networks.CreateSwitch'"
           :class="['radio-block', { selected: fieldsLocal.selected === '3' }]"
           @click="fieldsLocal.selected = '3'"
         >

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

@@ -135,7 +135,7 @@
         </div>
 
         <div v-show="props.connectionType === '2'">
-          <div v-permission="'Networks.UpdateSwitch'" class="radio">
+          <div class="radio">
             <input
               id="existing-switch"
               v-model="fieldsLocal.selected"
@@ -149,7 +149,6 @@
             </label>
           </div>
           <fieldset
-            v-permission="'Networks.UpdateSwitch'"
             :class="{
               disabled: fieldsLocal.selected !== '2',
             }"
@@ -198,7 +197,8 @@
         </div>
 
         <div>
-          <div v-permission="'Networks.CreateSwitch'" class="radio">
+          <!--            v-permission="'Networks.CreateSwitch'"-->
+          <div class="radio">
             <input
               id="standard-switch"
               v-model="fieldsLocal.selected"
@@ -213,7 +213,6 @@
             </label>
           </div>
           <fieldset
-            v-permission="'Networks.CreateSwitch'"
             :class="{
               disabled: fieldsLocal.selected !== '3',
             }"
@@ -268,7 +267,9 @@ import type {
   UI_I_ArbitraryObject,
   UI_I_Localization,
 } from '~/lib/models/interfaces'
-import type { UI_I_TargetDevice } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type {
+  UI_I_TargetDevice,
+} from '~/components/common/wizards/network/add/lib/models/interfaces'
 
 const props = defineProps<{
   fields: UI_I_TargetDevice
@@ -287,19 +288,6 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const existingStandardSwitchPermission = computed<string>(() => {
-  switch (props.connectionType) {
-    case '0':
-      return 'Networks.CreateSysx'
-    case '1':
-      return 'Networks.CreatePortGroup'
-    case '2':
-      return 'Networks.UpdateSwitch'
-    default:
-      return ''
-  }
-})
-
 const fieldsLocal = computed({
   get() {
     return props.fields

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

@@ -84,67 +84,57 @@ export const bodyItems = (
         key: 'col0',
         text: disk[vmMigrateDiskTableItemKeys[0]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col1',
         text: disk[vmMigrateDiskTableItemKeys[1]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col2',
         text: file,
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col3',
         text: disk[vmMigrateDiskTableItemKeys[3]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col4',
         text: diskFormat,
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col5',
         text: disk.extra[vmMigrateDiskTableItemKeys[5]],
         id: key,
-        testId: `disk-table-${key}`,
       },
+
       {
         key: 'col6',
         text: disk.extra[vmMigrateDiskTableItemKeys[6]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col7',
         text: disk.extra[vmMigrateDiskTableItemKeys[7]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col8',
         text: disk.extra[vmMigrateDiskTableItemKeys[8]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col9',
         text: disk.extra[vmMigrateDiskTableItemKeys[9]],
         id: key,
-        testId: `disk-table-${key}`,
       },
       {
         key: 'col10',
         text: disk.extra[vmMigrateDiskTableItemKeys[10]],
         id: key,
-        testId: `disk-table-${key}`,
       },
     ])
   })

package/lib/config/regExp.ts

@@ -8,7 +8,7 @@ const url = /https?:\/\/([a-zA-Zа-яА-Я0-9.-]+\.[a-zA-Zа-яА-Я]{2,6})\b/
 const specialChar = /[!@#$%^&*(),.?":{}|<>]/
 const specialCharWidthSpace = /[!@#$%^&*(),?":{}|<>]|(\s)|\.$/
 const cron = /^(\*|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])|\*\/([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])) (\*|([0-9]|1[0-9]|2[0-3])|\*\/([0-9]|1[0-9]|2[0-3])) (\*|([1-9]|1[0-9]|2[0-9]|3[0-1])|\*\/([1-9]|1[0-9]|2[0-9]|3[0-1])) (\*|([1-9]|1[0-2])|\*\/([1-9]|1[0-2])) (\*|([0-6])|\*\/([0-6]))$/
-export const allRegExp = {
+export const RegExp = {
   ip,
   email,
   password,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.750",
+  "version": "1.5.752",
   "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.0.539",
+    "bfg-uikit": "1.0.538",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",

package/plugins/validation.ts

@@ -1,4 +1,4 @@
-import { allRegExp } from '~/lib/config/regExp'
+import { RegExp } from '~/lib/config/regExp'
 import type {
   UI_I_Validation,
   UI_I_ValidationOption,
@@ -127,30 +127,30 @@ export default defineNuxtPlugin(() => {
           error = validation.errorText
         }
       } else if (validation.value === 'ip') {
-        const isValid = allRegExp.ip.test(value)
+        const isValid = RegExp.ip.test(value)
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'password') {
-        const isValid = value ? allRegExp.password.test(value) : true
+        const isValid = value ? RegExp.password.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'email') {
-        const isValid = value ? allRegExp.email.test(value) : true
+        const isValid = value ? RegExp.email.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'url') {
-        const isValid = value ? allRegExp.url.test(value) : true
+        const isValid = value ? RegExp.url.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'cron') {
-        const isValid = value ? allRegExp.cron.test(value) : true
+        const isValid = value ? RegExp.cron.test(value) : true
 
         if (!isValid) {
           error = validation.errorText