bfg-common 1.4.734 → 1.4.736

package/assets/localization/local_be.json

@@ -2719,6 +2719,7 @@
     "timeToShouldBeLaterTimeFrom": "Ўказаны дыяпазон часу недапушчальны. Дата \" да \"павінна быць пазней даты\"ад\".",
     "timeRangeShouldNotBeSmallerThanHour": "Ўказаны дыяпазон часу недапушчальны. Ён не павінен быць менш 1 гадзіны.",
     "timeRangeShouldNotBeMoreThanMonth": "Указаны дыяпазон часу несапраўдны. Яно не павінна быць больш за 1 месяца.",
+    "timeRangeShouldNotBeMoreThanValidTo": "Указаны дыяпазон часу несапраўдны. Яно не павінна перавышаць {0}.",
     "overview": "Агляд",
     "spaceUtilization": "Выкарыстанне прасторы",
     "changeCustomInterval": "Зменіце карыстацкі інтэрвал",

package/assets/localization/local_en.json

@@ -2723,6 +2723,7 @@
     "timeToShouldBeLaterTimeFrom": "The specified time range is not valid. The \"to\" date should be later than the \"from\" date.",
     "timeRangeShouldNotBeSmallerThanHour": "The specified time range is not valid. It should not be smaller than 1 hour.",
     "timeRangeShouldNotBeMoreThanMonth": "The specified time range is not valid. It should not be more than 1 month.",
+    "timeRangeShouldNotBeMoreThanValidTo": "The specified time range is not valid. It should not be more than {0}.",
     "overview": "Overview",
     "spaceUtilization": "Space Utilization",
     "changeCustomInterval": "Change custom interval",

package/assets/localization/local_hy.json

@@ -2723,6 +2723,7 @@
     "timeToShouldBeLaterTimeFrom": "Նշված ժամանակային միջակայքն անընդունելի է: \"Նախքան\" ամսաթիվը պետք է լինի ավելի ուշ, քան \"from\"ամսաթիվը:",
     "timeRangeShouldNotBeSmallerThanHour": "The specified time range is not valid. It should not be smaller than 1 hour.",
     "timeRangeShouldNotBeMoreThanMonth": "Նշված ժամանակային միջակայքը վավեր չէ: Այն չպետք է լինի 1 ամսից ավելի։",
+    "timeRangeShouldNotBeMoreThanValidTo": "Նշված ժամանակային միջակայքը վավեր չէ: Այն չպետք է լինի {0}-ից ավելի:",
     "overview": "Ակնարկ",
     "spaceUtilization": "Օգտագործելով տարածություն",
     "changeCustomInterval": "Փոխեք օգտագործողի միջակայքը",

package/assets/localization/local_kk.json

@@ -2722,6 +2722,7 @@
     "timeToShouldBeLaterTimeFrom": "The specified time range is not valid. The \"to\" date should be later than the \"from\" date.",
     "timeRangeShouldNotBeSmallerThanHour": "The specified time range is not valid. It should not be smaller than 1 hour.",
     "timeRangeShouldNotBeMoreThanMonth": "Көрсетілген уақыт аралығы жарамсыз. 1 айдан аспауы керек.",
+    "timeRangeShouldNotBeMoreThanValidTo": "Көрсетілген уақыт аралығы жарамсыз. Ол {0} аспауы керек.",
     "overview": "Шолу",
     "spaceUtilization": "Кеңістікті пайдалану",
     "changeCustomInterval": "Пайдаланушы аралығын өзгертіңіз",

package/assets/localization/local_ru.json

@@ -2724,6 +2724,7 @@
     "timeToShouldBeLaterTimeFrom": "Указанный диапазон времени недопустим. Дата \"до\" должна быть позже даты \"от\".",
     "timeRangeShouldNotBeSmallerThanHour": "Указанный диапазон времени недопустим. Он не должен быть меньше 1 часа.",
     "timeRangeShouldNotBeMoreThanMonth": "Указанный диапазон времени недействителен. Он не должен быть больше 1 месяца.",
+    "timeRangeShouldNotBeMoreThanValidTo": "Указанный временной диапазон недействителен. Он не должен быть больше {0}.",
     "overview": "Обзор",
     "spaceUtilization": "Использование пространства",
     "changeCustomInterval": "Измените пользовательский интервал",

package/assets/localization/local_zh.json

@@ -2721,6 +2721,7 @@
     "timeToShouldBeLaterTimeFrom": "指定的时间范围无效。 “结束”日期应晚于“开始”日期。",
     "timeRangeShouldNotBeSmallerThanHour": "指定的时间范围无效。 不应小于1小时。",
     "timeRangeShouldNotBeMoreThanMonth": "指定的时间范围无效。它不应超过 1 个月。",
