bfg-common 1.5.759 → 1.5.760

package/components/common/pages/backups/backupsNew/BackupsNew.vue

@@ -1,12 +1,14 @@
 <template>
+  <common-pages-backups-backups-new-skeleton v-if="props.backupsLoading" />
   <div
+    v-else
     :class="[
       'backups-page grid h-inherit p-4 overflow-hidden ',
       { 'selected gap-3': props.detailData },
     ]"
   >
-    <div class="left-content grid p-4">
-      <div class="flex justify-between">
+    <div class="left-content overflow-auto grid p-4">
+      <div class="flex justify-between gap-4 flex-wrap">
         <h3 class="title-block font-[500] text-[16px]">
           {{ localization.inventoryTabs.backups }} ({{
             props.backupsTree.length
@@ -17,10 +19,11 @@
           v-permission="props.createBackupPermission"
           test-id="take-backup-btn"
           size="md"
+          class="create-backup-button"
           @click="emits('set-action', 'createBackup')"
         >
-          <ui-icon name="plus" width="20" height="20" class="mr-2" />
-          {{ localization.common.createBackup }}...
+          <ui-icon name="plus" width="20" height="20" class="mr-2 icon" />
+          {{ localization.common.createBackup }}
         </ui-button>
       </div>
       <div
@@ -28,16 +31,17 @@
         class="backups-tree-content overflow-y-auto my-4 px-2 pb-2"
       >
         <ui-tree
-          :is-loading="props.backupsLoading"
           :nodes="props.backupsTree"
           @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>
@@ -52,7 +56,7 @@
         <p class="title-block font-[400] text-[16px] mt-2">
           {{ localization.common.noBackupsAvailable }}
         </p>
-        <p class="description-block mt-[6px] text-[13px]">
+        <p class="description-block mt-[6px] text-[13px] text-center">
           {{ localization.common.noBackupsAvailableDesc }}
         </p>
       </div>
@@ -78,7 +82,7 @@
       v-if="props.detailData"
       class="backups-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.common.backupDetails }}
         </h3>
@@ -142,7 +146,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"
@@ -153,9 +163,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>
@@ -183,6 +196,8 @@
 </template>
 
 <script setup lang="ts">
+import { useTemplateRef } from 'vue'
+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_I_BackupsTreeNode } from '~/components/common/pages/backups/lib/models/interfaces'
@@ -221,6 +236,15 @@ const onSelectContextMenuItem = (actionType: UI_T_BackupActionType): void => {
 const currentDetailsData = computed<UI_I_InfoBlock[]>(() =>
   constructDetails(localization.value, props.detailData)
 )
+
+const detailsElement = useTemplateRef<HTMLDivElement>('detailsScrollBlock')
+const { height } = useElementSize(detailsElement)
+
+const hasScroll = computed<boolean>(
+  () =>
+    height.value &&
+    detailsElement.value?.scrollHeight > detailsElement.value?.clientHeight
+)
 </script>
 
 <style>
@@ -228,7 +252,9 @@ const currentDetailsData = computed<UI_I_InfoBlock[]>(() =>
   --backups-page-inner-block-bg: #ffffff;
   --backups-page-title-color: #4d5d69;
   --backups-page-tree-border-color: #e9ebed;
+  --backups-page-tree-block-bg-color: #ffffff;
   --backups-page-details-action-color: #4d5d69;
+  --backups-page-details-action-line-color: #e9ebeda3;
   --backups-page-details-action-hover-color: #213444;
   --backups-page-info-block-label-color: #4d5d69;
   --backups-page-info-block-value-color: #182531;
@@ -237,7 +263,9 @@ const currentDetailsData = computed<UI_I_InfoBlock[]>(() =>
   --backups-page-inner-block-bg: #334453;
   --backups-page-title-color: #e9eaec;
   --backups-page-tree-border-color: #e9ebed1f;
+  --backups-page-tree-block-bg-color: #1b2a371f;
   --backups-page-details-action-color: #e9eaec;
+  --backups-page-details-action-line-color: #e9ebed1f;
   --backups-page-details-action-hover-color: #ffffff;
   --backups-page-info-block-label-color: #e9eaec;
   --backups-page-info-block-value-color: #e9eaec;
@@ -253,6 +281,13 @@ const currentDetailsData = computed<UI_I_InfoBlock[]>(() =>
   .title-block {
     color: var(--backups-page-title-color);
   }
+  .create-backup-button {
+    white-space: nowrap;
+
+    .icon {
+      min-width: 20px;
+    }
+  }
 
   .left-content {
     background-color: var(--backups-page-inner-block-bg);
@@ -263,15 +298,24 @@ const currentDetailsData = computed<UI_I_InfoBlock[]>(() =>
     .backups-tree-content {
       border: 1px solid var(--backups-page-tree-border-color);
       border-radius: 8px;
+      background-color: var(--backups-page-tree-block-bg-color);
 
-      :deep(.tree-content) {
-        padding-right: 8px;
+      :deep(.tree-container) {
+        width: max-content;
+        min-width: 100%;
 
-        .node-wrapper {
-          border-radius: 4px;
+        .tree-content {
+          //padding-right: 8px;
 
-          .node-element {
-            line-height: 20px;
+          .node-wrapper {
+            border-radius: 4px;
+
+            .toggle-button-empty {
+              display: none;
+            }
+            .node-element {
+              line-height: 20px;
+            }
           }
         }
       }
@@ -283,6 +327,10 @@ const currentDetailsData = computed<UI_I_InfoBlock[]>(() =>
       }
     }
     .delete-all {
+      &.disabled {
+        color: #bdc3c7;
+      }
+
       &:not(.disabled) {
         color: #ea3223;
       }
@@ -292,12 +340,18 @@ const currentDetailsData = computed<UI_I_InfoBlock[]>(() =>
     background-color: var(--backups-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(--backups-page-details-action-line-color);
+      }
+      .restore-backups-btn {
+        :deep(path) {
+          stroke-width: 1.7;
+        }
       }
       .restore-backups-btn,
       .edit-backups-btn {
@@ -311,18 +365,38 @@ const currentDetailsData = computed<UI_I_InfoBlock[]>(() =>
         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-vsphere-icon-storage-system-refresh {
+          :deep(path) {
+            stroke-width: 1.4;
+          }
+        }
       }
       .info-label {
-        margin-top: 2.5px;
+        margin-top: 1px;
+        line-height: 18px;
         color: var(--backups-page-info-block-label-color);
       }
     }
     .empty-description {
       color: #9da6ad;
+      margin-top: 1px;
+      line-height: 18px;
+      text-align: right;
+    }
+    :deep(.ui-main-info-block-item) {
+      grid-column-gap: 10px;
     }
     :deep(.ui-main-info-block-item-right) {
       white-space: unset !important;
@@ -333,12 +407,25 @@ const currentDetailsData = computed<UI_I_InfoBlock[]>(() =>
     }
     :deep(.ui-main-info-block-item-right-value) {
       color: var(--backups-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) {
   .backups-page {
@@ -346,6 +433,7 @@ const currentDetailsData = computed<UI_I_InfoBlock[]>(() =>
 
     &.selected {
       grid-template-columns: 1fr;
+      grid-template-rows: minmax(189px, 1fr) 1fr;
     }
 
     .backups-details {

package/components/common/pages/backups/backupsNew/Skeleton.vue

@@ -0,0 +1,136 @@
+<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 pr-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
+        ref="detailsScrollBlock"
+        :class="[
+          'details-block flex flex-col my-6',
+          { 'has-scroll': hasScroll },
+        ]"
+      >
+        <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">
+import { useTemplateRef } from 'vue'
+import { useElementSize } from '@vueuse/core'
+
+const detailsItemsCount = ref<number>(3)
+
+const detailsElement = useTemplateRef<HTMLDivElement>('detailsScrollBlock')
+const { height } = useElementSize(detailsElement)
+
+const hasScroll = computed<boolean>(
+  () =>
+    height.value &&
+    detailsElement.value?.scrollHeight > detailsElement.value?.clientHeight
+)
+</script>
+
+<style>
+:root {
+  --backups-left-skeleton-border-color: #e9ebed;
+  --backups-right-skeleton-action-line-border-color: #e9ebeda3;
+  --backups-right-skeleton-item-bg-color: #e9ebed66;
+}
+:root.dark-theme {
+  --backups-left-skeleton-border-color: #e9ebed1f;
+  --backups-right-skeleton-action-line-border-color: #e9ebed1f;
+  --backups-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(--backups-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(--backups-left-skeleton-border-color);
+    border-radius: 8px;
+    grid-row-gap: 10px;
+    overflow: auto;
+
+    :deep(.skeleton-item) {
+      min-height: 20px;
+    }
+  }
+  .right-content {
+    padding-right: 0;
+
+    .top-container {
+      .actions-block {
+        grid-column-gap: 10px;
+
+        .line-border {
+          border: 1px solid
+            var(--backups-right-skeleton-action-line-border-color);
+        }
+      }
+    }
+    .details-block {
+      grid-row-gap: 10px;
+      overflow: auto;
+
+      &:not(.has-scroll) {
+        padding-right: 16px;
+      }
+
+      .details-block-item {
+        background-color: var(--backups-right-skeleton-item-bg-color);
+        border-radius: 6px;
+      }
+
+      :deep(.skeleton-item) {
+        min-height: 20px;
+      }
+    }
+  }
+}
+</style>

package/components/common/pages/backups/backupsNew/contextMenuView/ContextMenuView.vue

@@ -80,20 +80,26 @@ const onSelectContextMenuItem = (item: UI_I_ContextMenuItem): void => {
 
 <style scoped lang="scss">
 .backups-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/pages/backups/lib/models/interfaces.ts

@@ -1,36 +1,36 @@
-import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-import type { UI_T_BackupActionType } from '~/components/common/pages/backups/lib/models/types'
-
-export interface API_UI_I_Backup {
-  creation_time: number
-  creation_type: number
-  description: string
-  kind: number // TODO
-  msg: string
-  name: string
-  state: number // TODO
-  uuid: string
-  vm_name: string
-  vmid: string
-  storage_id: string
-  storage_name: string
-}
-
-export interface UI_I_Backup extends API_UI_I_Backup {}
-
-export interface UI_I_BackupsTreeNode
-  extends UI_I_TreeNode<UI_I_BackupsTreeNode> {
-  parent_id: string
-  timestamp: string
-  description: string
-}
-
-export interface UI_I_BackupAction {
-  action: UI_T_BackupActionType | ''
-  id?: string
-  name?: string
-  backupId?: string
-  bucketId?: string
-  storageId?: string
-}
+import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_T_BackupActionType } from '~/components/common/pages/backups/lib/models/types'
+
+export interface API_UI_I_Backup {
+  creation_time: number
+  creation_type: number
+  description: string
+  kind: number // TODO
+  msg: string
+  name: string
+  state: number // TODO
+  uuid: string
+  vm_name: string
+  vmid: string
+  storage_id: string
+  storage_name: string
+}
+
+export interface UI_I_Backup extends API_UI_I_Backup {}
+
+export interface UI_I_BackupsTreeNode
+  extends UI_I_TreeNode<UI_I_BackupsTreeNode> {
+  parent_id: string
+  timestamp: string
+  description: string
+}
+
+export interface UI_I_BackupAction {
+  action: UI_T_BackupActionType | ''
+  id?: string
+  name?: string
+  backupId?: string
+  bucketId?: string
+  storageId?: string
+}