bfg-common 1.5.757 → 1.5.759

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

@@ -1,14 +1,12 @@
 <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 overflow-auto grid p-4">
-      <div class="flex justify-between gap-4 flex-wrap">
+    <div class="left-content grid p-4">
+      <div class="flex justify-between">
         <h3 class="title-block font-[500] text-[16px]">
           {{ localization.inventoryTabs.backups }} ({{
             props.backupsTree.length
@@ -19,11 +17,10 @@
           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 icon" />
-          {{ localization.common.createBackup }}
+          <ui-icon name="plus" width="20" height="20" class="mr-2" />
+          {{ localization.common.createBackup }}...
         </ui-button>
       </div>
       <div
@@ -31,17 +28,16 @@
         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 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>
@@ -56,7 +52,7 @@
         <p class="title-block font-[400] text-[16px] mt-2">
           {{ localization.common.noBackupsAvailable }}
         </p>
-        <p class="description-block mt-[6px] text-[13px] text-center">
+        <p class="description-block mt-[6px] text-[13px]">
           {{ localization.common.noBackupsAvailableDesc }}
         </p>
       </div>
@@ -82,7 +78,7 @@
       v-if="props.detailData"
       class="backups-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.common.backupDetails }}
         </h3>
@@ -146,13 +142,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"
@@ -163,12 +153,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>
@@ -196,8 +183,6 @@
 </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'
@@ -236,15 +221,6 @@ 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>
@@ -252,9 +228,7 @@ const hasScroll = computed<boolean>(
   --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;
@@ -263,9 +237,7 @@ const hasScroll = computed<boolean>(
   --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;
@@ -281,13 +253,6 @@ const hasScroll = computed<boolean>(
   .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);
@@ -298,24 +263,15 @@ const hasScroll = computed<boolean>(
     .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-container) {
-        width: max-content;
-        min-width: 100%;
+      :deep(.tree-content) {
+        padding-right: 8px;
 
-        .tree-content {
-          //padding-right: 8px;
+        .node-wrapper {
+          border-radius: 4px;
 
-          .node-wrapper {
-            border-radius: 4px;
-
-            .toggle-button-empty {
-              display: none;
-            }
-            .node-element {
-              line-height: 20px;
-            }
+          .node-element {
+            line-height: 20px;
           }
         }
       }
@@ -327,10 +283,6 @@ const hasScroll = computed<boolean>(
       }
     }
     .delete-all {
-      &.disabled {
-        color: #bdc3c7;
-      }
-
       &:not(.disabled) {
         color: #ea3223;
       }
@@ -340,18 +292,12 @@ const hasScroll = computed<boolean>(
     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: var(--backups-page-details-action-line-color);
-      }
-      .restore-backups-btn {
-        :deep(path) {
-          stroke-width: 1.7;
-        }
+        background-color: #e9ebeda3;
       }
       .restore-backups-btn,
       .edit-backups-btn {
@@ -365,38 +311,18 @@ const hasScroll = computed<boolean>(
         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: 1px;
-        line-height: 18px;
+        margin-top: 2.5px;
         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;
@@ -407,25 +333,12 @@ const hasScroll = computed<boolean>(
     }
     :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 {
@@ -433,7 +346,6 @@ const hasScroll = computed<boolean>(
 
     &.selected {
       grid-template-columns: 1fr;
-      grid-template-rows: minmax(189px, 1fr) 1fr;
     }
 
     .backups-details {

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

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

@@ -24,7 +24,7 @@
               test-id="add-vm-backup-general-error-alert"
               type="error"
               size="md"
-              class="mb-3"
+              class="mb-4"
             />
 
             <div class="subtitle-block flex-row items-start">
@@ -38,6 +38,7 @@
               v-model="model"
               :show="selectedStep.id === dynamicSteps.general"
               :messages-fields="selectedStep.fields"
+              :alert-messages="[]"
             />
           </div>
         </template>
@@ -55,7 +56,7 @@
               test-id="add-vm-backup-disks-error-alert"
               type="error"
               size="md"
-              class="mb-3"
+              class="mb-4"
             />
 
             <div class="subtitle-block flex-row w-full items-start">
@@ -69,6 +70,7 @@
               v-model="model"
               :disks="props.disks"
               :disks-loading="props.disksLoading"
+              :alert-messages="[]"
             />
           </div>
         </template>
@@ -86,7 +88,7 @@
               test-id="add-vm-backup-datastores-error-alert"
               type="error"
               size="md"
-              class="mb-3"
+              class="mb-4"
             />
 
             <div class="subtitle-block flex-row w-full items-start">
@@ -118,7 +120,7 @@
               test-id="add-vm-backup-configuration-error-alert"
               type="error"
               size="md"
-              class="mb-3"
+              class="mb-4"
             />
 
             <div class="subtitle-block flex-row items-start">
@@ -148,7 +150,7 @@
           </div>
         </template>
         <template #content>
-          <div class="mt-4">
+          <div class="my-4">
             <div class="ready-to-complete">
               <common-ready-to-complete :data="props.readyToCompleteData" />
             </div>
@@ -263,11 +265,22 @@ const onCreateDatastore = (): void => emits('submit')
     grid-template-columns: auto 1fr;
     align-items: flex-start;
   }
-  :deep(.details-list):nth-child(1) {
-    .details-item-value {
-      white-space: break-spaces;
-      overflow: auto;
+  :deep(.details-list) {
+    grid-template-columns: minmax(100px, max-content) minmax(150px, 100%);
+
+    .details-item-label, .details-item-value {
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      white-space: normal;
+      overflow-wrap: anywhere;
     }
   }
 }
+
+:deep(.ui-wizard-content-with-subtitle) {
+  scrollbar-gutter: stable;
+  padding-right: 16px;
+}
 </style>

package/components/common/pages/backups/modals/createBackup/configuration/ConfigurationNew.vue

@@ -31,6 +31,7 @@
         <ui-input
           v-model="maxBindwidthLocal"
           :error="props.messagesFields.bandWidth.field"
+          type="number"
           test-id="vm-backup-max-bandwidth-input"
           class="max-bandwidth-input"
         />
@@ -114,7 +115,8 @@ const maxBindwidthLocal = computed<number>({
   &-row {
     min-height: 36px;
     width: 100%;
-    display: flex;
+    display: grid;
+    grid-template-columns: minmax(150px, 250px) minmax(150px, 100%);
     column-gap: 16px;
     align-items: center;
 
@@ -171,9 +173,10 @@ const maxBindwidthLocal = computed<number>({
         width: fit-content;
       }
 
-      .strategy-select.capitalize, :deep(.ui-select-toggle-button) {
-        text-transform: capitalize;
+      .strategy-select :deep(.ui-popup-window) {
+        min-width: max-content !important;
       }
+
       &-max-band {
         display: flex;
         gap: 12px;
@@ -181,6 +184,17 @@ const maxBindwidthLocal = computed<number>({
         .max-bandwidth-input {
           max-width: 276px;
           width: 100%;
+
+          :deep(input.ui-main-input[type="number"]) {
+            appearance: textfield;
+            -moz-appearance: textfield;
+          }
+
+          :deep(input.ui-main-input[type="number"]::-webkit-outer-spin-button),
+          :deep(input.ui-main-input[type="number"]::-webkit-inner-spin-button) {
+            -webkit-appearance: none;
+            margin: 0;
+          }
         }
 
         .max-bandwidth-select {

package/components/common/pages/backups/modals/createBackup/configuration/backupWindow/BackupWindow.vue

@@ -1,29 +1,29 @@
-<template>
-  <atoms-stack-block
-      :has-children="false"
-      test-id="backup-window-stack-block"
-  >
-    <template #stackBlockKey>
-      <span>{{ localization.common.backupWindow }}</span>
-    </template>
-    <template #stackBlockContent>
-      <input
-        v-model="model.start_window_min"
-        data-id="hours-input"
-        type="number"
-        class="hrs"
-      />
-    </template>
-  </atoms-stack-block>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <atoms-stack-block
+      :has-children="false"
+      test-id="backup-window-stack-block"
+  >
+    <template #stackBlockKey>
+      <span>{{ localization.common.backupWindow }}</span>
+    </template>
+    <template #stackBlockContent>
+      <input
+        v-model="model.start_window_min"
+        data-id="hours-input"
+        type="number"
+        class="hrs"
+      />
+    </template>
+  </atoms-stack-block>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/MaxBandwidth.vue

@@ -1,69 +1,69 @@
-<template>
-  <atoms-stack-block
-      :has-children="false"
-      test-id="backup-max-bandwidth-stack-block"
-  >
-    <template #stackBlockKey>
-      <span>{{ localization.common.maxBandwidth }}</span>
-    </template>
-    <template #stackBlockContent>
-      <div class="flex-align-center">
-        <input
-          v-model="maxBindwidthLocal"
-          data-id="mbps-input"
-          type="number"
-          class="mbps"
-        />
-
-        <common-select-input
-          v-model="selectedType"
-          :data="maxBandwidthOptionsLocal"
-          test-id="backup-max-bandwidth-type"
-          class="ml-1"
-        />
-      </div>
-    </template>
-  </atoms-stack-block>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_T_BandwidthOption } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/models/types'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-import { maxBandwidthOptions } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options'
-
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $binary }: any = useNuxtApp()
-
-const maxBandwidthOptionsLocal =
-  ref<UI_I_SelectInputItem[]>(maxBandwidthOptions)
-
-const maxBindwidthLocal = computed<number>({
-  get() {
-    return selectedType.value === 1
-      ? $binary.bToGb(model.value.bandwidth_limit)
-      : $binary.bToMb(model.value.bandwidth_limit)
-  },
-  set(newValue: number) {
-    model.value.bandwidth_limit =
-      selectedType.value === 1
-        ? $binary.gbToB(newValue)
-        : $binary.mbToB(newValue)
-  },
-})
-
-const selectedType = ref<UI_T_BandwidthOption>(0)
-watch(selectedType, (newValue) => {
-  if (newValue === 1) model.value.bandwidth_limit *= 1_024
-  else model.value.bandwidth_limit /= 1_024
-})
-</script>
-
-<style lang="scss" scoped>
-#backup-transaction-logs {
-  margin: 4px 4px 0 0;
-}
-</style>
+<template>
+  <atoms-stack-block
+      :has-children="false"
+      test-id="backup-max-bandwidth-stack-block"
+  >
+    <template #stackBlockKey>
+      <span>{{ localization.common.maxBandwidth }}</span>
+    </template>
+    <template #stackBlockContent>
+      <div class="flex-align-center">
+        <input
+          v-model="maxBindwidthLocal"
+          data-id="mbps-input"
+          type="number"
+          class="mbps"
+        />
+
+        <common-select-input
+          v-model="selectedType"
+          :data="maxBandwidthOptionsLocal"
+          test-id="backup-max-bandwidth-type"
+          class="ml-1"
+        />
+      </div>
+    </template>
+  </atoms-stack-block>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_T_BandwidthOption } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/models/types'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+import { maxBandwidthOptions } from '~/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options'
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $binary }: any = useNuxtApp()
+
+const maxBandwidthOptionsLocal =
+  ref<UI_I_SelectInputItem[]>(maxBandwidthOptions)
+
+const maxBindwidthLocal = computed<number>({
+  get() {
+    return selectedType.value === 1
+      ? $binary.bToGb(model.value.bandwidth_limit)
+      : $binary.bToMb(model.value.bandwidth_limit)
+  },
+  set(newValue: number) {
+    model.value.bandwidth_limit =
+      selectedType.value === 1
+        ? $binary.gbToB(newValue)
+        : $binary.mbToB(newValue)
+  },
+})
+
+const selectedType = ref<UI_T_BandwidthOption>(0)
+watch(selectedType, (newValue) => {
+  if (newValue === 1) model.value.bandwidth_limit *= 1_024
+  else model.value.bandwidth_limit /= 1_024
+})
+</script>
+
+<style lang="scss" scoped>
+#backup-transaction-logs {
+  margin: 4px 4px 0 0;
+}
+</style>

package/components/common/pages/backups/modals/createBackup/configuration/maxBandwidth/lib/config/options.ts

@@ -1,6 +1,6 @@
-import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
-
-export const maxBandwidthOptions: UI_I_SelectInputItem[] = [
-  { label: 'Mbps', value: 0 },
-  { label: 'Gbps', value: 1 },
-]
+import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
+
+export const maxBandwidthOptions: UI_I_SelectInputItem[] = [
+  { label: 'Mbps', value: 0 },
+  { label: 'Gbps', value: 1 },
+]