+    "timeRangeShouldNotBeMoreThanValidTo": "指定的时间范围无效。它不应超过 {0}。",
     "overview": "概述",
     "spaceUtilization": "空间利用",
     "changeCustomInterval": "更改自定义间隔",

package/components/common/browse/blocks/lib/models/types.ts

@@ -1 +1 @@
-export type UI_T_BlocksWidth = [number, number, number]
+export type UI_T_BlocksWidth = [number, number, number]

package/components/common/browse/lib/models/interfaces.ts

@@ -1,5 +1,5 @@
-export interface UI_I_FileInfo {
-  type: string
-  title: string
-  value: string | number
-}
+export interface UI_I_FileInfo {
+  type: string
+  title: string
+  value: string | number
+}

package/components/common/{monitor/advanced/tools/chartOptionsModal → chartOptionsModal}/counters/timespan/form/Form.vue

@@ -184,7 +184,9 @@
                       { active: localPeriodType === 'period' },
                     ]"
                   >
-                    <span> ({{ localization.inventoryMonitor.isoTimeFormat }}) </span>
+                    <span>
+                      ({{ localization.inventoryMonitor.isoTimeFormat }})
+                    </span>
                   </td>
                 </tr>
               </tbody>
@@ -226,7 +228,7 @@ import {
   timespanFunc,
   customTimeFunc,
   chartTypeFunc,
-} from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/form/lib/config/dateForm'
+} from '~/components/common/chartOptionsModal/counters/timespan/form/lib/config/dateForm'
 
 const props = defineProps<{
   language: string
@@ -239,6 +241,7 @@ const props = defineProps<{
   customDateTo: string
   customTimeFrom: string
   customTimeTo: string
+  validDateEnd: number
 }>()
 
 const emits = defineEmits<{
@@ -402,17 +405,19 @@ const currentTimeTo = ref<string>('')
 const getCurrentTime = (): void => {
   localCurrentDateFrom.value =
     props.customDateFrom || $formattedDate(yesterday, '')
-  currentDateTo.value = props.customDateTo || $formattedDate(new Date(), '')
+  currentDateTo.value =
+    props.customDateTo || $formattedDate(props.validDateEnd, '')
 
-  const currentTime = format(new Date(), $getTimeFormat(true))
-  currentTimeFrom.value = props.customTimeFrom || currentTime
-  currentTimeTo.value = props.customTimeTo || currentTime
+  currentTimeFrom.value =
+    props.customTimeFrom || format(new Date(), $getTimeFormat(true))
+  currentTimeTo.value =
+    props.customTimeTo || format(props.validDateEnd, $getTimeFormat(true))
 }
 
-const onUpdateDateFrom = (val: number): void => {
-  if (!val) return
+const onUpdateDateFrom = (value: number): void => {
+  if (!value) return
 
-  localCurrentDateFrom.value = $formattedDate(new Date(val), '')
+  localCurrentDateFrom.value = $formattedDate(new Date(value), '')
 }
 watch(localCurrentDateFrom, (newValue) => {
   emits('update-custom-date-from', newValue)
@@ -421,10 +426,10 @@ watch(localCurrentDateFrom, (newValue) => {
   if ($isDate(newValue)) dateFrom.value = $getUnixByDate(newValue)
 })
 
-const onUpdateDateTo = (val: number): void => {
-  if (!val) return
+const onUpdateDateTo = (value: number): void => {
+  if (!value) return
 
-  currentDateTo.value = $formattedDate(new Date(val), '')
+  currentDateTo.value = $formattedDate(new Date(value), '')
 }
 watch(currentDateTo, (newValue) => {
   emits('update-custom-date-to', newValue)

package/components/common/{pages/hardwareHealth/historyTestimony/tools/chartOptionsModal → chartOptionsModal}/counters/timespan/form/lib/config/dateForm.ts

@@ -87,6 +87,7 @@ export const chartTypeFunc = (
 ]
 
 const getCorrectRuForm = (value: number, type: string): string => {
+  // TODO поправить используя correctRuUnit из плагина date
   const forms: UI_I_ArbitraryObject<string[]> = {
     hour: ['Час', 'Часа', 'Часов'],
     day: ['День', 'Дня', 'Дней'],

package/components/common/diagramMain/Header.vue

@@ -1,211 +1,211 @@
-<template>
-  <template v-if="!props.inPortlet">
-    <div class="diagram-header">
-      <div class="diagram-header-left">
-        <atoms-the-icon
-          name="angle"
-          :class="[
-            'diagram-header__arrow-icon',
-            {
-              open: props.isShowDiagram,
-            },
-          ]"
-          :data-id="`${props.testId}-toggle-icon`"
-          @click="onToggleDiagram"
-        />
-        <a>
-          <span>
-            {{ localization.common.standardSwitch }}:
-            {{ props.diagramName }}
-          </span>
-        </a>
-      </div>
-      <div v-if="props.isShowDiagram" class="diagram-header__btn-container">
-        <span class="vertical-separator"></span>
-        <button
-          id="add-networking-button"
-          :data-id="`${props.testId}-add-networking-button`"
-          type="button"
-          @click="onShowModal('add-networking', props.diagramName)"
-        >
-          {{ localization.common.addNetworking }}
-        </button>
-        <button
-          id="switch-edit-button"
-          :data-id="`${props.testId}-edit-button`"
-          type="button"
-          @click="onShowModal('switch-edit')"
-        >
-          {{ localization.common.edit }}
-        </button>
-        <button
-          id="switch-manage-physical-adapters-button"
-          :data-id="`${props.testId}-manage-physical-adapters-button`"
-          type="button"
-          @click="onShowModal('switch-manage-physical-adapters')"
-        >
-          {{ localization.common.managePhysicalAdapters }}
-        </button>
-        <div class="diagram-main-actions-dots">
-          <atoms-collapse-nav
-            popup-class="diagram-main-actions__popup"
-            :close-after-click="true"
-            :items="switchMainNavigation"
-            :test-id="`${props.testId}-actions`"
-            @change="onShowModal"
-          />
-        </div>
-      </div>
-    </div>
-    <hr class="horizontal-separator" />
-  </template>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_NavigationItem,
-  UI_I_ModalsInitialData,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-import { switchMainNavigationFunc } from '~/components/common/diagramMain/modals/lib/config'
-
-const props = defineProps<{
-  inPortlet: boolean
-  isShowDiagram: boolean
-  diagramName: string
-  testId: string
-}>()
-
-const emits = defineEmits<{
-  (event: 'toggle-diagram'): void
-  (
-    event: 'show-modal',
-    modalName: string,
-    properties?: UI_I_ModalsInitialData
-  ): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const switchMainNavigation = computed<UI_I_NavigationItem[]>(() =>
-  switchMainNavigationFunc(localization.value, props.testId)
-)
-
-const onToggleDiagram = () => emits('toggle-diagram')
-
-const onShowModal = (modalName: string, diagramName?: string) =>
-  diagramName
-    ? emits('show-modal', modalName, { switch_name: diagramName })
-    : emits('show-modal', modalName)
-</script>
-
-<style scoped lang="scss">
-:root.dark-theme {
-  .diagram-header {
-    &-left {
-      a {
-        span {
-          color: #79c6e6;
-
-          &:hover {
-            color: #49afd9;
-          }
-        }
-      }
-    }
-
-    &__btn-container {
-      button {
-        color: #89cbdf;
-
-        &:hover {
-          color: #57c8ea;
-        }
-      }
-    }
-  }
-}
-
-.diagram-header {
-  display: flex;
-  padding-left: 8px;
-  a {
-    color: #0072a3;
-    cursor: pointer;
-    font-weight: 700;
-    user-select: none;
-    line-height: 20px;
-    span {
-      font-weight: 700;
-    }
-  }
-
-  &-left {
-    display: flex;
-    flex-wrap: nowrap;
-    color: #49afd9;
-  }
-
-  &__arrow-icon {
-    width: 16px;
-    height: 16px;
-    margin-right: 4px;
-    transform: rotate(90deg);
-    align-self: center;
-    fill: var(--triger-icon-color);
-    cursor: pointer;
-    &.open {
-      transform: rotate(180deg);
-    }
-  }
-
-  &__btn-container {
-    display: flex;
-
-    button {
-      font-size: 11px;
-      height: 24px;
-      border: none;
-      background: none;
-      margin-right: 0;
-      cursor: pointer;
-      display: inline-block;
-      white-space: nowrap;
-      text-align: center;
-      text-transform: uppercase;
-      color: #49afd9;
-      line-height: 20px;
-      max-height: 16.8px;
-      padding: 0 14px;
-      font-weight: 500;
-      letter-spacing: 1px;
-
-      &:hover {
-        color: #004d8a;
-      }
-    }
-  }
-}
-
-.diagram-main-actions-dots {
-  position: relative;
-  transform: translate(62px, -11px);
-}
-
-.horizontal-separator {
-  margin: 5px 10px 10px;
-  border-left: 0;
-  border-right: 0;
-  border-color: #ddd;
-  box-sizing: content-box;
-  height: 0;
-  overflow: visible;
-  border-top: 0px solid #eee;
-}
-
-.vertical-separator {
-  border: 1px solid #ddd;
-  border-left: none;
-  margin: 0 3px 0 14px;
-}
-</style>
+<template>
+  <template v-if="!props.inPortlet">
+    <div class="diagram-header">
+      <div class="diagram-header-left">
+        <atoms-the-icon
+          name="angle"
+          :class="[
+            'diagram-header__arrow-icon',
+            {
+              open: props.isShowDiagram,
+            },
+          ]"
+          :data-id="`${props.testId}-toggle-icon`"
+          @click="onToggleDiagram"
+        />
+        <a>
+          <span>
+            {{ localization.common.standardSwitch }}:
+            {{ props.diagramName }}
+          </span>
+        </a>
+      </div>
+      <div v-if="props.isShowDiagram" class="diagram-header__btn-container">
+        <span class="vertical-separator"></span>
+        <button
+          id="add-networking-button"
+          :data-id="`${props.testId}-add-networking-button`"
+          type="button"
+          @click="onShowModal('add-networking', props.diagramName)"
+        >
+          {{ localization.common.addNetworking }}
+        </button>
+        <button
+          id="switch-edit-button"
+          :data-id="`${props.testId}-edit-button`"
+          type="button"
+          @click="onShowModal('switch-edit')"
+        >
+          {{ localization.common.edit }}
+        </button>
+        <button
+          id="switch-manage-physical-adapters-button"
+          :data-id="`${props.testId}-manage-physical-adapters-button`"
+          type="button"
+          @click="onShowModal('switch-manage-physical-adapters')"
+        >
+          {{ localization.common.managePhysicalAdapters }}
+        </button>
+        <div class="diagram-main-actions-dots">
+          <atoms-collapse-nav
+            popup-class="diagram-main-actions__popup"
+            :close-after-click="true"
+            :items="switchMainNavigation"
+            :test-id="`${props.testId}-actions`"
+            @change="onShowModal"
+          />
+        </div>
+      </div>
+    </div>
+    <hr class="horizontal-separator" />
+  </template>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_NavigationItem,
+  UI_I_ModalsInitialData,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+import { switchMainNavigationFunc } from '~/components/common/diagramMain/modals/lib/config'
+
+const props = defineProps<{
+  inPortlet: boolean
+  isShowDiagram: boolean
+  diagramName: string
+  testId: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'toggle-diagram'): void
+  (
+    event: 'show-modal',
+    modalName: string,
+    properties?: UI_I_ModalsInitialData
+  ): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const switchMainNavigation = computed<UI_I_NavigationItem[]>(() =>
+  switchMainNavigationFunc(localization.value, props.testId)
+)
+
+const onToggleDiagram = () => emits('toggle-diagram')
+
+const onShowModal = (modalName: string, diagramName?: string) =>
+  diagramName
+    ? emits('show-modal', modalName, { switch_name: diagramName })
+    : emits('show-modal', modalName)
+</script>
+
+<style scoped lang="scss">
+:root.dark-theme {
+  .diagram-header {
+    &-left {
+      a {
+        span {
+          color: #79c6e6;
+
+          &:hover {
+            color: #49afd9;
+          }
+        }
+      }
+    }
+
+    &__btn-container {
+      button {
+        color: #89cbdf;
+
+        &:hover {
+          color: #57c8ea;
+        }
+      }
+    }
+  }
+}
+
+.diagram-header {
+  display: flex;
+  padding-left: 8px;
+  a {
+    color: #0072a3;
+    cursor: pointer;
+    font-weight: 700;
+    user-select: none;
+    line-height: 20px;
+    span {
+      font-weight: 700;
+    }
+  }
+
+  &-left {
+    display: flex;
+    flex-wrap: nowrap;
+    color: #49afd9;
+  }
+
+  &__arrow-icon {
+    width: 16px;
+    height: 16px;
+    margin-right: 4px;
+    transform: rotate(90deg);
+    align-self: center;
+    fill: var(--triger-icon-color);
+    cursor: pointer;
+    &.open {
+      transform: rotate(180deg);
+    }
+  }
+
+  &__btn-container {
+    display: flex;
+
+    button {
+      font-size: 11px;
+      height: 24px;
+      border: none;
+      background: none;
+      margin-right: 0;
+      cursor: pointer;
+      display: inline-block;
+      white-space: nowrap;
+      text-align: center;
+      text-transform: uppercase;
+      color: #49afd9;
+      line-height: 20px;
+      max-height: 16.8px;
+      padding: 0 14px;
+      font-weight: 500;
+      letter-spacing: 1px;
+
+      &:hover {
+        color: #004d8a;
+      }
+    }
+  }
+}
+
+.diagram-main-actions-dots {
+  position: relative;
+  transform: translate(62px, -11px);
+}
+
+.horizontal-separator {
+  margin: 5px 10px 10px;
+  border-left: 0;
+  border-right: 0;
+  border-color: #ddd;
+  box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+  border-top: 0px solid #eee;
+}
+
+.vertical-separator {
+  border: 1px solid #ddd;
+  border-left: none;
+  margin: 0 3px 0 14px;
+}
+</style>