bfg-common 1.5.774 → 1.5.775

package/components/common/layout/theHeader/userMenu/modals/preferences/view/{New.vue → ViewNew.vue}

@@ -1,64 +1,38 @@
-<template>
-  <form id="view-form">
-    <!-- TODO Shorten code by the new component for the form -->
-    <div class="flex">
-      <ui-modal-icon>
-        <ui-icon-icon3 name="eye-open" width="20" height="20" />
-      </ui-modal-icon>
-      <div>
-        <div class="form-first-title">
-          {{ localization.common.view }}
-        </div>
-        <div class="form-second-title">
-          {{ props.description }}
-        </div>
-
-        <div class="flex-align-center new-view-switch-container">
-          <ui-switch
-            v-model="newViewLocal"
-            :label="localization.common.newView"
-            test-id="view-switch"
-          />
-        </div>
-      </div>
-    </div>
-    <div class="flex mt-4">
-      <div style="width: 38px" class="mr-3"></div>
-      <div>
-        <div class="form-second-title">
-          {{ localization.myPreferences.showNotificationDescription }}
-        </div>
-
-        <div class="flex-align-center new-view-switch-container">
-          <ui-switch
-            v-model="isShowNotification"
-            :label="localization.myPreferences.showNotification"
-            test-id="show-notification-switch"
-          />
-        </div>
-      </div>
-    </div>
-  </form>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const newViewLocal = defineModel<boolean>()
-const isShowNotification = defineModel<boolean>('isShowNotification')
-
-const props = defineProps<{
-  description: string
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style lang="scss" scoped>
-.new-view-switch-container {
-  :deep(.switch-content .switch-label) {
-    font-size: 13px;
-    font-weight: 400;
-  }
-}
-</style>
+<template>
+  <form id="view-form">
+    <!-- TODO Shorten code by the new component for the form -->
+    <div class="flex">
+      <ui-modal-icon>
+        <ui-icon-icon3 name="eye-open" width="20" height="20" />
+      </ui-modal-icon>
+      <div>
+        <div class="form-first-title">
+          {{ localization.common.view }}
+        </div>
+        <div class="form-second-title">
+          {{ props.description }}
+        </div>
+
+        <div class="flex-align-center">
+          <ui-switch
+            v-model="newViewLocal"
+            :label="localization.common.newView"
+            test-id="view-switch"
+          />
+        </div>
+      </div>
+    </div>
+  </form>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  description: string
+}>()
+
+const newViewLocal = defineModel<boolean>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>

package/components/common/layout/theHeader/userMenu/modals/preferences/view/{Old.vue → ViewOld.vue}

@@ -14,35 +14,20 @@
         class="switch"
       />
     </div>
