bfg-common 1.5.749 → 1.5.750

package/components/common/vm/snapshots/modals/confirm/New.vue

@@ -118,6 +118,11 @@ const descriptionText = computed<string>(() => {
 
   .confirm-modal-checkbox {
     height: max-content;
+
+    :deep(.ui-checkbox-label-text) {
+      line-height: 18px;
+      margin-top: 1px;
+    }
   }
 }
 </style>

package/components/common/vm/snapshots/modals/confirm/lib/models/enums.ts

@@ -11,8 +11,8 @@ export enum UI_E_TitleConfirmModal {
 export enum UI_E_TitleModal {
   'take' = '',
   'edit' = '',
-  'revert' = 'revertToSnapshotConfirmation',
-  'delete' = 'deleteSnapshotConfirmation',
+  'revert' = 'revertToSnapshot',
+  'delete' = 'deleteSnapshot',
   'delete_all' = 'deleteAllSnapshots',
   'group_delete_all' = 'deleteAllSnapshots',
   'group_take' = '',

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

@@ -45,7 +45,7 @@
           :label="localization.common.name"
           :error="nameError"
           test-id="vm-take-edit-snapshot-modal-name-input"
-          class="form__input mb-6"
+          class="mb-6"
           input-style="rounded"
           size="md"
           @change="onCheckNameValidation"
@@ -57,6 +57,7 @@
           test-id="vm-take-edit-snapshot-modal-name-input"
           height="84"
           size="sm"
+          class="vm-take-edit-textarea"
         />
 
         <div v-if="props.type === 'take'" class="mt-6">
@@ -64,7 +65,7 @@
             v-model="isIncludeVirtualMachinesMemory"
             :label-text="localization.snapshots.saveVirtualMachineMemory"
             :disabled="props.isDisabledSaveVm"
-            class="mb-3 flex items-start"
+            class="mb-3 flex items-start bottom-checkbox"
             test-id="vm-take-edit-snapshot-modal-save-memory-checkbox"
             size="md"
           />
@@ -73,7 +74,7 @@
             :label-text="
               localization.common.quiesceGuestFileSystemRequiresVMTools
             "
-            class="flex items-start"
+            class="flex items-start bottom-checkbox"
             test-id="vm-take-edit-snapshot-modal-quiesce-guest-file-system-checkbox"
             size="md"
             disabled
@@ -129,8 +130,8 @@ const alertMessages = ref<string[]>([])
 const title = computed<string>(() => {
   let titleType =
     props.type === 'take'
-      ? localization.value.common.takeSnapshot
-      : localization.value.common.editSnapshot
+      ? localization.value.snapshots.newSnapshot
+      : localization.value.snapshots.editSnapshot
 
   titleType = titleType.replace('snapshot', 'Snapshot')
 
@@ -158,11 +159,26 @@ const onSubmit = (): void => {
     alertMessages.value = [
       localization.value.common.nameAlreadyExists.replace('{0}', name),
     ]
-    nameError.value = ' ' // Чтобы поле отображало рамку ошибки
+    nameError.value = ' '
     return
   }
   emits('submit')
 }
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.vm-take-edit-textarea {
+  :deep(.ui-main .ui-main-textarea) {
+    line-height: 18px;
+    height: 72px !important;
+  }
+}
+.bottom-checkbox {
+  height: unset !important;
+
+  :deep(.ui-checkbox-label-text) {
+    line-height: 18px;
+    margin-top: 1px;
+  }
+}
+</style>

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

@@ -1,27 +1,30 @@
 <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">
+      <div class="flex justify-between gap-4 flex-wrap">
         <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"
+            class="mr-2 icon"
           />
-          {{ localization.common.takeSnapshot }}
+          {{ localization.snapshots.takeSnapshot }}
         </ui-button>
       </div>
       <div
@@ -29,16 +32,17 @@
         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">
+            <div class="flex-align-center gap-2">
               <span :class="['node-icon', node.iconClassName]"></span>
-              <span class="node-name text-ellipsis">{{ node.name }}</span>
+              <span class="node-name text-ellipsis text-3">{{
+                node.name
+              }}</span>
             </div>
           </template>
         </ui-tree>
@@ -53,7 +57,7 @@
         <p class="title-block font-[400] text-[16px] mt-2">
           {{ localization.snapshots.noSnapshotsAvailable }}
         </p>
-        <p class="description-block mt-[6px] text-[13px]">
+        <p class="description-block mt-[6px] text-[13px] text-center">
           {{ localization.snapshots.noSnapshotsAvailableDesc }}
         </p>
       </div>
@@ -78,7 +82,7 @@
       v-if="props.detailData"
       class="snapshot-details overflow-hidden flex-direction-column p-4"
     >
-      <div class="flex justify-between mb-6">
+      <div class="flex justify-between mb-6 gap-4 pr-4 flex-wrap">
         <h3 class="title-block font-[500] text-[16px]">
           {{ localization.snapshots.snapshotDetails }}
         </h3>
@@ -168,7 +172,13 @@
           </ui-tooltip>
         </div>
       </div>
-      <div class="grid row-gap-3 overflow-y-auto">
+      <div
+        ref="detailsScrollBlock"
+        :class="[
+          'grid row-gap-3 pr-4 overflow-y-auto details-scroll-block',
+          { 'has-scroll': hasScroll },
+        ]"
+      >
         <ui-info-block
           v-for="(item, index) in currentDetailsData"
           :key="index"
@@ -179,9 +189,12 @@
               <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>
@@ -214,6 +227,7 @@
 </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'
@@ -253,6 +267,20 @@ 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>
@@ -260,7 +288,9 @@ const onSelectContextMenuItem = (actionType: UI_T_SnapshotActionType): void => {
   --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;
@@ -269,7 +299,9 @@ const onSelectContextMenuItem = (actionType: UI_T_SnapshotActionType): void => {
   --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;
@@ -285,6 +317,13 @@ const onSelectContextMenuItem = (actionType: UI_T_SnapshotActionType): void => {
   .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);
@@ -295,13 +334,14 @@ const onSelectContextMenuItem = (actionType: UI_T_SnapshotActionType): void => {
     .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;
@@ -320,6 +360,10 @@ const onSelectContextMenuItem = (actionType: UI_T_SnapshotActionType): void => {
       }
     }
     .delete-all {
+      &.disabled {
+        color: #bdc3c7;
+      }
+
       &:not(.disabled) {
         color: #ea3223;
       }
@@ -329,12 +373,18 @@ const onSelectContextMenuItem = (actionType: UI_T_SnapshotActionType): void => {
     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: #e9ebeda3;
+        background-color: var(--snapshots-page-details-action-line-color);
+      }
+      .revert-snapshot-btn {
+        :deep(path) {
+          stroke-width: 1.6;
+        }
       }
       .revert-snapshot-btn,
       .edit-snapshot-btn {
@@ -348,18 +398,40 @@ const onSelectContextMenuItem = (actionType: UI_T_SnapshotActionType): void => {
         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: 2.5px;
+        margin-top: 1px;
+        line-height: 18px;
         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;
@@ -372,12 +444,23 @@ const onSelectContextMenuItem = (actionType: UI_T_SnapshotActionType): void => {
       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/Skeleton.vue

@@ -0,0 +1,112 @@
+<template>
+  <div class="skeleton-page grid gap-3 p-4 h-inherit overflow-hidden">
+    <div class="left-content grid p-4">
+      <div class="flex justify-between gap-4 flex-wrap">
+        <ui-skeleton-item width="80" height="20" />
+        <ui-skeleton-item width="160" height="36" />
+      </div>
+      <div class="border-block flex flex-col py-3 px-4 my-4">
+        <ui-skeleton-item width="100%" height="20" />
+        <ui-skeleton-item width="50%" height="20" />
+        <ui-skeleton-item width="30%" height="20" />
+        <ui-skeleton-item width="70%" height="20" />
+        <ui-skeleton-item width="20%" height="20" />
+        <ui-skeleton-item width="50%" height="20" />
+        <ui-skeleton-item width="80%" height="20" />
+        <ui-skeleton-item width="70%" height="20" />
+        <ui-skeleton-item width="20%" height="20" />
+      </div>
+      <ui-skeleton-item width="96" height="20" class="ml-auto" />
+    </div>
+    <div class="right-content grid p-4">
+      <div class="flex justify-between gap-4 flex-wrap top-container">
+        <ui-skeleton-item width="80" height="20" />
+        <div class="actions-block flex">
+          <ui-skeleton-item width="20" height="20" />
+          <div class="line-border"></div>
+          <ui-skeleton-item width="20" height="20" />
+          <div class="line-border"></div>
+          <ui-skeleton-item width="20" height="20" />
+        </div>
+      </div>
+      <div class="details-block flex flex-col my-6">
+        <div
+          v-for="index in detailsItemsCount"
+          :key="index"
+          class="details-block-item flex p-3"
+        >
+          <ui-skeleton-item width="20" height="20" class="mr-[10px]" />
+          <ui-skeleton-item width="144" height="20" />
+          <ui-skeleton-item width="144" height="20" class="ml-auto" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+const detailsItemsCount = ref<number>(6)
+</script>
+
+<style>
+:root {
+  --snapshots-left-skeleton-border-color: #e9ebed;
+  --snapshots-right-skeleton-action-line-border-color: #e9ebeda3;
+  --snapshots-right-skeleton-item-bg-color: #e9ebed66;
+}
+:root.dark-theme {
+  --snapshots-left-skeleton-border-color: #e9ebed1f;
+  --snapshots-right-skeleton-action-line-border-color: #e9ebed1f;
+  --snapshots-right-skeleton-item-bg-color: #e9ebed0f;
+}
+</style>
+
+<style scoped lang="scss">
+.skeleton-page {
+  grid-template-columns: repeat(2, calc(50% - 6px));
+
+  .left-content,
+  .right-content {
+    background-color: var(--snapshots-page-inner-block-bg);
+    box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.0784313725);
+    border-radius: 8px;
+    grid-template-rows: max-content 1fr max-content;
+    overflow: hidden;
+  }
+  .border-block {
+    border: 1px solid var(--snapshots-left-skeleton-border-color);
+    border-radius: 8px;
+    grid-row-gap: 10px;
+    overflow: auto;
+
+    :deep(.skeleton-item) {
+      min-height: 20px;
+    }
+  }
+  .right-content {
+    .top-container {
+      .actions-block {
+        grid-column-gap: 10px;
+
+        .line-border {
+          border: 1px solid
+            var(--snapshots-right-skeleton-action-line-border-color);
+        }
+      }
+    }
+    .details-block {
+      grid-row-gap: 10px;
+      overflow: auto;
+
+      .details-block-item {
+        background-color: var(--snapshots-right-skeleton-item-bg-color);
+        border-radius: 6px;
+      }
+
+      :deep(.skeleton-item) {
+        min-height: 20px;
+      }
+    }
+  }
+}
+</style>

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

@@ -54,6 +54,7 @@ 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(
@@ -75,20 +76,26 @@ const onSelectContextMenuItem = (item: UI_I_ContextMenuItem): void => {
 
 <style scoped lang="scss">
 .snapshot-context-menu-view {
-  :deep(.menu-item) {
-    .context-icon {
-      display: none;
-    }
+  :deep(.context-wrap) {
+    min-width: 112px;
 
-    .item-ui-icon {
-      margin-right: 8px;
-    }
+    .menu-item {
+      .context-icon {
+        display: none;
+      }
 
-    &:last-child {
-      color: #ea3223;
+      .item-ui-icon {
+        margin-right: 8px;
+        width: 16px;
+        height: 16px;
+      }
 
-      .context-link:hover {
+      &:last-child {
         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: 'disk',
+          labelIcon: 'size',
         },
         {
           label: localization.snapshots.snapshotVMMemory,

package/package.json

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

package/plugins/time.ts

@@ -1,58 +1,58 @@
-import { defineNuxtPlugin } from '#app'
-import type { UI_T_LangValue } from '~/lib/models/types'
-export default defineNuxtPlugin(() => {
-  const time = function (): any {
-    const self: any = {}
-    self.millisecondsToHour = function (ms: number): number {
-      return ~~(ms / 1000 / 60 / 60 / 24)
-    }
-    self.formatTime = (
-      seconds: number,
-      lang: UI_T_LangValue = 'ru_RU'
-    ): string => {
-      const units = {
-        en_US: { s: 's', m: 'm', h: 'h' },
-        ru_RU: { s: 'с', m: 'м', h: 'ч' },
-        hy_AM: { s: 'վ', m: 'ր', h: 'ժ' },
-        be_BY: { s: 'с', m: 'хв', h: 'г' },
-        kk_KZ: { s: 'сек', m: 'мин', h: 'сағ' },
-        zh_CHS: { s: '秒', m: '分', h: '时' },
-        BROWSER: { s: 's', m: 'm', h: 'h' },
-      }
-
-      const unit = units[lang] || units.en_US
-
-      if (seconds < 60) {
-        return `${seconds}${unit.s}`
-      }
-
-      const hours = Math.floor(seconds / 3600)
-      const minutes = Math.floor((seconds % 3600) / 60)
-      const secs = seconds % 60
-
-      let result = ''
-
-      if (hours > 0) {
-        result += `${hours}${unit.h} `
-      }
-
-      if (minutes > 0) {
-        result += `${minutes}${unit.m} `
-      }
-
-      if (secs > 0) {
-        result += `${secs}${unit.s}`
-      }
-
-      return result.trim()
-    }
-
-    return self
-  }.call({})
-
-  return {
-    provide: {
-      time,
-    },
-  }
-})
+import { defineNuxtPlugin } from '#app'
+import type { UI_T_LangValue } from '~/lib/models/types'
+export default defineNuxtPlugin(() => {
+  const time = function (): any {
+    const self: any = {}
+    self.millisecondsToHour = function (ms: number): number {
+      return ~~(ms / 1000 / 60 / 60 / 24)
+    }
+    self.formatTime = (
+      seconds: number,
+      lang: UI_T_LangValue = 'ru_RU'
+    ): string => {
+      const units = {
+        en_US: { s: 's', m: 'm', h: 'h' },
+        ru_RU: { s: 'с', m: 'м', h: 'ч' },
+        hy_AM: { s: 'վ', m: 'ր', h: 'ժ' },
+        be_BY: { s: 'с', m: 'хв', h: 'г' },
+        kk_KZ: { s: 'сек', m: 'мин', h: 'сағ' },
+        zh_CHS: { s: '秒', m: '分', h: '时' },
+        BROWSER: { s: 's', m: 'm', h: 'h' },
+      }
+
+      const unit = units[lang] || units.en_US
+
+      if (seconds < 60) {
+        return `${seconds}${unit.s}`
+      }
+
+      const hours = Math.floor(seconds / 3600)
+      const minutes = Math.floor((seconds % 3600) / 60)
+      const secs = seconds % 60
+
+      let result = ''
+
+      if (hours > 0) {
+        result += `${hours}${unit.h} `
+      }
+
+      if (minutes > 0) {
+        result += `${minutes}${unit.m} `
+      }
+
+      if (secs > 0) {
+        result += `${secs}${unit.s}`
+      }
+
+      return result.trim()
+    }
+
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      time,
+    },
+  }
+})