-
-    <div class="description second-description">
-      {{ localization.myPreferences.showNotificationDescription }}
-    </div>
-
-    <div class="flex-align-center">
-      <label for="view">{{ localization.myPreferences.showNotification }}</label>
-      <input
-        id="view"
-        v-model="isShowNotification"
-        type="checkbox"
-        class="switch"
-      />
-    </div>
   </form>
 </template>
 
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-const newViewLocal = defineModel<boolean>()
-const isShowNotification = defineModel<boolean>('isShowNotification')
-
 const props = defineProps<{
   description: string
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const newViewLocal = defineModel<boolean>()
+
 const isDisabled = ref<boolean>(true)
 // @ts-ignore
 window.tools = new Proxy(
@@ -59,10 +44,6 @@ window.tools = new Proxy(
 <style lang="scss" scoped>
 .description {
   margin-bottom: 10px;
-
-  &.second-description {
-    margin-top: 20px;
-  }
 }
 
 label {

package/components/common/layout/theHeader/userMenu/{new/New.vue → userMenuNew/UserMenuNew.vue}

@@ -64,7 +64,7 @@
 <script setup lang="ts">
 import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { userMenuFunc } from '~/components/common/layout/theHeader/userMenu/new/lib/config/dropMenu'
+import { userMenuFunc } from '~/components/common/layout/theHeader/userMenu/userMenuNew/lib/config/dropMenu'
 
 const props = defineProps<{
   hostname: string

package/components/common/layout/theHeader/userMenu/{old/Old.vue → userMenuOld/UserMenuOld.vue}

@@ -12,8 +12,8 @@
 <script setup lang="ts">
 import type { UI_I_DropMenu } from '~/components/atoms/dropdown/dropdown/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_ActionTypeUserMenu } from '~/components/common/layout/theHeader/userMenu/old/lib/models/types'
-import { accountMenuFunc } from '~/components/common/layout/theHeader/userMenu/old/lib/config/dropMenu'
+import type { UI_T_ActionTypeUserMenu } from '~/components/common/layout/theHeader/userMenu/userMenuOld/lib/models/types'
+import { accountMenuFunc } from '~/components/common/layout/theHeader/userMenu/userMenuOld/lib/config/dropMenu'
 
 const props = defineProps<{
   hostname: string

package/components/common/layout/theHeader/userMenu/{old → userMenuOld}/lib/config/dropMenu.ts

@@ -1,6 +1,6 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_DropMenu } from '~/components/atoms/dropdown/dropdown/lib/models/interfaces'
-import type { UI_T_ActionTypeUserMenu } from '~/components/common/layout/theHeader/userMenu/old/lib/models/types'
+import type { UI_T_ActionTypeUserMenu } from '~/components/common/layout/theHeader/userMenu/userMenuOld/lib/models/types'
 
 export const accountMenuFunc = (
   localization: UI_I_Localization

package/components/common/monitor/advanced/graphView/GraphView.vue

@@ -138,14 +138,6 @@ watch(
   },
   { immediate: true }
 )
-
-const updateTimeFormatAndInterfaceLang = computed<number>(
-  () => $store.getters['main/getUpdateTimeFormatAndInterfaceLang']
-)
-
-watch(updateTimeFormatAndInterfaceLang, () => {
-  startChart()
-})
 </script>
 
 <style scoped lang="scss"></style>

package/components/common/monitor/advanced/tools/Tools.vue

@@ -178,10 +178,6 @@ const routeType = '' + useRoute().params.type
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const updateTimeFormatAndInterfaceLang = computed<number>(
-  () => $store.getters['main/getUpdateTimeFormatAndInterfaceLang']
-)
-
 const localSelectedTimespanType = computed<string>({
   get() {
     return props.selectedTimespanType
@@ -282,7 +278,7 @@ const updateTools = (): void => {
 }
 
 const chartTitleDate = computed<string>(() => {
-  if (!props.startDate || !updateTimeFormatAndInterfaceLang.value) return ''
+  if (!props.startDate) return ''
 
   const start = $formattedDatetime(props.startDate, { hasSeconds: true })
   const end = $formattedDatetime(props.endDate, { hasSeconds: true })

package/components/common/monitor/overview/OverviewNew.vue

@@ -50,7 +50,7 @@ watch([width, height], () => {
   height: 100%;
   gap: 12px;
   padding: 4px 16px 16px 16px;
-  grid-template-rows: 400px 400px;
+  grid-template-rows: 400px;
 
   &.has-scroll {
     padding-right: 3px;

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/CreateBackup.vue

@@ -28,6 +28,7 @@
     :selected-scheme="selectedScheme"
     :alert-messages="alertMessages"
     :title="title"
+    :alert-errors="errors"
     :is-scheduled-tasks="props.isScheduledTasks"
     :is-edit-scheduled-tasks="props.isEditScheduledTasks"
     :target="props.target"
@@ -73,11 +74,10 @@ import {
 import type {UI_I_NameCheck} from "~/components/common/pages/backups/modals/restore/name/lib/models/interfaces";
 import type {UI_I_SelectInputItem} from "~/components/common/select/input/lib/models/interfaces";
 import type {UI_I_TableInfoItem} from "~/components/atoms/table/info/lib/models/interfaces";
-import type {UI_I_ScheduleNewTasksForm} from "~/components/common/pages/scheduledTasks/modals/lib/models/interfaces";
 
 
 const backupForm = defineModel<UI_I_CreateBackupForm>({ required: true })
-const schedulerForm = defineModel<UI_I_ScheduleNewTasksForm>('schedulerForm', { required: true })
+const schedulerForm = defineModel('schedulerForm', { required: true })
 
 const props = defineProps<{
   isEdit?: boolean // ToDo проверить на использование
@@ -152,13 +152,13 @@ const validationFunc = async (
   }
 
   if (wizard.isValidateForStep(dynamicSteps.disks, currentStep.id, nextStep.id)) {
-    const disksValidation = checkDisks(value, backupForm.value, wizard, localization.value)
+    const disksValidation = checkDisks(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
     value = disksValidation.newValue
     stepHasError = disksValidation.stepHasError
   }
 
   if (wizard.isValidateForStep(dynamicSteps.datastores, currentStep.id, nextStep.id)) {
-    const datastoreValidation = checkDatastore(value, backupForm.value, wizard, localization.value)
+    const datastoreValidation = checkDatastore(value, backupForm.value, wizard, localization.value, showValidationErrors, onRemoveValidationErrors)
     value = datastoreValidation.newValue
     stepHasError = datastoreValidation.stepHasError
   }
@@ -176,8 +176,12 @@ const validationFunc = async (
   }
 }
 
-const onRemoveValidationErrors = (stepId: number): void => {
-  wizard.hideAlertMessagesByStepId(stepId)
+const errors = ref<string[]>([])
+const showValidationErrors = (data: string[]): void => {
+  errors.value = data
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
 }
 
 const strategyOptions = ref<UI_I_SelectInputItem[]>(